On Wednesday 14 February 2018 11:23 PM, Andrew F. Davis wrote:
TI_SECURE_DEVICE is used by both OMAP2+ and Keystone2 family devices, and so when ARCH_OMAP2PLUS was used to gate off the OMAP2+ Kconfig Keystone2 family devices lost this config option.
Move this option out of mach-omap2 Kconfig to a spot accessible by both families. We picked arch/arm/Kconfig over the TI specific board/ti/ location as this option is not specific to our boards but rather our architecture.
Plus at some point this option can be changed to just SECURE_DEVICE, as having secure parts is not exclusive to TI and so other vendors can interpret this option as needed by their device configurations.
Fixes: a93fbf4a7892 ("ARM: omap2+: rename config to ARCH_OMAP2PLUS and consolidate Kconfig") Signed-off-by: Andrew F. Davis afd@ti.com
Reviewed-by: Lokesh Vutla lokeshvutla@ti.com
Thanks and regards, Lokesh
arch/arm/Kconfig | 10 ++++++++++ arch/arm/mach-omap2/Kconfig | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7b618d6881..466c7502d5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1189,6 +1189,16 @@ config ARCH_ASPEED
endchoice
+config TI_SECURE_DEVICE
- bool "HS Device Type Support"
- depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS
- help
If a high secure (HS) device type is being used, this configmust be set. This option impacts various aspects of thebuild system (to create signed boot images that can beauthenticated) and the code. See the doc/README.ti-securefile for further details.source "arch/arm/mach-aspeed/Kconfig"
source "arch/arm/mach-at91/Kconfig" diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index abd1aa7fe1..62c25c4044 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -133,16 +133,6 @@ config SYS_MPUCLK help Defines the MPU clock speed (in MHz).
-config TI_SECURE_DEVICE
- bool "HS Device Type Support"
- depends on OMAP54XX || AM43XX || AM33XX || ARCH_KEYSTONE
- help
If a high secure (HS) device type is being used, this configmust be set. This option impacts various aspects of thebuild system (to create signed boot images that can beauthenticated) and the code. See the doc/README.ti-securefile for further details.config TI_SECURE_EMIF_REGION_START hex "Reserved EMIF region start address" depends on TI_SECURE_DEVICE