s5pc110: universal: support s5pc100 & s5pc110 simultaneously

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --git a/cpu/arm_cortexa8/start.S b/cpu/arm_cortexa8/start.S
index af1eeae..ad662e5 100644 (file)
--- a/cpu/arm_cortexa8/start.S
+++ b/cpu/arm_cortexa8/start.S
@@ -142,8 +142,7 @@ next:
        bl      cpu_init_crit
 #endif
 
-#ifndef CONFIG_ONENAND_IPL
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+#if !defined(CONFIG_SKIP_RELOCATE_UBOOT) || !defined(CONFIG_ONENAND_IPL)
 relocate:                              @ relocate U-Boot to RAM
        adr     r0, _start              @ r0 <- current position of code
        ldr     r1, _TEXT_BASE          @ test if we run from flash or RAM
@@ -161,7 +160,6 @@ copy_loop:                          @ copy 32 bytes at a time
        cmp     r0, r2                  @ until source end addreee [r2]
        ble     copy_loop
 #endif /* CONFIG_SKIP_RELOCATE_UBOOT */
-#endif /* CONFIG_ONENAND_IPL */
 
        /* Set up the stack */
 stack_setup:

diff --git a/onenand_ipl/board/samsung/universal/Makefile b/onenand_ipl/board/samsung/universal/Makefile
index e23fc8b..6069adc 100644 (file)
--- a/onenand_ipl/board/samsung/universal/Makefile
+++ b/onenand_ipl/board/samsung/universal/Makefile
@@ -12,6 +12,11 @@
 #
 
 include $(TOPDIR)/config.mk
+# S5PC100 loads at 0x34000
+# S5PC110 loads at 0x30000
+# Now it uses the S5PC100 as default
+# If you use the S5PC110, the load address is relocated at start.S
+# XXX Never set it S5PC110 it don't relocate it
 TEXT_BASE   = 0xD0034000
 TEXT_BASE2K = 0xD0034800
 TEXT_BASE4K = 0xD0035000
@@ -19,7 +24,7 @@ TEXT_BASE8K = 0xD0036000
 
 LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot-onenand.lds
 LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
-AFLAGS += -DCONFIG_ONENAND_IPL -g
+AFLAGS += -DCONFIG_ONENAND_IPL -g -UTEXT_BASE -DTEXT_BASE=$(TEXT_BASE)
 CFLAGS += -DCONFIG_ONENAND_IPL -g
 OBJCFLAGS += --gap-fill=0x00