diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-16 15:45:02 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-16 15:45:02 +0900 |
| commit | ee70425486324b5d0ca2c1c272e24aa3010d4d2a (patch) | |
| tree | 9ef0ff8f9a78a09cb1869b89b77421c20a2a007e | |
| parent | 0f89d6658e077b043b6481af6a04715bf49472b8 (diff) | |
kexec: Move the uImage header to a better place.
This is a completely generic header for uImage support and has no
place being hidden away in an architecture directory. Move it up
to the top-level include so that other architectures can trivially
tie in uImage support, too.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | include/Makefile | 1 | ||||
| -rw-r--r-- | include/image.h (renamed from kexec/arch/arm/kexec-uImage-arm.h) | 0 | ||||
| -rw-r--r-- | kexec/arch/arm/Makefile | 1 | ||||
| -rw-r--r-- | kexec/arch/arm/kexec-uImage-arm.c | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/include/Makefile b/include/Makefile index bf2c4ed..de5a3bb 100644 --- a/include/Makefile +++ b/include/Makefile @@ -5,6 +5,7 @@ dist += include/Makefile \ include/x86/mb_info.h \ include/x86/mb_header.h \ include/elf.h \ + include/image.h \ include/boot/linuxbios_tables.h \ include/boot/beoboot.h \ include/boot/elf_boot.h diff --git a/kexec/arch/arm/kexec-uImage-arm.h b/include/image.h index cb62cde..cb62cde 100644 --- a/kexec/arch/arm/kexec-uImage-arm.h +++ b/include/image.h diff --git a/kexec/arch/arm/Makefile b/kexec/arch/arm/Makefile index 806c4d9..9416339 100644 --- a/kexec/arch/arm/Makefile +++ b/kexec/arch/arm/Makefile @@ -8,5 +8,4 @@ arm_KEXEC_SRCS+= kexec/arch/arm/kexec-arm.c dist += kexec/arch/arm/Makefile $(arm_KEXEC_SRCS) \ kexec/arch/arm/kexec-arm.h \ - kexec/arch/arm/kexec-uImage-arm.h \ kexec/arch/arm/include/arch/options.h diff --git a/kexec/arch/arm/kexec-uImage-arm.c b/kexec/arch/arm/kexec-uImage-arm.c index 44c8d5f..2291aae 100644 --- a/kexec/arch/arm/kexec-uImage-arm.c +++ b/kexec/arch/arm/kexec-uImage-arm.c @@ -4,9 +4,9 @@ #include <stdint.h> #include <string.h> #include <sys/types.h> +#include <image.h> #include "../../kexec.h" #include "kexec-arm.h" -#include "kexec-uImage-arm.h" int uImage_arm_probe(const char *buf, off_t len) { |