[U-Boot] [PATCH 03/16] secure boot: rename CONFIG_SECURE_BOOT config option

AKASHI Takahiro
2019-11-13T00:52:53Z

The configuration, CONFIG_SECURE_BOOT, is defined multiple times in
different architecture directories for different implementation.
If UEFI secure boot will be added later, it will make things more messy.

So let's rename them, giving each implementation to different
configuration option. CONFIG_SECURE_BOOT still remains in order not to
break existing implicit dependency.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
Kconfig | 7 +++++++
arch/arm/cpu/armv7/ls102xa/Kconfig | 3 ++-
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 3 ++-
arch/powerpc/cpu/mpc85xx/Kconfig | 3 ++-
4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Kconfig b/Kconfig
index 63690514b261..fd7d10c4aa7d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -283,6 +283,13 @@ config SYS_LDSCRIPT

endmenu # General setup

+config SECURE_BOOT
+ bool "Secure Boot"
+ imply SHA256
+ help
+ Enable Secure Boot feature. The actual behavior may vary
+ from architecture to architecture.
+
menu "Boot images"

config ANDROID_BOOT_IMAGE
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index 94fa68250ddf..ce1bc580d23d 100644
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -50,8 +50,9 @@ config MAX_CPUS
cores, count the reserved ports. This will allocate enough memory
in spin table to properly handle all cores.

-config SECURE_BOOT
+config FSL_ARMV7_ENABLE_SECURE_BOOT
bool "Secure Boot"
+ depends on SECURE_BOOT
help
Enable Freescale Secure Boot feature. Normally selected
by defconfig. If unsure, do not change.
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 24c606a2328f..b4d455ee16f4 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -375,8 +375,9 @@ config EMC2305
Enable the EMC2305 fan controller for configuration of fan
speed.

-config SECURE_BOOT
+config FSI_ARMV8_ENABLE_SECURE_BOOT
bool "Secure Boot"
+ depends on SECURE_BOOT
help
Enable Freescale Secure Boot feature

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index c038a6ddb0f4..9cf6ebbfe3ce 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -1208,8 +1208,9 @@ config FSL_LAW
help
Use Freescale common code for Local Access Window

-config SECURE_BOOT
+config FSL_MPC_ENABLE_SECURE_BOOT
bool "Secure Boot"
+ depends on SECURE_BOOT
help
Enable Freescale Secure Boot feature. Normally selected
by defconfig. If unsure, do not change.
--
2.21.0