From: Paul Kocialkowski <[email protected]> While most sun8i platforms have secure SRAM available, some do not. This is the case for the R40/V40 (based on sun7i) and V3/V3s.
Add the exceptions to the Kconfig default and clean up its align. Update affected defconfigs to reflect the new default. Signed-off-by: Paul Kocialkowski <[email protected]> --- arch/arm/cpu/armv7/Kconfig | 6 ++++-- configs/Bananapi_M2_Ultra_defconfig | 1 - configs/LicheePi_Zero_defconfig | 1 - configs/bananapi_m2_berry_defconfig | 1 - configs/pinecube_defconfig | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig index ab86d642eeeb..769e5e1a4a53 100644 --- a/arch/arm/cpu/armv7/Kconfig +++ b/arch/arm/cpu/armv7/Kconfig @@ -29,8 +29,10 @@ config ARMV7_BOOT_SEC_DEFAULT config HAS_ARMV7_SECURE_BASE bool "Enable support for a ahardware secure memory area" - default y if ARCH_LS1021A || ARCH_MX7 || ARCH_MX7ULP || ARCH_STM32MP \ - || MACH_SUN6I || MACH_SUN7I || MACH_SUN8I || TEGRA124 + default y if ARCH_LS1021A || ARCH_MX7 || ARCH_MX7ULP || \ + ARCH_STM32MP || MACH_SUN6I || MACH_SUN7I || \ + (MACH_SUN8I && !MACH_SUN8I_R40 && !MACH_SUN8I_V3_V3S) || \ + TEGRA124 config ARMV7_SECURE_BASE hex "Base address for secure mode memory" diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig index b1195afea20c..97570fa7b47b 100644 --- a/configs/Bananapi_M2_Ultra_defconfig +++ b/configs/Bananapi_M2_Ultra_defconfig @@ -5,7 +5,6 @@ CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -# CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y diff --git a/configs/LicheePi_Zero_defconfig b/configs/LicheePi_Zero_defconfig index b2cf0a018c7f..299deb0195a2 100644 --- a/configs/LicheePi_Zero_defconfig +++ b/configs/LicheePi_Zero_defconfig @@ -3,5 +3,4 @@ CONFIG_ARCH_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun8i-v3s-licheepi-zero" CONFIG_SPL=y CONFIG_MACH_SUN8I_V3S=y -# CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_NO_NET=y diff --git a/configs/bananapi_m2_berry_defconfig b/configs/bananapi_m2_berry_defconfig index 94d29a4743e1..6bbdcdd7e7eb 100644 --- a/configs/bananapi_m2_berry_defconfig +++ b/configs/bananapi_m2_berry_defconfig @@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry" CONFIG_SPL=y CONFIG_MACH_SUN8I_R40=y CONFIG_DRAM_CLK=576 -# CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y diff --git a/configs/pinecube_defconfig b/configs/pinecube_defconfig index 088dd6f8630a..7c68fff2ea22 100644 --- a/configs/pinecube_defconfig +++ b/configs/pinecube_defconfig @@ -6,7 +6,6 @@ CONFIG_MACH_SUN8I_V3=y CONFIG_DRAM_CLK=504 CONFIG_DRAM_ODT_EN=y CONFIG_I2C0_ENABLE=y -# CONFIG_HAS_ARMV7_SECURE_BASE is not set CONFIG_SPL_I2C=y CONFIG_NO_NET=y CONFIG_SPL_SYS_I2C_LEGACY=y -- 2.49.0
