diff options
| author | Simon Glass <sjg@chromium.org> | 2013-03-05 14:39:54 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-15 16:14:00 -0400 |
| commit | 86cfb6bdecc3a312a939bbd89560f500f45193c3 (patch) | |
| tree | 8d087d65dea22220c82000febb7bb5a30478ea93 | |
| parent | be274b99abd5d8ef3b57aa16a3443b0950002c94 (diff) | |
| download | u-boot-imx-86cfb6bdecc3a312a939bbd89560f500f45193c3.zip u-boot-imx-86cfb6bdecc3a312a939bbd89560f500f45193c3.tar.gz u-boot-imx-86cfb6bdecc3a312a939bbd89560f500f45193c3.tar.bz2 | |
x86: Use sections header to obtain link symbols
These are defined in asm-generic/sections.h, so remove them from
architecture-specific files.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/cpu/coreboot/sdram.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot.lds | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/u-boot-x86.h | 9 | ||||
| -rw-r--r-- | arch/x86/lib/board.c | 1 | ||||
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 1 | ||||
| -rw-r--r-- | arch/x86/lib/relocate.c | 1 |
6 files changed, 5 insertions, 12 deletions
diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index a8136a0..786009c 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -28,6 +28,7 @@ #include <asm/u-boot-x86.h> #include <asm/global_data.h> #include <asm/processor.h> +#include <asm/sections.h> #include <asm/arch/sysinfo.h> #include <asm/arch/tables.h> diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 54f2fb7..69e6ea6 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -53,6 +53,7 @@ SECTIONS . = ALIGN(4); __data_end = .; + __init_end = .; . = ALIGN(4); .dynsym : { *(.dynsym*) } @@ -64,9 +65,6 @@ SECTIONS . = ALIGN(4); _end = .; - . = ALIGN(4); - - __end = .; .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 3e380fe..ae0c388 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -24,15 +24,6 @@ #ifndef _U_BOOT_I386_H_ #define _U_BOOT_I386_H_ 1 -/* Exports from the Linker Script */ -extern char __text_start[]; -extern ulong __data_end; -extern ulong __rel_dyn_start; -extern ulong __rel_dyn_end; -extern char __bss_start[]; -extern ulong __bss_end; -extern char _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 555301a..452e5d8 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -38,6 +38,7 @@ #include <asm/u-boot-x86.h> #include <asm/relocate.h> #include <asm/processor.h> +#include <asm/sections.h> #include <asm/init_helpers.h> #include <asm/init_wrappers.h> diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 7df9536..af9dbc1 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -32,6 +32,7 @@ #include <spi.h> #include <status_led.h> #include <asm/processor.h> +#include <asm/sections.h> #include <asm/u-boot-x86.h> #include <linux/compiler.h> diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index e893c2b..f178db9 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -36,6 +36,7 @@ #include <malloc.h> #include <asm/u-boot-x86.h> #include <asm/relocate.h> +#include <asm/sections.h> #include <elf.h> int copy_uboot_to_ram(void) |