From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Fri, 8 Feb 2013 07:12:17 -0800 Subject: [U-Boot] [PATCH v5 21/23] x86: Use sections header to obtain link symbols In-Reply-To: <1360336339-10703-1-git-send-email-sjg@chromium.org> References: <1360336339-10703-1-git-send-email-sjg@chromium.org> Message-ID: <1360336339-10703-22-git-send-email-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de These are defined in asm-generic/sections.h, so remove them from architecture-specific files. Signed-off-by: Simon Glass --- Changes in v5: - Include asm/sections.h in x86 sdram code - Define _end instead of __end for x86 Changes in v4: - Use asm/sections.h instead of asm-generic/sections.h Changes in v3: - Add header to new x86 relocate.c and init_helpers.c Changes in v2: None arch/x86/cpu/coreboot/sdram.c | 1 + arch/x86/cpu/u-boot.lds | 4 +--- arch/x86/include/asm/u-boot-x86.h | 9 --------- arch/x86/lib/board.c | 1 + arch/x86/lib/init_helpers.c | 1 + 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 #include #include +#include #include #include diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 449ebfe..44b49ef 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 #include #include +#include #include #include 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 #include #include +#include #include #include 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 #include #include +#include #include int copy_uboot_to_ram(void) -- 1.8.1