diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2010-10-16 21:32:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 23:05:12 +0200 |
| commit | 451a0c39ae8553cb7f1ae3385211c0c17d391465 (patch) | |
| tree | c01bf4d207d7a684829dd0b8df02170691deea51 | |
| parent | 20ae5193e325ad005ca9e15377838e0763069658 (diff) | |
| download | talos-obmc-uboot-451a0c39ae8553cb7f1ae3385211c0c17d391465.tar.gz talos-obmc-uboot-451a0c39ae8553cb7f1ae3385211c0c17d391465.zip | |
PXA: Fix vpac270 OneNAND booter
NOTE: The modification in Makefile will be superseded by a pending patch!
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/configs/vpac270.h | 3 | ||||
| -rw-r--r-- | onenand_ipl/board/vpac270/Makefile | 5 |
3 files changed, 7 insertions, 3 deletions
@@ -1025,6 +1025,8 @@ vpac270_onenand_config : unconfig @if [ "$(findstring onenand,$@)" ] ; then \ echo "#define CONFIG_ONENAND_U_BOOT" \ >>$(obj)include/config.h ; \ + echo "#define CONFIG_256M_U_BOOT" \ + >>$(obj)include/config.h ; \ fi; @if [ "$(findstring 256M,$@)" ] ; then \ echo "#define CONFIG_256M_U_BOOT" \ diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 1923a177a1..fc680fcd83 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -180,7 +180,8 @@ #define CONFIG_SYS_MEMTEST_START 0xa0400000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ -#define CONFIG_SYS_LOAD_ADDR (0x5c000000) +#define CONFIG_SYS_LOAD_ADDR PHYS_SDRAM_1 +#define CONFIG_SYS_IPL_LOAD_ADDR (0x5c000000) #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR \ (PHYS_SDRAM_1 + CONFIG_SYS_GBL_DATA_SIZE + 2048) diff --git a/onenand_ipl/board/vpac270/Makefile b/onenand_ipl/board/vpac270/Makefile index ac7a8f05e6..a86bc00864 100644 --- a/onenand_ipl/board/vpac270/Makefile +++ b/onenand_ipl/board/vpac270/Makefile @@ -1,5 +1,6 @@ -IPL =onenand_ipl + include $(TOPDIR)/config.mk +include $(TOPDIR)/board/$(BOARDDIR)/config.mk LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds LDFLAGS = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS) @@ -25,7 +26,7 @@ ALL = $(onenandobj)onenand-ipl $(onenandobj)onenand-ipl.bin $(onenandobj)onenand all: $(obj).depend $(ALL) $(onenandobj)onenand-ipl-2k.bin: $(onenandobj)onenand-ipl - $(OBJCOPY) ${OBJCFLAGS} --pad-to=0x5c040400 -O binary $< $@ + $(OBJCOPY) ${OBJCFLAGS} --pad-to=0x0800 -O binary $< $@ $(onenandobj)onenand-ipl.bin: $(onenandobj)onenand-ipl $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ |
