ARM: uniphier: change stack pointer address for SPL

No special reason for the current stack address 0x0ff08000.
Change it to 0x00100000 to simplify the init_page_table.

There are two types of SoCs in terms of the load address of SPL.

 [1] PH1-sLD3, PH1-LD4, PH1-sLD8
   SPL is loaded at 0x00040000-0x0004ffff
 [2] PH1-Pro4, PH1-Pro5, ProXstream2, PH1-LD6b
   SPL is loaded at 0x00100000-0x0010ffff

The new stack area (0x000f8000-0x00100000) should be safe for all the
cases.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/init_page_table.S b/arch/arm/mach-uniphier/init_page_table.S
index 2d3ad15c6e2a20601c2a69b86e0b7209c6f3ff2c..4ed2656ee97c51e53c6efce7e4a4f8e83c16d7dd 100644 (file)
--- a/arch/arm/mach-uniphier/init_page_table.S
+++ b/arch/arm/mach-uniphier/init_page_table.S
@@ -13,15 +13,12 @@
 #define DEVICE 0x00002002 /* Non-shareable Device */
 #define NORMAL 0x0000000e /* Normal Memory Write-Back, No Write-Allocate */
 
-#define TEXT_SECTION   ((CONFIG_SPL_TEXT_BASE) >> (SECTION_SHIFT))
-#define STACK_SECTION  ((CONFIG_SPL_STACK) >> (SECTION_SHIFT))
-
        .section ".rodata"
        .align 14
 ENTRY(init_page_table)
        section = 0
        .rept NR_SECTIONS
-       .if section == 0 || section == 1 || section == STACK_SECTION
+       .if section == 0 || section == 1
        attr = NORMAL
        .else
        attr = DEVICE

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 6f91ee61ae63dd4d243ed0ea852744fd0a9deeca..43fe946935e70c43ea3313635437d7821db5b9a2 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -252,7 +252,7 @@
 #define CONFIG_SPL_TEXT_BASE           0x00100000
 #endif
 
-#define CONFIG_SPL_STACK               (0x0ff08000)
+#define CONFIG_SPL_STACK               (0x00100000)
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE)
 
 #define CONFIG_PANIC_HANG