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>

diff --git a/Makefile b/Makefile
index d18a973a244f1cc86b4236b58ecaa15253946608..25e8fc83e09db0cad1eec2d059a54ecf0949be54 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 1923a177a11adaf4765fad3a20e88c6d51ff8208..fc680fcd83c21525709a977af3acfd7f7b591960 100644 (file)
--- 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 ac7a8f05e6ce27551ab0e1334d66a7a9b279cfc7..a86bc00864c870c9490193f806f556c68d01be85 100644 (file)
--- 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 $< $@