From 02896c11fdb915ee288f275b58be8dc39532c90d Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Sun, 14 Mar 2010 17:06:20 +0000 Subject: [PATCH] Move the a.out, ELF and XCOFF header files down into include/arch/common. Signed-off-by: Mark Cave-Ayland git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@694 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/amd64/elfload.c | 4 ++-- arch/sparc32/aoutload.c | 2 +- arch/sparc32/elfload.c | 4 ++-- arch/sparc32/sys_info.c | 2 +- arch/sparc64/aoutload.c | 2 +- arch/sparc64/elfload.c | 4 ++-- arch/sparc64/sys_info.c | 2 +- arch/x86/elfload.c | 4 ++-- include/{ => arch/common}/a.out.h | 0 include/{openbios => arch/common}/elf.h | 0 include/{ => arch/common}/elf_boot.h | 0 include/{openbios => arch/common}/xcoff.h | 0 include/libopenbios/elfload.h | 2 +- libopenbios/elf_info.c | 2 +- libopenbios/elfload.c | 2 +- packages/elf-loader.c | 2 +- packages/xcoff-loader.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) rename include/{ => arch/common}/a.out.h (100%) rename include/{openbios => arch/common}/elf.h (100%) rename include/{ => arch/common}/elf_boot.h (100%) rename include/{openbios => arch/common}/xcoff.h (100%) diff --git a/arch/amd64/elfload.c b/arch/amd64/elfload.c index b432bba..6f5461d 100644 --- a/arch/amd64/elfload.c +++ b/arch/amd64/elfload.c @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" diff --git a/arch/sparc32/aoutload.c b/arch/sparc32/aoutload.c index 96e445c..8816fc4 100644 --- a/arch/sparc32/aoutload.c +++ b/arch/sparc32/aoutload.c @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" diff --git a/arch/sparc32/elfload.c b/arch/sparc32/elfload.c index f7ab8e5..2229309 100644 --- a/arch/sparc32/elfload.c +++ b/arch/sparc32/elfload.c @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" diff --git a/arch/sparc32/sys_info.c b/arch/sparc32/sys_info.c index 41f4e5f..e94e9ae 100644 --- a/arch/sparc32/sys_info.c +++ b/arch/sparc32/sys_info.c @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" diff --git a/arch/sparc64/aoutload.c b/arch/sparc64/aoutload.c index c947e67..9a004d7 100644 --- a/arch/sparc64/aoutload.c +++ b/arch/sparc64/aoutload.c @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" diff --git a/arch/sparc64/elfload.c b/arch/sparc64/elfload.c index 59a1b93..d328fbe 100644 --- a/arch/sparc64/elfload.c +++ b/arch/sparc64/elfload.c @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" diff --git a/arch/sparc64/sys_info.c b/arch/sparc64/sys_info.c index c6599d1..d95fd15 100644 --- a/arch/sparc64/sys_info.c +++ b/arch/sparc64/sys_info.c @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" diff --git a/arch/x86/elfload.c b/arch/x86/elfload.c index 11848ba..308e1c8 100644 --- a/arch/x86/elfload.c +++ b/arch/x86/elfload.c @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" diff --git a/include/a.out.h b/include/arch/common/a.out.h similarity index 100% rename from include/a.out.h rename to include/arch/common/a.out.h diff --git a/include/openbios/elf.h b/include/arch/common/elf.h similarity index 100% rename from include/openbios/elf.h rename to include/arch/common/elf.h diff --git a/include/elf_boot.h b/include/arch/common/elf_boot.h similarity index 100% rename from include/elf_boot.h rename to include/arch/common/elf_boot.h diff --git a/include/openbios/xcoff.h b/include/arch/common/xcoff.h similarity index 100% rename from include/openbios/xcoff.h rename to include/arch/common/xcoff.h diff --git a/include/libopenbios/elfload.h b/include/libopenbios/elfload.h index 9f398b8..39ecfdc 100644 --- a/include/libopenbios/elfload.h +++ b/include/libopenbios/elfload.h @@ -17,7 +17,7 @@ #ifndef _H_ELFLOAD #define _H_ELFLOAD -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" extern int is_elf( int fd, int offs ); diff --git a/libopenbios/elf_info.c b/libopenbios/elf_info.c index 25fcf10..0c7e2e9 100644 --- a/libopenbios/elf_info.c +++ b/libopenbios/elf_info.c @@ -1,6 +1,6 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" diff --git a/libopenbios/elfload.c b/libopenbios/elfload.c index c448893..6b88b04 100644 --- a/libopenbios/elfload.c +++ b/libopenbios/elfload.c @@ -33,7 +33,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #define DEBUG 0 #define MAX_HEADERS 32 diff --git a/packages/elf-loader.c b/packages/elf-loader.c index 87be749..c928f66 100644 --- a/packages/elf-loader.c +++ b/packages/elf-loader.c @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" /* TODO: manage ELF notes section */ diff --git a/packages/xcoff-loader.c b/packages/xcoff-loader.c index 5b5a415..4784b70 100644 --- a/packages/xcoff-loader.c +++ b/packages/xcoff-loader.c @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/xcoff.h" +#include "arch/common/xcoff.h" //#define DEBUG_XCOFF