spl: Ensure all SPL symbols in Kconfig have some SPL dependency

Tighten up symbol dependencies in a number of places.  Ensure that a SPL
specific option has at least a direct dependency on SPL.  In places
where it's clear that we depend on something more specific, use that
dependency instead.  This means in a very small number of places we can
drop redundant dependencies.

Reported-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ef79fc3a0a766c91c5e90e49e80bfc7866726514..423fca27de6be5dcef6badf366c63eadfe0b9600 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1119,7 +1119,6 @@ config ARCH_SOCFPGA
        select SPL_DM_SERIAL
        select SPL_LIBCOMMON_SUPPORT
        select SPL_LIBGENERIC_SUPPORT
-       select SPL_NAND_SUPPORT if SPL_NAND_DENALI
        select SPL_OF_CONTROL
        select SPL_SEPARATE_BSS if TARGET_SOCFPGA_SOC64
        select SPL_SERIAL

diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
index 72d12b4e070c2bcbf09c4ee563d7767b71413911..1305238c9d26bbb2addeab0eddea7968daa6ae66 100644 (file)
--- a/arch/arm/cpu/armv8/Kconfig
+++ b/arch/arm/cpu/armv8/Kconfig
@@ -76,6 +76,7 @@ config ARMV8_SEC_FIRMWARE_SUPPORT
 
 config SPL_ARMV8_SEC_FIRMWARE_SUPPORT
        bool "Enable ARMv8 secure monitor firmware framework support for SPL"
+       depends on SPL
        select SPL_FIT
        select SPL_OF_LIBFDT
        help
@@ -83,6 +84,7 @@ config SPL_ARMV8_SEC_FIRMWARE_SUPPORT
 
 config SPL_RECOVER_DATA_SECTION
        bool "save/restore SPL data section"
+       depends on SPL
        help
          Say Y here to save SPL data section for cold boot, and restore
          at warm boot in SPL phase.

diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index 8f185c192d52b11b9a68dfa9e9de970d1f7c74bd..2ba7454457ddd01d6047197247d85b546ab72472 100644 (file)
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -20,13 +20,13 @@ config MU_BASE_SPL
 config IMX8QM
        select IMX8
        select SUPPORT_SPL
-       select SPL_RECOVER_DATA_SECTION
+       select SPL_RECOVER_DATA_SECTION if SPL
        bool
 
 config IMX8QXP
        select IMX8
        select SUPPORT_SPL
-       select SPL_RECOVER_DATA_SECTION
+       select SPL_RECOVER_DATA_SECTION if SPL
        bool
 
 config SYS_SOC

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1ac43e98bb6bd63099678b1c26ed3d320df5a940..7e86c6a0cd0a31ae5ea0823e758d67bd16dc234e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -945,6 +945,7 @@ config ACPI_GPE
 
 config SPL_ACPI_GPE
        bool "Support ACPI general-purpose events in SPL"
+       depends on SPL
        help
          Enable a driver for ACPI GPEs to allow peripherals to send interrupts
          via ACPI to the OS. In U-Boot this is only used when U-Boot itself

diff --git a/boot/Kconfig b/boot/Kconfig
index 945ef1ca1332127d3218d448e593562aa40eaf5c..ee0dc90e93ccb1deb285b4074ab00aafc01db143 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -626,7 +626,7 @@ config BOOTSTAGE
 
 config SPL_BOOTSTAGE
        bool "Boot timing and reported in SPL"
-       depends on BOOTSTAGE
+       depends on BOOTSTAGE && SPL
        help
          Enable recording of boot time in SPL. To make this visible to U-Boot
          proper, enable BOOTSTAGE_STASH as well. This will stash the timing

diff --git a/common/Kconfig b/common/Kconfig
index f08a8e7493d8d9e7664aefcc8666d49c773b3f3a..e7914ca750a3eb601a5d060aa31ad0c93ac07c24 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -83,6 +83,7 @@ config LOGLEVEL
 
 config SPL_LOGLEVEL
        int
+       depends on SPL
        default LOGLEVEL
 
 config TPL_LOGLEVEL
@@ -358,7 +359,7 @@ config LOG_SYSLOG
 
 config SPL_LOG
        bool "Enable logging support in SPL"
-       depends on LOG
+       depends on LOG && SPL
        help
          This enables support for logging of status and debug messages. These
          can be displayed on the console, recorded in a memory buffer, or

diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 18ec990fe3b24b391a70c57f9dc3531c107ffb7d..5ffa29448226dbb0999034b0d32807578c8ab628 100644 (file)
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -48,9 +48,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_NAND_ATMEL=y
-CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
+CONFIG_ATMEL_NAND_HW_PMECC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y

diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 6e36b60ce05fc1f7f880d348c8a2d9d659bbb30c..da37fb507a9150db5bd7b60dd2fc2f15ff6e9402 100644 (file)
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -55,9 +55,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_ATMEL=y
-CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
+CONFIG_ATMEL_NAND_HW_PMECC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y

diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index a32eb130f1b3a3aebd902e72c2ac33b3089aceb4..9d581734f946e930a747eaa1d02313b1bc5602c5 100644 (file)
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -54,9 +54,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_NAND_ATMEL=y
-CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
+CONFIG_ATMEL_NAND_HW_PMECC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y

diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig
index 0139ebefe2fc825baecca7c2f737624135c961ae..2fd58b07bd1edaf143e19ebf62d14f2fae213e16 100644 (file)
--- a/configs/sama5d36ek_cmp_nandflash_defconfig
+++ b/configs/sama5d36ek_cmp_nandflash_defconfig
@@ -53,11 +53,9 @@ CONFIG_AT91_GPIO=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_NAND_ATMEL=y
+CONFIG_ATMEL_NAND_HW_PMECC=y
 CONFIG_PMECC_CAP=4
-CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER=y
 CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ATMEL=y

diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig
index 72cf0d1bc88b5e1a359650c56fa1f73a7acc873f..4a244e17bc488826fe305212bd39b8abd146e051 100644 (file)
--- a/configs/socfpga_secu1_defconfig
+++ b/configs/socfpga_secu1_defconfig
@@ -42,6 +42,7 @@ CONFIG_SPL_STACK=0x0
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE is not set
 CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index f10d1aaf4b6eae1ac2de5ee355423f920b3dbe87..eae1c8ddc9f949736eff3ce6432ed497d2e49b72 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -3,7 +3,7 @@ config FIRMWARE
 
 config SPL_FIRMWARE
        bool "Enable Firmware driver support in SPL"
-       depends on FIRMWARE
+       depends on FIRMWARE && SPL
 
 config SPL_ARM_PSCI_FW
        bool

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 149a62ffe611ed83a2858807b5a935b34a9ca6e6..8ab22ed817355e4eb2c83277c0eaa09726691207 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -89,7 +89,7 @@ config DM_GPIO_LOOKUP_LABEL
 
 config SPL_DM_GPIO_LOOKUP_LABEL
        bool "Enable searching for gpio labelnames"
-       depends on DM_GPIO && SPL_DM && SPL_GPIO
+       depends on SPL_DM_GPIO
        help
          This option enables searching for gpio names in
          the defined gpio labels, if the search for the
@@ -490,7 +490,7 @@ config DM_PCA953X
 
 config SPL_DM_PCA953X
        bool "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports in SPL"
-       depends on DM_GPIO
+       depends on SPL_DM_GPIO
        help
          Say yes here to provide access to several register-oriented
          SMBus I/O expanders, made mostly by NXP or TI.  Compatible

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 39683fc43b4918c4f4f6131221f7e88ce0c2560a..323c4fbe9cccab4c25ea0ef81477857bfb59dd5b 100644 (file)
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -9,7 +9,7 @@ config I2C_MUX
 
 config SPL_I2C_MUX
        bool "Support I2C multiplexers on SPL"
-       depends on I2C_MUX
+       depends on SPL && I2C_MUX
        help
          This enables I2C buses to be multiplexed, so that you can select
          one of several buses using some sort of control mechanism. The

diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
index 418ed215c57b758eba5802e5c6d96c6bcf63eaa4..ccdd7d7395c852b1b32a9bfe7b87698c1523a997 100644 (file)
--- a/drivers/led/Kconfig
+++ b/drivers/led/Kconfig
@@ -67,7 +67,7 @@ config LED_BLINK
 
 config SPL_LED
        bool "Enable LED support in SPL"
-       depends on SPL && SPL_DM
+       depends on SPL_DM
        help
          The LED subsystem adds a small amount of overhead to the image.
          If this is acceptable and you have a need to use LEDs in SPL,
@@ -85,7 +85,7 @@ config LED_GPIO
 
 config SPL_LED_GPIO
        bool "LED support for GPIO-connected LEDs in SPL"
-        depends on SPL_LED && DM_GPIO
+        depends on SPL_LED && SPL_DM_GPIO
        help
          This option is an SPL-variant of the LED_GPIO option.
          See the help of LED_GPIO for details.

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index b44cd98150f199c24e7c21cda1b6935a073d38b6..fd444219315bfa9410821ff6909137a3b097f53e 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -123,6 +123,7 @@ config MMC_IO_VOLTAGE
 
 config SPL_MMC_IO_VOLTAGE
        bool "Support IO voltage configuration in SPL"
+       depends on SPL_MMC
        help
          IO voltage configuration allows selecting the voltage level of the IO
          lines (not the level of main supply). This is required for UHS
@@ -153,6 +154,7 @@ config MMC_HS400_ES_SUPPORT
 
 config SPL_MMC_HS400_ES_SUPPORT
        bool "enable HS400 Enhanced Strobe support in SPL"
+       depends on SPL_MMC
        help
          The HS400 Enhanced Strobe mode is support by some eMMC. The bus
          frequency is up to 200MHz. This mode does not tune the IO.
@@ -166,6 +168,7 @@ config MMC_HS400_SUPPORT
 
 config SPL_MMC_HS400_SUPPORT
        bool "enable HS400 support in SPL"
+       depends on SPL_MMC
        select SPL_MMC_HS200_SUPPORT
        help
          The HS400 mode is support by some eMMC. The bus frequency is up to
@@ -179,6 +182,7 @@ config MMC_HS200_SUPPORT
 
 config SPL_MMC_HS200_SUPPORT
        bool "enable HS200 support in SPL"
+       depends on SPL_MMC
        help
          The HS200 mode is support by some eMMC. The bus frequency is up to
          200MHz. This mode requires tuning the IO.
@@ -478,7 +482,7 @@ config MMC_SDHCI_ADMA
 
 config SPL_MMC_SDHCI_ADMA
        bool "Support SDHCI ADMA2 in SPL"
-       depends on MMC_SDHCI
+       depends on SPL_MMC && MMC_SDHCI
        select MMC_SDHCI_ADMA_HELPERS
        help
          This enables support for the ADMA (Advanced DMA) defined

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 4129a33866bf492b3ef90063441e914e3e2483ed..190300fc17902b6ffd893cb1ec2d86f58a88c224 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -73,6 +73,7 @@ config PMECC_SECTOR_SIZE
 
 config SPL_GENERATE_ATMEL_PMECC_HEADER
        bool "Atmel PMECC Header Generation"
+       depends on SPL
        select ATMEL_NAND_HWECC
        select ATMEL_NAND_HW_PMECC
        help
@@ -647,7 +648,7 @@ config SYS_NAND_U_BOOT_OFFS_REDUND
 
 config SPL_NAND_AM33XX_BCH
        bool "Enables SPL-NAND driver which supports ELM based"
-       depends on NAND_OMAP_GPMC && !OMAP34XX
+       depends on SPL_NAND_SUPPORT && NAND_OMAP_GPMC && !OMAP34XX
        default y
         help
          Hardware ECC correction. This is useful for platforms which have ELM
@@ -658,6 +659,7 @@ config SPL_NAND_AM33XX_BCH
 
 config SPL_NAND_DENALI
        bool "Support Denali NAND controller for SPL"
+       depends on SPL_NAND_SUPPORT
        help
          This is a small implementation of the Denali NAND controller
          for use on SPL.
@@ -673,7 +675,7 @@ config NAND_DENALI_SPARE_AREA_SKIP_BYTES
 
 config SPL_NAND_SIMPLE
        bool "Use simple SPL NAND driver"
-       depends on !SPL_NAND_AM33XX_BCH
+       depends on !SPL_NAND_AM33XX_BCH && SPL_NAND_SUPPORT
        help
          Support for NAND boot using simple NAND drivers that
          expose the cmd_ctrl() interface.

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index f350c7e5dc218f3584b56ebbd55f2190d3265f4a..f83876c57613f04ad7ce96fa2f8aebef7bd3569c 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -248,7 +248,7 @@ config SPI_FLASH_MTD
 
 config SPL_SPI_FLASH_MTD
        bool "SPI flash MTD support for SPL"
-       depends on SPI_FLASH
+       depends on SPI_FLASH && SPL
        help
           Enable the MTD support for the SPI flash layer in SPL.
 

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 2c20dc7c8318f2470326d9abd7553c6ccbb147f1..0af53a6c67fe6a1ace6ea69462d63db6a2795db8 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,7 @@ config POWER_LEGACY
 
 config SPL_POWER_LEGACY
        bool "Legacy power support in SPL"
+       depends on SPL && !SPL_DM_PMIC
        default y if POWER_LEGACY
        help
          Note: This is a legacy option. Use SPL_DM_PMIC instead.

diff --git a/drivers/power/acpi_pmc/Kconfig b/drivers/power/acpi_pmc/Kconfig
index 355d1618c61a2eb4f147dbf609e89ae8ca3c6f6c..629acb071427bfc6dd1d3b3fb1c1913e0f8bf846 100644 (file)
--- a/drivers/power/acpi_pmc/Kconfig
+++ b/drivers/power/acpi_pmc/Kconfig
@@ -8,6 +8,7 @@ config ACPI_PMC
 
 config SPL_ACPI_PMC
        bool "Power Manager (x86 PMC) support in SPL"
+       depends on SPL
        default y if ACPI_PMC
        help
          Enable support for an x86-style power-management controller which

diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig
index d6cea8ec6667cc0a5a501237d0d5b1376f6d0186..c519e066ef028503d2c10822148308a5a27b25e6 100644 (file)
--- a/drivers/power/regulator/Kconfig
+++ b/drivers/power/regulator/Kconfig
@@ -55,7 +55,7 @@ config DM_REGULATOR_BD71837
 
 config SPL_DM_REGULATOR_BD71837
        bool "Enable Driver Model for ROHM BD71837/BD71847 regulators in SPL"
-       depends on DM_REGULATOR_BD71837
+       depends on DM_REGULATOR_BD71837 && SPL
        help
        This config enables implementation of driver-model regulator uclass
        features for regulators on ROHM BD71837 and BD71847 in SPL.
@@ -70,7 +70,7 @@ config DM_REGULATOR_PCA9450
 
 config SPL_DM_REGULATOR_PCA9450
        bool "Enable Driver Model for NXP PCA9450 regulators in SPL"
-       depends on DM_REGULATOR_PCA9450
+       depends on DM_REGULATOR_PCA9450 && SPL
        help
        This config enables implementation of driver-model regulator uclass
        features for regulators on ROHM PCA9450 in SPL.
@@ -115,7 +115,7 @@ config REGULATOR_PWM
 
 config SPL_REGULATOR_PWM
        bool "Enable Driver for PWM regulators in SPL"
-       depends on REGULATOR_PWM
+       depends on REGULATOR_PWM && SPL
        help
          This config enables implementation of driver-model regulator uclass
          features for PWM regulators in SPL.
@@ -163,7 +163,7 @@ config DM_REGULATOR_FIXED
 
 config SPL_DM_REGULATOR_FIXED
        bool "Enable Driver Model for REGULATOR Fixed value in SPL"
-       depends on DM_REGULATOR_FIXED
+       depends on DM_REGULATOR_FIXED && SPL
        select SPL_DM_REGULATOR_COMMON
        ---help---
        This config enables implementation of driver-model regulator uclass
@@ -345,7 +345,7 @@ config SPL_DM_REGULATOR_STPMIC1
 
 config SPL_DM_REGULATOR_PALMAS
        bool "Enable driver for PALMAS PMIC regulators"
-       depends on SPL_PMIC_PALMAS
+       depends on SPL_PMIC_PALMAS
        help
        This enables implementation of driver-model regulator uclass
        features for REGULATOR PALMAS and the family of PALMAS PMICs.
@@ -353,7 +353,7 @@ config SPL_DM_REGULATOR_PALMAS
 
 config SPL_DM_REGULATOR_LP87565
        bool "Enable driver for LP87565 PMIC regulators"
-       depends on SPL_PMIC_LP87565
+       depends on SPL_PMIC_LP87565
        help
        This enables implementation of driver-model regulator uclass
        features for REGULATOR LP87565 and the family of LP87565 PMICs.

diff --git a/fs/cbfs/Kconfig b/fs/cbfs/Kconfig
index 03980d830d304487c12f5abecdbf913c309b71be..b6639928f4afeabc40c5b72225057043cd3272a3 100644 (file)
--- a/fs/cbfs/Kconfig
+++ b/fs/cbfs/Kconfig
@@ -9,6 +9,7 @@ config FS_CBFS
 
 config SPL_FS_CBFS
        bool "Enable CBFS (Coreboot Filesystem) in SPL"
+       depends on SPL
        help
          Define this to enable support for reading from a Coreboot
          filesystem. This is a ROM-based filesystem used for accessing files

diff --git a/lib/Kconfig b/lib/Kconfig
index c9f9ddce7d02c4f102d2234b371e805f928d26bc..7dd777b56a7921175d69223d50a05704f53fb3e5 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -239,6 +239,7 @@ config GENERATE_ACPI_TABLE
 
 config SPL_TINY_MEMSET
        bool "Use a very small memset() in SPL"
+       depends on SPL
        help
          The faster memset() is the arch-specific one (if available) enabled
          by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get
@@ -557,6 +558,7 @@ config MD5
 
 config SPL_MD5
        bool "Support MD5 algorithm in SPL"
+       depends on SPL
        help
          This option enables MD5 support in SPL. MD5 is an algorithm designed
          in 1991 that produces a 16-byte digest (or checksum) from its input
@@ -643,6 +645,7 @@ config ZSTD
 
 config SPL_LZ4
        bool "Enable LZ4 decompression support in SPL"
+       depends on SPL
        help
          This enables support for the LZ4 decompression algorithm in SPL. LZ4
          is a lossless data compression algorithm that is focused on
@@ -651,6 +654,7 @@ config SPL_LZ4
 
 config SPL_LZMA
        bool "Enable LZMA decompression support for SPL build"
+       depends on SPL
        help
          This enables support for LZMA compression algorithm for SPL boot.
 
@@ -662,6 +666,7 @@ config VPL_LZMA
 
 config SPL_LZO
        bool "Enable LZO decompression support in SPL"
+       depends on SPL
        help
          This enables support for LZO compression algorithm in the SPL.
 
@@ -678,6 +683,7 @@ config SPL_ZLIB
 
 config SPL_ZSTD
        bool "Enable Zstandard decompression support in SPL"
+       depends on SPL
        select XXHASH
        help
          This enables Zstandard decompression library in the SPL.
@@ -750,7 +756,7 @@ config SPL_OF_LIBFDT
 
 config SPL_OF_LIBFDT_ASSUME_MASK
        hex "Mask of conditions to assume for libfdt"
-       depends on SPL_OF_LIBFDT || FIT
+       depends on SPL_OF_LIBFDT || (FIT && SPL)
        default 0xff
        help
          Use this to change the assumptions made by libfdt in SPL about the

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 1c04a7ec5f48ce3dbe009c861e482c2caca35213..152eb2a9cacf4a25f759da1094db48e3c5849b79 100644 (file)
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -28,7 +28,7 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE
 
 config SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE
        bool "Asymmetric public-key crypto algorithm subtype within SPL"
-       depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+       depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE && SPL
        help
          This option provides support for asymmetric public key type handling in the SPL.
          If signature generation and/or verification are to be used,
@@ -48,7 +48,7 @@ config RSA_PUBLIC_KEY_PARSER
 
 config SPL_RSA_PUBLIC_KEY_PARSER
        bool "RSA public key parser within SPL"
-       depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+       depends on ASYMMETRIC_PUBLIC_KEY_SUBTYPE && SPL
        select SPL_ASN1_DECODER
        select ASN1_COMPILER
        select SPL_OID_REGISTRY

diff --git a/lib/ecdsa/Kconfig b/lib/ecdsa/Kconfig
index a95c4ff581f04f518d298b432103de2d03982768..5c3d67d8144b48860154cac84fe8aa38e0df2547 100644 (file)
--- a/lib/ecdsa/Kconfig
+++ b/lib/ecdsa/Kconfig
@@ -17,6 +17,7 @@ config ECDSA_VERIFY
 
 config SPL_ECDSA_VERIFY
        bool "Enable ECDSA verification support in SPL"
+       depends on SPL
        help
          Allow ECDSA signatures to be recognized and verified in SPL.
 

diff --git a/lib/rsa/Kconfig b/lib/rsa/Kconfig
index b773f17c261e2938728fd0967ee97f3b9b5ebdfb..9033384e60a3355504ba5c8a1ea3abaf37a9e601 100644 (file)
--- a/lib/rsa/Kconfig
+++ b/lib/rsa/Kconfig
@@ -18,6 +18,7 @@ if RSA
 
 config SPL_RSA
        bool "Use RSA Library within SPL"
+       depends on SPL
 
 config SPL_RSA_VERIFY
        bool

diff --git a/test/Kconfig b/test/Kconfig
index 7f3447ae5acd1271ffee6881fbd15d3e4ab9b05c..9b283a57ba938161bc738d421d539e3d47dc16b4 100644 (file)
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -8,6 +8,7 @@ menuconfig UNIT_TEST
 
 config SPL_UNIT_TEST
        bool "Unit tests in SPL"
+       depends on SPL
        # We need to be able to unbind devices for tests to work
        select SPL_DM_DEVICE_REMOVE
        help