[commit] r826 - in trunk/openbios-devel: arch/amd64 arch/sparc32 arch/sparc64 arch/x86 libopenbios

[repository service]

Author: blueswirl
Date: Sun Aug  1 13:03:45 2010
New Revision: 826
URL: http://tracker.coreboot.org/trac/openbios/changeset/826

Log:
Fix Unix target build

Move sys_info to load.c to make it also available on Unix build.

Signed-off-by: Blue Swirl

Modified:
   trunk/openbios-devel/arch/amd64/boot.c
   trunk/openbios-devel/arch/amd64/openbios.c
   trunk/openbios-devel/arch/sparc32/boot.c
   trunk/openbios-devel/arch/sparc64/boot.c
   trunk/openbios-devel/arch/x86/boot.c
   trunk/openbios-devel/libopenbios/load.c

Modified: trunk/openbios-devel/arch/amd64/boot.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/boot.c	Sun Aug  1 00:48:10 2010	(r825)
+++ trunk/openbios-devel/arch/amd64/boot.c	Sun Aug  1 13:03:45 2010	(r826)
@@ -14,8 +14,6 @@

void boot(void);

-struct sys_info sys_info;
-
 void boot(void)
 {
    char *path=pop_fstr_copy(), *param;

Modified: trunk/openbios-devel/arch/amd64/openbios.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/openbios.c	Sun Aug  1 00:48:10 2010	(r825)
+++ trunk/openbios-devel/arch/amd64/openbios.c	Sun Aug  1 13:03:45 2010	(r826)
@@ -52,7 +52,6 @@

int openbios(void)
 {
-	extern struct sys_info sys_info;
 #ifdef CONFIG_DEBUG_CONSOLE
 #ifdef CONFIG_DEBUG_CONSOLE_SERIAL
    uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED);

Modified: trunk/openbios-devel/arch/sparc32/boot.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/boot.c	Sun Aug  1 00:48:10 2010	(r825)
+++ trunk/openbios-devel/arch/sparc32/boot.c	Sun Aug  1 13:03:45 2010	(r826)
@@ -16,7 +16,6 @@
 #include "openprom.h"
 #include "boot.h"

-struct sys_info sys_info;
 uint32_t kernel_image;
 uint32_t kernel_size;
 uint32_t qemu_cmdline;

Modified: trunk/openbios-devel/arch/sparc64/boot.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/boot.c	Sun Aug  1 00:48:10 2010	(r825)
+++ trunk/openbios-devel/arch/sparc64/boot.c	Sun Aug  1 13:03:45 2010	(r826)
@@ -14,7 +14,6 @@
 #include "libopenbios/forth_load.h"
 #include "boot.h"

-struct sys_info sys_info;
 uint64_t kernel_image;
 uint64_t kernel_size;
 uint64_t qemu_cmdline;

Modified: trunk/openbios-devel/arch/x86/boot.c
==============================================================================
--- trunk/openbios-devel/arch/x86/boot.c	Sun Aug  1 00:48:10 2010	(r825)
+++ trunk/openbios-devel/arch/x86/boot.c	Sun Aug  1 13:03:45 2010	(r826)
@@ -18,7 +18,6 @@
 #include "libopenbios/forth_load.h"
 #include "boot.h"

-struct sys_info sys_info;
 void *boot_notes = NULL;

static int try_path(const char *path, char *param)

Modified: trunk/openbios-devel/libopenbios/load.c
==============================================================================
--- trunk/openbios-devel/libopenbios/load.c	Sun Aug  1 00:48:10 2010	(r825)
+++ trunk/openbios-devel/libopenbios/load.c	Sun Aug  1 13:03:45 2010	(r826)
@@ -33,6 +33,8 @@
 #endif

+struct sys_info sys_info;
+
 void load(ihandle_t dev)
 {
    /* Invoke the loaders on the specified device */