| Message ID | 1469095779-8020-5-git-send-email-hongbo.zhang@nxp.com |
|---|---|
| State | Accepted |
| Commit | 3288628a8d23681c865e91e65a341d48eb5fed73 |
| Delegated to: | York Sun |
| Headers | show |
On 07/21/2016 03:10 AM, macro.wave.z@gmail.com wrote: > From: Hongbo Zhang <hongbo.zhang@nxp.com> > > LS1021 offers two secure OCRAM blocks for trustzone. > This patch moves all the secure text sections into the OCRAM. > > Signed-off-by: Wang Dongsheng <dongsheng.wang@nxp.com> > Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com> > --- > arch/arm/include/asm/arch-ls102xa/config.h | 2 +- > include/configs/ls1021aqds.h | 2 ++ > include/configs/ls1021atwr.h | 2 ++ > 3 files changed, 5 insertions(+), 1 deletion(-) Applied to fsl-qoriq master. Awaiting upstream. Thanks. York
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 7a0e4bf..4729044 100644 --- 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 ba3331f..47180f9 100644 --- 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 96ad683..16b5d9c 100644 --- 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