Move the kernel header files into include/kernel to synchronise with the code directory structure.

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


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

arch/amd64/console.c

@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios.h"
 
 #ifdef CONFIG_DEBUG_CONSOLE

arch/amd64/context.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "segment.h"
 #include "context.h"
 

arch/amd64/elfload.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"

arch/amd64/lib.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 #include "libc/stdlib.h"
 #include "libc/vsprintf.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 
 /* Format a string and print it on the screen, just like the libc
  * function printf.

arch/amd64/linux_load.c

@@ -9,7 +9,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"

arch/amd64/loadfs.c

@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

arch/amd64/openbios.c

@@ -10,8 +10,8 @@
 #include "openbios/bindings.h"
 #include "asm/types.h"
 #include "dict.h"
-#include "openbios/kernel.h"
-#include "openbios/stack.h"
+#include "kernel/kernel.h"
+#include "kernel/stack.h"
 #include "sys_info.h"
 #include "openbios.h"
 #include "relocate.h"

arch/amd64/segment.c

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

arch/amd64/sys_info.c

@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "sys_info.h"
 #include "context.h"
 

arch/ppc/briq/briq.c

@@ -17,7 +17,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/nvram.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"

arch/ppc/kernel.c

@@ -20,8 +20,8 @@
 #include "openbios/config.h"
 #include "dict.h"
 #include "openbios/bindings.h"
-#include "openbios/stack.h"
-#include "openbios/kernel.h"
+#include "kernel/stack.h"
+#include "kernel/kernel.h"
 #include "libc/string.h"
 #include "kernel.h"
 

arch/ppc/mol/mol.c

@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/nvram.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"

arch/ppc/pearpc/pearpc.c

@@ -17,7 +17,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/nvram.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"

arch/ppc/qemu/kernel.c

@@ -21,8 +21,8 @@
 #include "openbios/config.h"
 #include "dict.h"
 #include "openbios/bindings.h"
-#include "openbios/stack.h"
-#include "openbios/kernel.h"
+#include "kernel/stack.h"
+#include "kernel/kernel.h"
 #include "libc/string.h"
 #include "kernel.h"
 

arch/ppc/qemu/qemu.c

@@ -17,7 +17,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/nvram.h"
 #include "openbios/bindings.h"
 #include "openbios/drivers.h"

arch/sparc32/aoutload.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "a.out.h"
 #include "sys_info.h"
 #include "loadfs.h"

arch/sparc32/console.c

@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/drivers.h"
 #include "openbios.h"
 #include "video_subr.h"

arch/sparc32/context.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "context.h"
 #include "sys_info.h"
 #include "boot.h"

arch/sparc32/elfload.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"

arch/sparc32/forthload.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"

arch/sparc32/linux_load.c

@@ -9,7 +9,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"

arch/sparc32/loadfs.c

@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

arch/sparc32/openbios.c

@@ -11,8 +11,8 @@
 #include "openbios/drivers.h"
 #include "asm/types.h"
 #include "dict.h"
-#include "openbios/kernel.h"
-#include "openbios/stack.h"
+#include "kernel/kernel.h"
+#include "kernel/stack.h"
 #include "openbios/nvram.h"
 #include "../../drivers/timer.h" // XXX
 #include "sys_info.h"

arch/sparc32/sys_info.c

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

arch/sparc64/aoutload.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #define CONFIG_SPARC64_PAGE_SIZE_8KB
 #include "a.out.h"
 #include "sys_info.h"

arch/sparc64/console.c

@@ -7,7 +7,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/drivers.h"
 #include "openbios/fontdata.h"
 #include "openbios.h"

arch/sparc64/context.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "context.h"
 #include "sys_info.h"
 #include "boot.h"

arch/sparc64/elfload.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"

arch/sparc64/fcodeload.c

@@ -3,7 +3,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"

arch/sparc64/forthload.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"

arch/sparc64/linux_load.c

@@ -9,7 +9,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"

arch/sparc64/loadfs.c

@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

arch/sparc64/sys_info.c

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

arch/unix/unix.c

@@ -27,9 +27,9 @@
 #include "openbios/sysinclude.h"
 #include "mconfig.h"
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "dict.h"
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 #include "arch/unix/plugins.h"
 #include "openbios/bindings.h"
 #include "openbios-version.h"

arch/x86/console.c

@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios.h"
 
 #ifdef CONFIG_DEBUG_CONSOLE

arch/x86/context.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "segment.h"
 #include "context.h"
 #include "sys_info.h"

arch/x86/elfload.c

@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/elf.h"
 #include "asm/elf.h"
 #include "elf_boot.h"

arch/x86/forthload.c

@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"

arch/x86/lib.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>
 #include "libc/stdlib.h"
 #include "libc/vsprintf.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 
 /* Format a string and print it on the screen, just like the libc
  * function printf.

arch/x86/linux_load.c

@@ -9,7 +9,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"

arch/x86/loadfs.c

@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

arch/x86/openbios.c

@@ -10,8 +10,8 @@
 #include "openbios/bindings.h"
 #include "asm/types.h"
 #include "dict.h"
-#include "openbios/kernel.h"
-#include "openbios/stack.h"
+#include "kernel/kernel.h"
+#include "kernel/stack.h"
 #include "openbios/drivers.h"
 #include "openbios/pci.h"
 #include "sys_info.h"

arch/x86/segment.c

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

arch/x86/sys_info.c

@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "sys_info.h"
 #include "context.h"
 

drivers/esp.c

@@ -15,7 +15,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 

drivers/floppy.c

@@ -1,6 +1,6 @@
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 

drivers/ide.c

@@ -15,7 +15,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 

drivers/obio.c

@@ -12,7 +12,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 

drivers/pc_kbd.c

@@ -7,7 +7,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/drivers.h"
 #include "libc/vsprintf.h"
 

drivers/pc_serial.c

@@ -7,7 +7,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/drivers.h"
 #include "libc/vsprintf.h"
 

drivers/pci.c

@@ -17,7 +17,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/pci.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"

drivers/sbus.c

@@ -12,7 +12,7 @@
 
 #include "openbios/config.h"
 #include "openbios/bindings.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 #include "openbios/drivers.h"

drivers/vga_vbe.c

@@ -17,7 +17,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios/bindings.h"
 #include "openbios/pci.h"
 #include "openbios/drivers.h"

include/kernel/kernel.h

@@ -18,7 +18,7 @@
 #ifndef _H_KERNEL
 #define _H_KERNEL
 
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 #include "asm/io.h"
 
 /* Interrupt status */

include/ofmem.h

@@ -17,7 +17,7 @@
 #ifndef _H_OFMEM
 #define _H_OFMEM
 
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 
 typedef struct alloc_desc {
 	struct alloc_desc 	*next;

include/openbios/bindings.h

@@ -17,8 +17,8 @@
 #ifndef _H_BINDINGS
 #define _H_BINDINGS
 
-#include "openbios/stack.h"
-#include "openbios/kernel.h"
+#include "kernel/stack.h"
+#include "kernel/kernel.h"
 
 #define PUSH3(a,b,c)	do { PUSH((a)); PUSH((b)); PUSH((c)); } while(0)
 #define PUSH2(a,b)	do { PUSH((a)); PUSH((b)); } while(0)

kernel/bootstrap.c

@@ -22,9 +22,9 @@
 #endif
 
 #include "openbios/config.h"
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 #include "openbios/sysinclude.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "dict.h"
 #include "cross.h"
 #include "openbios-version.h"

kernel/dict.c

@@ -8,7 +8,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "dict.h"
 #ifdef BOOTSTRAP
 #include <string.h>

kernel/primitives.c

@@ -8,8 +8,8 @@
 
 #include "openbios/config.h"
 #include "openbios/sysinclude.h"
-#include "openbios/stack.h"
-#include "openbios/kernel.h"
+#include "kernel/stack.h"
+#include "kernel/kernel.h"
 #include "dict.h"
 
 /*

kernel/stack.c

@@ -8,7 +8,7 @@
 
 
 #include "openbios/config.h"
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 #include "cross.h"
 
 #define dstacksize 512

packages/init.c

@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "packages.h"
 
 void