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/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"