ARMv7: PSCI: ls102xa: move secure text section into OCRAM

LS1021 offers two secure OCRAM blocks for trustzone.
This patch moves all the secure text sections into the OCRAM.

Signed-off-by: Wang Dongsheng <[email protected]>
Signed-off-by: Hongbo Zhang <[email protected]>
Reviewed-by: York Sun <[email protected]>

diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index e0b118537eda557dbd2422af076f236ca7bd90f1..d408fe40561a51523b85eda7986c061475685d38 100644 (file)
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -10,7 +10,7 @@
 #define CONFIG_SYS_CACHELINE_SIZE              64
 
 #define OCRAM_BASE_ADDR                                0x10000000
-#define OCRAM_SIZE                             0x00020000
+#define OCRAM_SIZE                             0x00010000
 #define OCRAM_BASE_S_ADDR                      0x10010000
 #define OCRAM_S_SIZE                           0x00010000
 

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index ba3331f0a47cce0f474ebe01c4d37f67a1e98ed9..47180f9ce8b9d6cf13e4612099ab1726a2d1d063 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -13,6 +13,8 @@
 #define CONFIG_ARMV7_PSCI_1_0
 #define CONFIG_ARMV7_PSCI_NR_CPUS      CONFIG_MAX_CPUS
 
+#define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
+
 #define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_DISPLAY_CPUINFO

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 5b6e0a55ae9d3a07b46e4cc5da189402fc025e9a..2f19950dffe0b04bb9263f8b217454f6c1d48c8b 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -13,6 +13,8 @@
 #define CONFIG_ARMV7_PSCI_1_0
 #define CONFIG_ARMV7_PSCI_NR_CPUS      CONFIG_MAX_CPUS
 
+#define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
+
 #define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_DISPLAY_CPUINFO