[commit] r829 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 libopenbios

[repository service]

Author: blueswirl
Date: Sun Aug  1 23:15:14 2010
New Revision: 829
URL: http://tracker.coreboot.org/trac/openbios/changeset/829

Log:
Fix Unix target build

Fix build failure:
  LINK  openbios-unix
libopenbios.a(load.o)(.text+0xe0): In function `load':
../libopenbios/load.c:58: undefined reference to `elf_boot_notes'
libopenbios.a(load.o)(.text+0xe8):../libopenbios/load.c:58: undefined reference to `elf_boot_notes'

Move elf_boot_notes variable to load.c to make it also available on
Unix build. Also fix a spurious sys_info variable definition.

Signed-off-by: Blue Swirl

Modified:
   trunk/openbios-devel/arch/ppc/qemu/main.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/ppc/qemu/main.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/main.c	Sun Aug  1 17:13:48 2010	(r828)
+++ trunk/openbios-devel/arch/ppc/qemu/main.c	Sun Aug  1 23:15:14 2010	(r829)
@@ -39,10 +39,6 @@
 #define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args)
 #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args)

-struct sys_info sys_info;
-void *elf_boot_notes = NULL;
-
-
 static char *
 get_device( const char *path )
 {

Modified: trunk/openbios-devel/arch/sparc32/boot.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/boot.c	Sun Aug  1 17:13:48 2010	(r828)
+++ trunk/openbios-devel/arch/sparc32/boot.c	Sun Aug  1 23:15:14 2010	(r829)
@@ -18,7 +18,6 @@
 uint32_t qemu_cmdline;
 uint32_t cmdline_size;
 char boot_device;
-void *elf_boot_notes = NULL;
 const void *romvec;

void go(void)

Modified: trunk/openbios-devel/arch/sparc64/boot.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/boot.c	Sun Aug  1 17:13:48 2010	(r828)
+++ trunk/openbios-devel/arch/sparc64/boot.c	Sun Aug  1 23:15:14 2010	(r829)
@@ -15,7 +15,7 @@
 uint64_t qemu_cmdline;
 uint64_t cmdline_size;
 char boot_device;
-void *elf_boot_notes = NULL;
+
 extern int sparc64_of_client_interface( int *params );

Modified: trunk/openbios-devel/arch/x86/boot.c
==============================================================================
--- trunk/openbios-devel/arch/x86/boot.c	Sun Aug  1 17:13:48 2010	(r828)
+++ trunk/openbios-devel/arch/x86/boot.c	Sun Aug  1 23:15:14 2010	(r829)
@@ -14,8 +14,6 @@
 #include "libopenbios/sys_info.h"
 #include "boot.h"

-void *elf_boot_notes = NULL;
-
 void go(void)
 {
    ucell address, type, size;

Modified: trunk/openbios-devel/libopenbios/load.c
==============================================================================
--- trunk/openbios-devel/libopenbios/load.c	Sun Aug  1 17:13:48 2010	(r828)
+++ trunk/openbios-devel/libopenbios/load.c	Sun Aug  1 23:15:14 2010	(r829)
@@ -38,6 +38,7 @@

struct sys_info sys_info;
+void *elf_boot_notes = NULL;

void load(ihandle_t dev)
 {