Fix the sys_info.h header file so it doesn't reference functions both inside and outside of libopenbios, and move the firmware

configuration header file to include/arch/common. Following through the code showed that elfnote.c and linuxbios.c were being 
used by sys_info and so these are also renamed to elf_info.c and linuxbios_info.c for clarity.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>


git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@693 f158a5a8-5612-0410-a976-696ce0be7e32

arch/amd64/boot.c

@@ -7,7 +7,7 @@
 #include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 
 int elf_load(struct sys_info *, const char *filename, const char *cmdline);
 int linux_load(struct sys_info *, const char *filename, const char *cmdline);

arch/amd64/builtin.c

@@ -8,7 +8,7 @@
 
 #include "openbios/config.h"
 #include <asm/types.h>
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 
 /*
  * wrap an array around the hex'ed dictionary file

arch/amd64/elfload.c

@@ -8,7 +8,7 @@
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #define printf printk

arch/amd64/linux_load.c

@@ -11,7 +11,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 #include "segment.h"
 #include "loadfs.h"

arch/amd64/multiboot.c

@@ -2,7 +2,7 @@
 
 #include "openbios/config.h"
 #include "asm/io.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define printf printk

arch/amd64/openbios.c

@@ -12,11 +12,12 @@
 #include "dict.h"
 #include "kernel/kernel.h"
 #include "kernel/stack.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "openbios.h"
 #include "relocate.h"
 
 void boot(void);
+void collect_sys_info(struct sys_info *info);
 
 static char intdict[256 * 1024];
 

arch/amd64/plainboot.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define FIXED_DICTSTART 0xfffe0000

arch/amd64/segment.c

@@ -5,7 +5,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "relocate.h"
 #include "segment.h"
 

arch/amd64/sys_info.c

@@ -1,6 +1,6 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 
 #define printf printk

arch/ppc/qemu/init.c

@@ -31,7 +31,7 @@
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 #include "arch/ppc/processor.h"
 
 #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"

arch/ppc/qemu/main.c

@@ -23,7 +23,7 @@
 #include "kernel.h"
 #include "libopenbios/ofmem.h"
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 
 //#define DEBUG_QEMU
 

arch/sparc32/aoutload.c

@@ -6,7 +6,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "a.out.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printf printk

arch/sparc32/boot.c

@@ -9,7 +9,7 @@
 #include "drivers/drivers.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "openprom.h"
 #include "boot.h"
 

arch/sparc32/boot.h

@@ -33,6 +33,7 @@ void boot(void);
 
 // sys_info.c
 extern unsigned int qemu_mem_size;
+extern void collect_sys_info(struct sys_info *info);
 
 // romvec.c
 extern struct linux_arguments_v0 obp_arg;

arch/sparc32/builtin.c

@@ -8,7 +8,7 @@
 
 #include "openbios/config.h"
 #include "asm/types.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 
 /*
  * wrap an array around the hex'ed dictionary file

arch/sparc32/context.c

@@ -6,7 +6,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "context.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 #define MAIN_STACK_SIZE 16384

arch/sparc32/elfload.c

@@ -8,7 +8,7 @@
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #include "boot.h"

arch/sparc32/entry.S

@@ -12,7 +12,7 @@
 #include "asm/crs.h"
 #define NO_QEMU_PROTOS
 #define NO_OPENBIOS_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 
 #define CFG_ADDR 0x00000510
 #define CFG_ASI  0x2d

arch/sparc32/forthload.c

@@ -9,7 +9,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printk printk

arch/sparc32/lib.c

@@ -13,7 +13,7 @@
 #include "asm/asi.h"
 #include "pgtsrmmu.h"
 #include "openprom.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 #define NCTX_SWIFT  0x100

arch/sparc32/linux_load.c

@@ -11,7 +11,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 #include "loadfs.h"
 #include "boot.h"

arch/sparc32/multiboot.c

@@ -2,7 +2,7 @@
 
 #include "openbios/config.h"
 #include "asm/io.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define printf printk

arch/sparc32/openbios.c

@@ -15,7 +15,7 @@
 #include "kernel/stack.h"
 #include "openbios/nvram.h"
 #include "../../drivers/timer.h" // XXX
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "openbios.h"
 #include "boot.h"
 #include "video_subr.h"

arch/sparc32/plainboot.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define FIXED_DICTSTART 0xfffe0000

arch/sparc32/romvec.c

@@ -11,7 +11,7 @@
 #include "openbios/config.h"
 #include "libopenbios/bindings.h"
 #include "drivers/drivers.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 #ifdef CONFIG_DEBUG_OBP

arch/sparc32/sys_info.c

@@ -1,7 +1,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 #include "boot.h"
 

arch/sparc64/aoutload.c

@@ -7,7 +7,7 @@
 #include "kernel/kernel.h"
 #define CONFIG_SPARC64_PAGE_SIZE_8KB
 #include "a.out.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printf printk

arch/sparc64/boot.c

@@ -8,7 +8,7 @@
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 struct sys_info sys_info;

arch/sparc64/boot.h

@@ -37,6 +37,7 @@ void boot(void);
 
 // sys_info.c
 extern uint64_t qemu_mem_size;
+extern void collect_sys_info(struct sys_info *info);
 
 // console.c
 void ob_su_init(uint64_t base, uint64_t offset, int intr);

arch/sparc64/builtin.c

@@ -8,7 +8,7 @@
 
 #include "openbios/config.h"
 #include "asm/types.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 
 /*
  * wrap an array around the hex'ed dictionary file

arch/sparc64/console.c

@@ -13,7 +13,7 @@
 #include "openbios.h"
 #include "video_subr.h"
 #include "libc/vsprintf.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 /* ******************************************************************

arch/sparc64/context.c

@@ -6,7 +6,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "context.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 #define MAIN_STACK_SIZE 16384

arch/sparc64/elfload.c

@@ -8,7 +8,7 @@
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #include "boot.h"

arch/sparc64/entry.S

@@ -13,7 +13,7 @@
 #include "lsu.h"
 #define NO_QEMU_PROTOS
 #define NO_OPENBIOS_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 
 #define PROM_ADDR 0x1fff0000000
 #define CFG_ADDR  0x1fe02000510

arch/sparc64/fcodeload.c

@@ -5,7 +5,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printf printk

arch/sparc64/forthload.c

@@ -9,7 +9,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printk printk

arch/sparc64/lib.c

@@ -11,7 +11,7 @@
 #include "libc/vsprintf.h"
 #include "libopenbios/bindings.h"
 #include "spitfire.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 #include "ofmem_sparc64.h"

arch/sparc64/linux_load.c

@@ -11,7 +11,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 #include "loadfs.h"
 #include "boot.h"

arch/sparc64/multiboot.c

@@ -2,7 +2,7 @@
 
 #include "openbios/config.h"
 #include "asm/io.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define printf printk

arch/sparc64/openbios.c

@@ -11,14 +11,14 @@
 #include "drivers/drivers.h"
 #include "dict.h"
 #include "openbios/nvram.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "openbios.h"
 #include "drivers/pci.h"
 #include "asm/pci.h"
 #include "boot.h"
 #include "../../drivers/timer.h" // XXX
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 #include "video_subr.h"
 #include "libopenbios/ofmem.h"
 

arch/sparc64/plainboot.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define FIXED_DICTSTART 0xfffe0000

arch/sparc64/sys_info.c

@@ -1,7 +1,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 #include "boot.h"
 

arch/x86/boot.c

@@ -12,7 +12,7 @@
 #include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 struct sys_info sys_info;

arch/x86/builtin.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 
 /*
  * wrap an array around the hex'ed dictionary file

arch/x86/context.c

@@ -10,7 +10,7 @@
 #include "kernel/kernel.h"
 #include "segment.h"
 #include "context.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "boot.h"
 
 #define MAIN_STACK_SIZE 16384

arch/x86/elfload.c

@@ -8,7 +8,7 @@
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #include "boot.h"

arch/x86/forthload.c

@@ -9,7 +9,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printk printk

arch/x86/linux_load.c

@@ -11,7 +11,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "libopenbios/bindings.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 #include "segment.h"
 #include "loadfs.h"

arch/x86/multiboot.c

@@ -2,7 +2,7 @@
 
 #include "openbios/config.h"
 #include "asm/io.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #ifdef CONFIG_DEBUG_BOOT

arch/x86/openbios.c

@@ -14,11 +14,12 @@
 #include "kernel/stack.h"
 #include "drivers/drivers.h"
 #include "drivers/pci.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "openbios.h"
 #include "relocate.h"
 
 void boot(void);
+void collect_sys_info(struct sys_info *info);
 
 static unsigned char intdict[256 * 1024];
 

arch/x86/plainboot.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "multiboot.h"
 
 #define FIXED_DICTSTART 0xfffe0000

arch/x86/segment.c

@@ -5,7 +5,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "relocate.h"
 #include "segment.h"
 

arch/x86/sys_info.c

@@ -1,6 +1,6 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "context.h"
 
 #ifdef CONFIG_DEBUG_BOOT

drivers/fw_cfg.c

@@ -3,7 +3,7 @@
 #include "libc/byteorder.h"
 #include "libopenbios/ofmem.h"
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 
 #if !defined(CONFIG_SPARC64)
 static volatile uint16_t *fw_cfg_cmd;

drivers/obio.c

@@ -21,7 +21,7 @@
 #include "libopenbios/ofmem.h"
 #include "obio.h"
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 #include "escc.h"
 
 #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"

include/arch/ppc/io.h

@@ -4,7 +4,7 @@
 #include "asm/types.h"
 
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 
 extern unsigned long virt_offset;
 

include/arch/sparc64/io.h

@@ -4,7 +4,7 @@
 #include "asm/types.h"
 
 #define NO_QEMU_PROTOS
-#include "openbios/fw_cfg.h"
+#include "arch/common/fw_cfg.h"
 
 extern unsigned long va_shift; // Set in entry.S
 // Defined in ldscript

include/libopenbios/sys_info.h

@@ -22,7 +22,6 @@ struct sys_info {
     unsigned long *dict_end;
 };
 
-void collect_sys_info(struct sys_info *info);
 void collect_elfboot_info(struct sys_info *info);
 void collect_linuxbios_info(struct sys_info *info);
 

libopenbios/build.xml

@@ -4,15 +4,15 @@
   <object source="bindings.c"/>
   <object source="client.c"/>
   <object source="console_common.c"/>
-  <object source="elfnote.c" condition="X86"/>
-  <object source="elfnote.c" condition="AMD64"/>
-  <object source="elfnote.c" condition="SPARC32"/>
-  <object source="elfnote.c" condition="SPARC64"/>
-  <object source="elfload.c" condition="PPC"/>
+  <object source="elf_info.c" condition="X86"/>
+  <object source="elf_info.c" condition="AMD64"/>
+  <object source="elf_info.c" condition="SPARC32"/>
+  <object source="elf_info.c" condition="SPARC64"/>
+  <object source="elf_info.c" condition="PPC"/>
   <object source="font_8x8.c" condition="FONT_8X8"/>
   <object source="font_8x16.c" condition="FONT_8X16"/>
   <object source="ipchecksum.c"/>
-  <object source="linuxbios.c" condition="LINUXBIOS"/>
+  <object source="linuxbios_info.c" condition="LINUXBIOS"/>
   <object source="ofmem_common.c" condition="OFMEM"/>
  </library>
 

libopenbios/elf_info.c

@@ -1,7 +1,7 @@
 /* Support for ELF Boot Proposal as a boot image */
 #include "openbios/config.h"
 #include "elf_boot.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 #include "asm/io.h"
 #include "libopenbios/ipchecksum.h"
 #include "openbios-version.h"

libopenbios/linuxbios_info.c

@@ -6,7 +6,7 @@
 #include "asm/io.h"
 #include "linuxbios.h"
 #include "libopenbios/ipchecksum.h"
-#include "sys_info.h"
+#include "libopenbios/sys_info.h"
 
 #ifdef CONFIG_DEBUG_BOOT
 #define debug printk