These are defined in asm-generic/sections.h, so remove them from architecture-specific files.
Signed-off-by: Simon Glass sjg@chromium.org --- Changes in v3: - Add header to new x86 relocate.c and init_helpers.c
arch/x86/include/asm/u-boot-x86.h | 8 -------- arch/x86/lib/board.c | 1 + arch/x86/lib/init_helpers.c | 1 + arch/x86/lib/relocate.c | 1 + 4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 878a1ee..069cbbc 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -24,14 +24,6 @@ #ifndef _U_BOOT_I386_H_ #define _U_BOOT_I386_H_ 1
-/* Exports from the Linker Script */ -extern ulong __text_start; -extern ulong __data_end; -extern ulong __rel_dyn_start; -extern ulong __rel_dyn_end; -extern ulong __bss_start; -extern ulong __bss_end; - /* cpu/.../cpu.c */ int x86_cpu_init_r(void); int cpu_init_r(void); diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 5f0b62c..cf8d359 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -35,6 +35,7 @@ #include <watchdog.h> #include <stdio_dev.h> #include <asm/u-boot-x86.h> +#include <asm-generic/sections.h> #include <asm/relocate.h>
#include <asm/init_helpers.h> diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 9f4dee0..85e9255 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -31,6 +31,7 @@ #include <status_led.h> #include <asm/processor.h> #include <asm/u-boot-x86.h> +#include <asm-generic/sections.h>
#include <asm/init_helpers.h>
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 200baab..066667f 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -35,6 +35,7 @@ #include <malloc.h> #include <asm/u-boot-x86.h> #include <asm/relocate.h> +#include <asm-generic/sections.h> #include <elf.h>
int copy_uboot_to_ram(void)