From 7ec6637f49fbaf52fbc1a61871b14ba5f7d09701 Mon Sep 17 00:00:00 2001

From: Kavin Lau liujingwencn@gmail.com Date: Fri, 4 Mar 2011 16:40:35 +0800 Subject: [PATCH 2/2] smdk6400: correct the compilation of smdk6400

--- board/samsung/smdk6400/u-boot-nand.lds | 34 ++++++++++++++++++++++------- include/configs/smdk6400.h | 2 + nand_spl/board/samsung/smdk6400/Makefile | 4 +- 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index 29a4f61..d4315b8 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -32,11 +32,9 @@ SECTIONS . = 0x00000000;

. = ALIGN(4); - .text : - { - arch/arm/cpu/arm1176/start.o (.text) - arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text) - *(.text) + .text : { + arch/arm/cpu/arm1176/start.o (.text) + *(.text) }

. = ALIGN(4); @@ -56,7 +54,27 @@ SECTIONS .mmudata : { *(.mmudata) }

. = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) . = ALIGN(4); } - _end = .; + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + .bss __rel_dyn_start (OVERLAY) : { + __bss_start = .; + *(.bss) + . = ALIGN(4); + _end = .; + } + + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } } diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 671f2c7..d85a4ab 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -206,6 +206,8 @@

/* base address for uboot */ #define CONFIG_SYS_PHY_UBOOT_BASE (CONFIG_SYS_SDRAM_BASE + 0x07e00000) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_PHY_UBOOT_BASE + 0x200000 - GENERATED_GBL_DATA_SIZE) /* total memory available to uboot */ #define CONFIG_SYS_UBOOT_SIZE (1024 * 1024)

diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile index 18cee10..a28706c 100644 --- a/nand_spl/board/samsung/smdk6400/Makefile +++ b/nand_spl/board/samsung/smdk6400/Makefile @@ -31,8 +31,8 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk

LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDFLAGS = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS) -AFLAGS += -DCONFIG_NAND_SPL -CFLAGS += -DCONFIG_NAND_SPL +AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL +CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL

SOBJS = start.o cpu_init.o lowlevel_init.o COBJS = nand_boot.o nand_ecc.o s3c64xx.o smdk6400_nand_spl.o