Skip to contentSkip to conversation

S3C6400/SMDK6400: fix stack_setup in start.S

PATCH New Seunghyeon Rhee (이승현) 2 participants 2 messages Oct 31, 2009 – Nov 2, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 S3C6400/SMDK6400: fix stack_setup in start.S

stack_setup is modified to initialize the stack on the correct address in DRAM accroding to the typical memory configuration described in README and the related CONFIG_* macro definitions. This makes macro CONFIG_MEMORY_UPPER_CODE no longer necessry. This was introduced and used only by this board for some unclear reason. The definition of this macro is removed because it's not referenced elsewhere.

---
 cpu/arm1176/start.S        |    7 +------
 include/configs/smdk6400.h |    2 --
 2 files changed, 1 insertions(+), 8 deletions(-)
cpu/arm1176/start.S +1 -4
index cb891df..1ecb3b9 100644
@@ -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 */

include/configs/smdk6400.h +0 -2
index f6e1221..f644cd2 100644
@@ -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
Signature · 8 lines
1.6.2.5


-- 
Seunghyeon Rhee, Ph.D. / Director
LPM Technology Inc.
T +82-70-8255-6007  F +82-2-6442-6462
M +82-10-2790-0657
#1 lore raw

PATCH 1/1 S3C6400/SMDK6400: fix stack_setup in start.S

Dear Seunghyeon Rhee

2009/10/31 "Seunghyeon Rhee (???)" <[email protected]>:

Quoted 21 lines

stack_setup is modified to initialize the stack on the correct address in DRAM accroding to the typical memory configuration described in README and the related CONFIG_* macro definitions. This makes macro CONFIG_MEMORY_UPPER_CODE no longer necessry. This was introduced and used only by this board for some unclear reason. The definition of this macro is removed because it's not referenced elsewhere.

---
?cpu/arm1176/start.S ? ? ? ?| ? ?7 +------
?include/configs/smdk6400.h | ? ?2 --
?2 files changed, 1 insertions(+), 8 deletions(-)

cpu/arm1176/start.S +0 -0
index cb891df..1ecb3b9 100644
@@ -241,16 +241,11 @@ mmu_enable:

?skip_hw_init:
? ? /* Set up the stack ? ? ? ? ? ? ? ? ? ? ? ? ? ?*/ ?stack_setup:

cpu/arm1176/start.S

Quoted 5 lines
cpu/arm1176/start.S +1 -4
-#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 ? ? ? ?*/

this change is unnecessary, TEXT_BASE and CONFIG_SYS_UBOOT_BASE must be same. btw, is there need CONFIG_SYS_UBOOT_BASE define?

Quoted 28 lines

? ? 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 ? ?*/

cpu/arm1176/start.S +0 -2
-#endif
-

?clear_bss:
? ? ldr ? ?r0, _bss_start ? ? ? ?/* find start of bss segment ? ? ? ?*/ ? ? ldr ? ?r1, _bss_end ? ? ? ?/* stop here ? ? ? ? ? ? ? ? ? ? ? ?*/

include/configs/smdk6400.h +0 -0
index f6e1221..f644cd2 100644
@@ -49,8 +49,6 @@

?#define CONFIG_ENABLE_MMU
?#endif

include/configs/smdk6400.h +0 -2
-#define CONFIG_MEMORY_UPPER_CODE
-

?#define CONFIG_SETUP_MEMORY_TAGS
?#define CONFIG_CMDLINE_TAG
?#define CONFIG_INITRD_TAG
--
1.6.2.5

Quoted 10 lines

--
Seunghyeon Rhee, Ph.D. / Director
LPM Technology Inc.
T +82-70-8255-6007 ?F +82-2-6442-6462
M +82-10-2790-0657
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Thanks for patch :)
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net