global: Audit Kconfig usage of PARTITION_TYPE_GUID

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@konsulko.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index ba99d251737d9d33a89115699bf6506e7fbb04de..10755fec8bbe09b5c6c49988b3b3fed7f00f8fa2 100644 (file)
--- 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 9f1f77ee5b3ccdf35567652a7e1ecef31a4b2d5c..108713488af1553683619bf1cc667c823dc92f96 100644 (file)
--- 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 490097e98be8685cef20637a27eed47391c1ed6e..647e0a4c2bf4c1629809e97923ec7d90f05aee9b 100644 (file)
--- 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 2fcc788ba53f71ab762c6d9256d47df754114a1a..36cf756e3f3bce84cfaa9de14d43a812503ed320 100644 (file)
--- 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 5071af129c62c6dfb90e1c200a23d17618bad0f4..9245873927bc3adb7393d74f61e51ae40d6af014 100644 (file)
--- 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 185f94190b5c5e516641e4abbb6f597175fd1f47..b4bf59676ac9e2b93c587173d0e5d7aa963bbb00 100644 (file)
--- 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 bfed452d77e37f555a0e26ce14aa16aa2c92ea8e..a56b7aa2f378e7c1eb51fee5e3abc95e80d00185 100644 (file)
--- 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 a722107c12902556e574719af9ae0fb393fff2a1..b38808e3463b019fce3b59543043b359e6dd2f80 100644 (file)
--- 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