[PATCH] global: Audit Kconfig usage of PARTITION_TYPE_GUID

[Tom Rini]

It is not functionally possible to use the code enabled by
PARTITION_TYPE_GUID without having EFI_PARTITION be enabled as well. Not
all users of the former had ensured that the latter was enabled however,
so audit all current users and then as appropriate select or imply
EFI_PARTITION as needed.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/Kconfig                                | 2 +-
 arch/arm/mach-rockchip/Kconfig              | 2 +-
 arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig | 1 +
 board/sifive/unleashed/Kconfig              | 2 +-
 board/sifive/unmatched/Kconfig              | 2 +-
 board/starfive/visionfive2/Kconfig          | 2 +-
 boot/Kconfig                                | 1 +
 lib/fwu_updates/Kconfig                     | 1 +
 8 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index ba99d251737d..10755fec8bbe 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -254,7 +254,7 @@ config SANDBOX
 	imply AVB_VERIFY
 	imply LIBAVB
 	imply CMD_AVB
-	imply PARTITION_TYPE_GUID
+	imply PARTITION_TYPE_GUID if EFI_PARTITION
 	imply SCP03
 	imply CMD_SCP03
 	imply UDP_FUNCTION_FASTBOOT
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 9f1f77ee5b3c..108713488af1 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -284,7 +284,7 @@ config ROCKCHIP_RK3399
 	imply OF_LIBFDT_OVERLAY
 	imply OF_LIVE
 	imply OF_UPSTREAM
-	imply PARTITION_TYPE_GUID
+	imply PARTITION_TYPE_GUID if EFI_PARTITION
 	imply PHY_GIGE if GMAC_ROCKCHIP
 	imply PRE_CONSOLE_BUFFER
 	imply RNG_ROCKCHIP
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig b/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig
index 490097e98be8..647e0a4c2bf4 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig
@@ -3,6 +3,7 @@ config CMD_STM32PROG
 	select DFU
 	select DFU_RAM
 	select DFU_VIRT
+	select EFI_PARTITION
 	select PARTITION_TYPE_GUID
 	imply CMD_GPT if MMC
 	imply CMD_MTD if MTD
diff --git a/board/sifive/unleashed/Kconfig b/board/sifive/unleashed/Kconfig
index 2fcc788ba53f..36cf756e3f3b 100644
--- a/board/sifive/unleashed/Kconfig
+++ b/board/sifive/unleashed/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	imply CMD_FAT
 	imply CMD_FS_GENERIC
 	imply CMD_GPT
-	imply PARTITION_TYPE_GUID
+	imply PARTITION_TYPE_GUID if EFI_PARTITION
 	imply CMD_NET
 	imply CMD_PING
 	imply CMD_SF
diff --git a/board/sifive/unmatched/Kconfig b/board/sifive/unmatched/Kconfig
index 5071af129c62..9245873927bc 100644
--- a/board/sifive/unmatched/Kconfig
+++ b/board/sifive/unmatched/Kconfig
@@ -36,7 +36,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	imply CMD_FAT
 	imply CMD_FS_GENERIC
 	imply CMD_GPT
-	imply PARTITION_TYPE_GUID
+	imply PARTITION_TYPE_GUID if EFI_PARTITION
 	imply CMD_NET
 	imply CMD_PING
 	imply CMD_SF
diff --git a/board/starfive/visionfive2/Kconfig b/board/starfive/visionfive2/Kconfig
index 185f94190b5c..b4bf59676ac9 100644
--- a/board/starfive/visionfive2/Kconfig
+++ b/board/starfive/visionfive2/Kconfig
@@ -45,7 +45,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	imply EFI_PARTITION
 	imply MII
 	imply ISO_PARTITION
-	imply PARTITION_TYPE_GUID
+	imply PARTITION_TYPE_GUID if EFI_PARTITION
 	imply PHY_LIB
 	imply PHY_MSCC
 
diff --git a/boot/Kconfig b/boot/Kconfig
index bfed452d77e3..a56b7aa2f378 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -563,6 +563,7 @@ config BOOTMETH_ANDROID
 	select CMD_BCB
 	imply CMD_FASTBOOT
 	imply FASTBOOT if !NET_LWIP
+	select EFI_PARTITION
 	select PARTITION_TYPE_GUID
 	select PARTITION_UUIDS
 	help
diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig
index a722107c1290..b38808e3463b 100644
--- a/lib/fwu_updates/Kconfig
+++ b/lib/fwu_updates/Kconfig
@@ -1,6 +1,7 @@
 menuconfig FWU_MULTI_BANK_UPDATE
 	bool "Enable FWU Multi Bank Update Feature"
 	depends on EFI_CAPSULE_ON_DISK
+	select EFI_PARTITION
 	select PARTITION_TYPE_GUID
 	select FWU_MDATA
 	imply EFI_CAPSULE_ON_DISK_EARLY
-- 
2.43.0