S3C6400/SMDK6400: fix stack_setup in start.S

Fix stack_setup to place the stack on the correct address in DRAM
accroding to U-Boot standard and remove conditional compilation by
CONFIG_MEMORY_UPPER_CODE macro that is not necessry. This macro
was introduced and used only by this board for some unclear reason.

The definition of this macro is also removed because it's not
referenced elsewhere.

Signed-off-by: Seunghyeon Rhee <seunghyeon@lpmtec.com>
Tested-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/cpu/arm1176/start.S b/cpu/arm1176/start.S
index 2bb9bf208dc39cb4b0d5aea3c070af4803bdb961..68a356d13e9a2d9069961d56286040bf4adeda39 100644 (file)
--- a/cpu/arm1176/start.S
+++ b/cpu/arm1176/start.S
@@ -241,16 +241,11 @@ mmu_enable:
 skip_hw_init:
        /* Set up the stack                                                 */
 stack_setup:
-#ifdef CONFIG_MEMORY_UPPER_CODE
-       ldr     sp, =(CONFIG_SYS_UBOOT_BASE + CONFIG_SYS_UBOOT_SIZE - 0xc)
-#else
-       ldr     r0, _TEXT_BASE          /* upper 128 KiB: relocated uboot   */
+       ldr     r0, =CONFIG_SYS_UBOOT_BASE      /* base of copy in DRAM     */
        sub     r0, r0, #CONFIG_SYS_MALLOC_LEN  /* malloc area                      */
        sub     r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo                        */
        sub     sp, r0, #12             /* leave 3 words for abort-stack    */
 
-#endif
-
 clear_bss:
        ldr     r0, _bss_start          /* find start of bss segment        */
        ldr     r1, _bss_end            /* stop here                        */

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index f6e1221294f332f95026ad50360803ec42747dc6..f644cd2cdaacad41fec892f7b61ff46b7146e8a0 100644 (file)
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -49,8 +49,6 @@
 #define CONFIG_ENABLE_MMU
 #endif
 
-#define CONFIG_MEMORY_UPPER_CODE
-
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG