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