ARM: Kconfig: Move TI_SECURE_DEVICE to a common area
Subsystems (3)
PATCH 1/3 ARM: Kconfig: Move TI_SECURE_DEVICE to a common area
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.
--- arch/arm/Kconfig | 10 ++++++++++ arch/arm/mach-omap2/Kconfig | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/Kconfig +10 -0
@@ -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 config + must be set. This option impacts various aspects of the + build system (to create signed boot images that can be + authenticated) and the code. See the doc/README.ti-secure + file for further details. + source "arch/arm/mach-aspeed/Kconfig" source "arch/arm/mach-at91/Kconfig"
arch/arm/mach-omap2/Kconfig +0 -10
@@ -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 config - must be set. This option impacts various aspects of the - build system (to create signed boot images that can be - authenticated) and the code. See the doc/README.ti-secure - file for further details. - config TI_SECURE_EMIF_REGION_START hex "Reserved EMIF region start address" depends on TI_SECURE_DEVICE
Signature · 1 line
2.16.1
PATCH 2/3 env: Fix missed getenv_ulong to env_get_ulong conversion
This seems to have been missed, possibly due to the inability to enable TI_SECURE_DEVICE on Keystone2 devices previously.
--- board/ti/ks2_evm/board_k2g.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/ti/ks2_evm/board_k2g.c +1 -1
@@ -376,7 +376,7 @@ int get_num_eth_ports(void)#ifdef CONFIG_TI_SECURE_DEVICE void board_pmmc_image_process (ulong pmmc_image,size_t pmmc_size) { -int id =getenv_ulong ("dev_pmmc" ,10 ,0 ); +int id =env_get_ulong ("dev_pmmc" ,10 ,0 );int ret;if (!rproc_is_initialized ())
Signature · 1 line
2.16.1
PATCH 2/3 env: Fix missed getenv_ulong to env_get_ulong conversion
Quoted 5 lines · Andrew F. Davis
This seems to have been missed, possibly due to the inability to enable
TI_SECURE_DEVICEon Keystone2 devices previously.Fixes bfebc8c965e4 ("env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()")Signed-off-by Andrew F. Davis <[email protected]>
Thanks and regards,
Lokesh
Quoted 18 lines
--- board/ti/ks2_evm/board_k2g.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)board/ti/ks2_evm/board_k2g.c +1
-1@@ -376,7 +376,7 @@ int get_num_eth_ports(void)#ifdef CONFIG_TI_SECURE_DEVICE void board_pmmc_image_process (ulong pmmc_image,size_t pmmc_size) { -int id =getenv_ulong ("dev_pmmc" ,10 ,0 ); +int id =env_get_ulong ("dev_pmmc" ,10 ,0 );int ret;if (!rproc_is_initialized ())
PATCH 2/3 env: Fix missed getenv_ulong to env_get_ulong conversion
In reply to Andrew F. DavisQuoted 6 lines · Andrew F. Davis
This seems to have been missed, possibly due to the inability to enable
TI_SECURE_DEVICEon Keystone2 devices previously.Fixes bfebc8c965e4 ("env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()")Signed-off-by Andrew F. Davis <[email protected]>Reviewed-by Lokesh Vutla <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/29c2d058/attachment.sig>
PATCH 3/3 defconfig: k2x_hs_evm: Re-enable TI_SECURE_DEVICE in HS K2x parts
In reply to Andrew F. DavisThese got removed in config re-syncs due to a Kconfig bug. Add these back here.
--- configs/k2e_hs_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/k2hk_hs_evm_defconfig | 2 ++ 3 files changed, 6 insertions(+)
configs/k2e_hs_evm_defconfig +2 -0
@@ -1,9 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y +CONFIG_TI_SECURE_DEVICE=y CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2E_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm" +CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y
configs/k2g_hs_evm_defconfig +2 -0
@@ -1,9 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y +CONFIG_TI_SECURE_DEVICE=y CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2G_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm" +CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y
configs/k2hk_hs_evm_defconfig +2 -0
@@ -1,9 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y +CONFIG_TI_SECURE_DEVICE=y CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2HK_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm" +CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y
Signature · 1 line
2.16.1
PATCH 3/3 defconfig: k2x_hs_evm: Re-enable TI_SECURE_DEVICE in HS K2x parts
Quoted 4 lines · Andrew F. Davis
These got removed in config re-syncs due to a
Kconfigbug. Add these back here.Signed-off-by Andrew F. Davis <[email protected]>
Thanks and regards,
Lokesh
Quoted 55 lines
--- configs/k2e_hs_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/k2hk_hs_evm_defconfig | 2 ++ 3 files changed, 6 insertions(+)configs/k2e_hs_evm_defconfig +2
-0@@ -1,9 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y +CONFIG_TI_SECURE_DEVICE=y CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2E_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm" +CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=yconfigs/k2g_hs_evm_defconfig +2
-0@@ -1,9 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y +CONFIG_TI_SECURE_DEVICE=y CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2G_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm" +CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=yconfigs/k2hk_hs_evm_defconfig +2
-0@@ -1,9 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y +CONFIG_TI_SECURE_DEVICE=y CONFIG_SYS_TEXT_BASE=0xC000060 CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_K2HK_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm" +CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y
PATCH 3/3 defconfig: k2x_hs_evm: Re-enable TI_SECURE_DEVICE in HS K2x parts
In reply to Andrew F. DavisQuoted 5 lines · Andrew F. Davis
These got removed in config re-syncs due to a
Kconfigbug. Add these back here.Signed-off-by Andrew F. Davis <[email protected]>Reviewed-by Lokesh Vutla <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/87cad6da/attachment.sig>
PATCH 1/3 ARM: Kconfig: Move TI_SECURE_DEVICE to a common area
In reply to Andrew F. DavisQuoted 9 lines · Andrew F. Davis
TI_SECURE_DEVICEis used by both OMAP2+ and Keystone2 family devices, and so whenARCH_OMAP2PLUSwas used to gate off the OMAP2+KconfigKeystone2 family devices lost this config option.Move this option out of mach-omap2
Kconfigto a spot accessible by both families. We pickedarch/arm/Kconfigover the TI specific board/ti/ location as this option is not specific to our boards but rather our architecture.
Quoted 7 lines
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 <[email protected]>
Thanks and regards,
Lokesh
Quoted 48 lines
--- arch/arm/Kconfig | 10 ++++++++++ arch/arm/mach-omap2/Kconfig | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-)arch/arm/Kconfig +10
-0@@ -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 config + must be set. This option impacts various aspects of the + build system (to create signed boot images that can be + authenticated) and the code. See the doc/README.ti-secure + file for further details. + source "arch/arm/mach-aspeed/Kconfig" source "arch/arm/mach-at91/Kconfig"arch/arm/mach-omap2/Kconfig +0
-10@@ -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 config - must be set. This option impacts various aspects of the - build system (to create signed boot images that can be - authenticated) and the code. See the doc/README.ti-secure - file for further details. - config TI_SECURE_EMIF_REGION_START hex "Reserved EMIF region start address" depends on TI_SECURE_DEVICE
PATCH 1/3 ARM: Kconfig: Move TI_SECURE_DEVICE to a common area
In reply to Andrew F. DavisQuoted 9 lines · Andrew F. Davis
TI_SECURE_DEVICEis used by both OMAP2+ and Keystone2 family devices, and so whenARCH_OMAP2PLUSwas used to gate off the OMAP2+KconfigKeystone2 family devices lost this config option.Move this option out of mach-omap2
Kconfigto a spot accessible by both families. We pickedarch/arm/Kconfigover the TI specific board/ti/ location as this option is not specific to our boards but rather our architecture.
Quoted 8 lines
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 <[email protected]>Reviewed-by Lokesh Vutla <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/1f7e1838/attachment.sig>