SPL: Do not allow enabling SPL symbols for non-SPL builds
Subsystems (6)
PATCH 1/1 SPL: Do not allow enabling SPL symbols for non-SPL builds
It does not make sense to enable SPL options when not building SPL binary.
So disallow selecting SPL options for non-SPL builds.
--- arch/arm/Kconfig | 6 +++++- arch/arm/cpu/armv8/Kconfig | 2 ++ common/Kconfig | 5 +++++ common/spl/Kconfig | 4 ++-- drivers/firmware/Kconfig | 1 + drivers/gpio/Kconfig | 1 + drivers/misc/Kconfig | 1 + drivers/mmc/Kconfig | 5 +++++ drivers/mtd/spi/Kconfig | 1 + drivers/power/Kconfig | 1 + drivers/power/acpi_pmc/Kconfig | 1 + drivers/power/regulator/Kconfig | 1 + fs/cbfs/Kconfig | 1 + lib/Kconfig | 10 +++++++++- 14 files changed, 36 insertions(+), 4 deletions(-)
arch/arm/Kconfig +5 -1
@@ -985,7 +985,7 @@ config ARCH_MX6 imply SYS_THUMB_BUILD imply SPL_SEPARATE_BSS -if ARCH_MX6 +if ARCH_MX6 && SPL config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif
@@ -2343,7 +2343,11 @@ source "arch/arm/Kconfig.debug" endmenu +if SPL + config SPL_LDSCRIPT default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + +endif
arch/arm/cpu/armv8/Kconfig +2 -0
@@ -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.
common/Kconfig +5 -0
@@ -81,10 +81,14 @@ config LOGLEVEL 8 - debug content 9 - debug hardware I/O +if SPL + config SPL_LOGLEVEL int default LOGLEVEL +endif + config TPL_LOGLEVEL int default LOGLEVEL
@@ -241,6 +245,7 @@ config SYS_STDIO_DEREGISTER config SPL_SYS_STDIO_DEREGISTER bool "Allow deregistering stdio devices in SPL" + depends on SPL help Generally there is no need to deregister stdio devices since they are never deactivated. But if a stdio device is used which can be
common/spl/Kconfig +2 -2
@@ -19,6 +19,8 @@ config SPL help If you want to build SPL as well as the normal image, say Y. +if SPL + config SPL_FRAMEWORK bool "Support SPL based upon the common SPL framework" depends on SPL
@@ -150,8 +152,6 @@ config HANDOFF in boot. It is available in gd->handoff. The state state is set up in SPL (or TPL if that is being used). -if SPL - config SPL_HANDOFF bool "Pass hand-off information from SPL to U-Boot proper" depends on HANDOFF && SPL_BLOBLIST
drivers/firmware/Kconfig +1 -0
@@ -3,6 +3,7 @@ config FIRMWARE config SPL_FIRMWARE bool "Enable Firmware driver support in SPL" + depends on SPL depends on FIRMWARE config SPL_ARM_PSCI_FW
drivers/gpio/Kconfig +1 -0
@@ -490,6 +490,7 @@ config DM_PCA953X config SPL_DM_PCA953X bool "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports in SPL" + depends on SPL depends on DM_GPIO help Say yes here to provide access to several register-oriented
drivers/misc/Kconfig +1 -0
@@ -492,6 +492,7 @@ config FS_LOADER config SPL_FS_LOADER bool "Enable loader driver for file system" + depends on SPL help This is file system generic loader which can be used to load the file image from the storage into target such as memory.
drivers/mmc/Kconfig +5 -0
@@ -123,6 +123,7 @@ config MMC_IO_VOLTAGE config SPL_MMC_IO_VOLTAGE bool "Support IO voltage configuration in SPL" + depends on SPL 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 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 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 help The HS200 mode is support by some eMMC. The bus frequency is up to 200MHz. This mode requires tuning the IO.
@@ -478,6 +482,7 @@ config MMC_SDHCI_ADMA config SPL_MMC_SDHCI_ADMA bool "Support SDHCI ADMA2 in SPL" + depends on SPL depends on MMC_SDHCI select MMC_SDHCI_ADMA_HELPERS help
drivers/mtd/spi/Kconfig +1 -0
@@ -248,6 +248,7 @@ config SPI_FLASH_MTD config SPL_SPI_FLASH_MTD bool "SPI flash MTD support for SPL" + depends on SPL depends on SPI_FLASH help Enable the MTD support for the SPI flash layer in SPL.
drivers/power/Kconfig +1 -0
@@ -29,6 +29,7 @@ config POWER_LEGACY config SPL_POWER_LEGACY bool "Legacy power support in SPL" + depends on SPL default y if POWER_LEGACY help Note: This is a legacy option. Use SPL_DM_PMIC instead.
drivers/power/acpi_pmc/Kconfig +1 -0
@@ -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
drivers/power/regulator/Kconfig +1 -0
@@ -148,6 +148,7 @@ config DM_REGULATOR_FIXED config SPL_DM_REGULATOR_FIXED bool "Enable Driver Model for REGULATOR Fixed value in SPL" + depends on SPL_DM_REGULATOR depends on DM_REGULATOR_FIXED select SPL_DM_REGULATOR_COMMON ---help---
fs/cbfs/Kconfig +1 -0
@@ -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
lib/Kconfig +9 -1
@@ -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
@@ -556,6 +557,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
@@ -642,6 +644,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
@@ -650,6 +653,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.
@@ -661,22 +665,26 @@ 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. config SPL_GZIP bool "Enable gzip decompression support for SPL build" + depends on SPL select SPL_ZLIB help This enables support for the GZIP compression algorithm for SPL boot. config SPL_ZLIB bool + depends on SPL help This enables compression lib for SPL boot. config SPL_ZSTD bool "Enable Zstandard decompression support in SPL" + depends on SPL select XXHASH help This enables Zstandard decompression library in the SPL.
@@ -749,7 +757,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 || (SPL && FIT) default 0xff help Use this to change the assumptions made by libfdt in SPL about the
Signature · 1 line
2.20.1
Quoted 5 lines · Pali Rohár
It does not make sense to enable SPL options when not building SPL binary.
So disallow selecting SPL options for non-SPL builds.
Signed-off-by Pali Rohár <[email protected]>
Some of this makes sense, where you add SPL as an explicit dependency. But others:
Quoted 15 lines
arch/arm/Kconfig +1
-1@@ -985,7 +985,7 @@ config ARCH_MX6 imply SYS_THUMB_BUILD imply SPL_SEPARATE_BSS -if ARCH_MX6 +if ARCH_MX6 && SPL config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif@@ -2343,7 +2343,11 @@ source "arch/arm/Kconfig.debug"
arch/arm/Kconfig source "arch/arm/Kconfig.debug" · line 2353
Quoted 10 lines
arch/arm/Kconfig +4
-0endmenu +if SPL + config SPL_LDSCRIPT default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + +endif
Where it's like this and we're providing default values and the option itself is prompt'd elsewhere don't as it's not cluttering the resulting .config file.
Quoted 53 lines
lib/Kconfig +6
-0@@ -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@@ -556,6 +557,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@@ -642,6 +644,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@@ -650,6 +653,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.@@ -661,22 +665,26 @@ 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. config SPL_GZIP bool "Enable gzip decompression support for SPL build" + depends on SPL select SPL_ZLIB help This enables support for the GZIP compression algorithm for SPL boot. config SPL_ZLIB bool
lib/Kconfig config VPL_LZMA · line 690
Quoted 10 lines
lib/Kconfig +2
-0+ depends on SPL help This enables compression lib for SPL boot. config SPL_ZSTD bool "Enable Zstandard decompression support in SPL" + depends on SPL select XXHASH help This enables Zstandard decompression library in the SPL.
Most of these should all be under one big if SPL ... endif
Signature · 1 line
Tom
Quoted 28 lines · On Monday 09 May 2022 16:22:50 Tom Rini wrote:
Quoted 5 lines · Pali Rohár
It does not make sense to enable SPL options when not building SPL binary.
So disallow selecting SPL options for non-SPL builds.
Signed-off-by Pali Rohár <[email protected]>Some of this makes sense, where you add SPL as an explicit dependency. But others:
Quoted 17 lines
arch/arm/Kconfig +1
-1@@ -985,7 +985,7 @@ config ARCH_MX6 imply SYS_THUMB_BUILD imply SPL_SEPARATE_BSS -if ARCH_MX6 +if ARCH_MX6 && SPL config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif@@ -2343,7 +2343,11 @@ source "arch/arm/Kconfig.debug" endmenu
Quoted 12 lines
arch/arm/Kconfig source "arch/arm/Kconfig.debug" · line 2353
Quoted 8 lines
arch/arm/Kconfig +4
-0+if SPL + config SPL_LDSCRIPT default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + +endifWhere it's like this and we're providing default values and the option itself is prompt'd elsewhere don't as it's not cluttering the resulting .config file.
Apparently it clutters the resulting .config file. Espressobin with mvebu_espressobin-88f3720_defconfig has CONFIG_SPL_LDSCRIPT in .config even there is no SPL for Espressobin.
Quoted 57 lines
Quoted 57 lines
lib/Kconfig +7
-0@@ -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@@ -556,6 +557,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@@ -642,6 +644,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@@ -650,6 +653,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.@@ -661,22 +665,26 @@ 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. config SPL_GZIP bool "Enable gzip decompression support for SPL build" + depends on SPL select SPL_ZLIB help This enables support for the GZIP compression algorithm for SPL boot. config SPL_ZLIB bool + depends on SPL help This enables compression lib for SPL boot.
Quoted 11 lines
lib/Kconfig config VPL_LZMA · line 690
Quoted 6 lines
lib/Kconfig +1
-0config SPL_ZSTD bool "Enable Zstandard decompression support in SPL" + depends on SPL select XXHASH help This enables Zstandard decompression library in the SPL.Most of these should all be under one big if SPL ... endif
Signature · 1 line
Tom
Ok, I can change it.
Quoted 42 lines · Pali Rohár
Quoted 28 lines · On Monday 09 May 2022 16:22:50 Tom Rini wrote:
Quoted 5 lines · Pali Rohár
It does not make sense to enable SPL options when not building SPL binary.
So disallow selecting SPL options for non-SPL builds.
Signed-off-by Pali Rohár <[email protected]>Some of this makes sense, where you add SPL as an explicit dependency. But others:
Quoted 17 lines
arch/arm/Kconfig +1
-1@@ -985,7 +985,7 @@ config ARCH_MX6 imply SYS_THUMB_BUILD imply SPL_SEPARATE_BSS -if ARCH_MX6 +if ARCH_MX6 && SPL config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif@@ -2343,7 +2343,11 @@ source "arch/arm/Kconfig.debug" endmenuQuoted 12 lines
arch/arm/Kconfig source "arch/arm/Kconfig.debug" · line 2353
Quoted 8 lines
arch/arm/Kconfig +4
-0+if SPL + config SPL_LDSCRIPT default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + +endifWhere it's like this and we're providing default values and the option itself is prompt'd elsewhere don't as it's not cluttering the resulting .config file.
Quoted 3 lines
Apparently it clutters the resulting .config file. Espressobin with mvebu_espressobin-88f3720_defconfig has
CONFIG_SPL_LDSCRIPTin .config even there is no SPL for Espressobin.
Ah, OK, that is odd. I think we need to move these to where the question is asked then, instead.
Signature · 1 line
Tom
PATCH v2 1/1 SPL: Do not allow enabling SPL symbols for non-SPL builds
In reply to Pali RohárIt does not make sense to enable SPL options when not building SPL binary.
So disallow selecting SPL options for non-SPL builds.
---
Changes in v2:
* Move SPL compression options under one big if SPL ... endif
--- arch/arm/Kconfig | 6 +++++- arch/arm/cpu/armv8/Kconfig | 2 ++ common/Kconfig | 5 +++++ common/spl/Kconfig | 4 ++-- drivers/firmware/Kconfig | 1 + drivers/gpio/Kconfig | 1 + drivers/misc/Kconfig | 1 + drivers/mmc/Kconfig | 5 +++++ drivers/mtd/spi/Kconfig | 1 + drivers/power/Kconfig | 1 + drivers/power/acpi_pmc/Kconfig | 1 + drivers/power/regulator/Kconfig | 1 + fs/cbfs/Kconfig | 1 + lib/Kconfig | 20 +++++++++++++------- 14 files changed, 40 insertions(+), 10 deletions(-)
arch/arm/Kconfig +5 -1
@@ -991,7 +991,7 @@ config ARCH_MX6 imply SYS_THUMB_BUILD imply SPL_SEPARATE_BSS -if ARCH_MX6 +if ARCH_MX6 && SPL config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif
@@ -2349,7 +2349,11 @@ source "arch/arm/Kconfig.debug" endmenu +if SPL + config SPL_LDSCRIPT default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + +endif
arch/arm/cpu/armv8/Kconfig +2 -0
@@ -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.
common/Kconfig +5 -0
@@ -81,10 +81,14 @@ config LOGLEVEL 8 - debug content 9 - debug hardware I/O +if SPL + config SPL_LOGLEVEL int default LOGLEVEL +endif + config TPL_LOGLEVEL int default LOGLEVEL
@@ -241,6 +245,7 @@ config SYS_STDIO_DEREGISTER config SPL_SYS_STDIO_DEREGISTER bool "Allow deregistering stdio devices in SPL" + depends on SPL help Generally there is no need to deregister stdio devices since they are never deactivated. But if a stdio device is used which can be
common/spl/Kconfig +2 -2
@@ -19,6 +19,8 @@ config SPL help If you want to build SPL as well as the normal image, say Y. +if SPL + config SPL_FRAMEWORK bool "Support SPL based upon the common SPL framework" depends on SPL
@@ -150,8 +152,6 @@ config HANDOFF in boot. It is available in gd->handoff. The state state is set up in SPL (or TPL if that is being used). -if SPL - config SPL_HANDOFF bool "Pass hand-off information from SPL to U-Boot proper" depends on HANDOFF && SPL_BLOBLIST
drivers/firmware/Kconfig +1 -0
@@ -3,6 +3,7 @@ config FIRMWARE config SPL_FIRMWARE bool "Enable Firmware driver support in SPL" + depends on SPL depends on FIRMWARE config SPL_ARM_PSCI_FW
drivers/gpio/Kconfig +1 -0
@@ -490,6 +490,7 @@ config DM_PCA953X config SPL_DM_PCA953X bool "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports in SPL" + depends on SPL depends on DM_GPIO help Say yes here to provide access to several register-oriented
drivers/misc/Kconfig +1 -0
@@ -504,6 +504,7 @@ config FS_LOADER config SPL_FS_LOADER bool "Enable loader driver for file system" + depends on SPL help This is file system generic loader which can be used to load the file image from the storage into target such as memory.
drivers/mmc/Kconfig +5 -0
@@ -123,6 +123,7 @@ config MMC_IO_VOLTAGE config SPL_MMC_IO_VOLTAGE bool "Support IO voltage configuration in SPL" + depends on SPL 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 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 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 help The HS200 mode is support by some eMMC. The bus frequency is up to 200MHz. This mode requires tuning the IO.
@@ -478,6 +482,7 @@ config MMC_SDHCI_ADMA config SPL_MMC_SDHCI_ADMA bool "Support SDHCI ADMA2 in SPL" + depends on SPL depends on MMC_SDHCI select MMC_SDHCI_ADMA_HELPERS help
drivers/mtd/spi/Kconfig +1 -0
@@ -248,6 +248,7 @@ config SPI_FLASH_MTD config SPL_SPI_FLASH_MTD bool "SPI flash MTD support for SPL" + depends on SPL depends on SPI_FLASH help Enable the MTD support for the SPI flash layer in SPL.
drivers/power/Kconfig +1 -0
@@ -29,6 +29,7 @@ config POWER_LEGACY config SPL_POWER_LEGACY bool "Legacy power support in SPL" + depends on SPL default y if POWER_LEGACY help Note: This is a legacy option. Use SPL_DM_PMIC instead.
drivers/power/acpi_pmc/Kconfig +1 -0
@@ -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
drivers/power/regulator/Kconfig +1 -0
@@ -163,6 +163,7 @@ config DM_REGULATOR_FIXED config SPL_DM_REGULATOR_FIXED bool "Enable Driver Model for REGULATOR Fixed value in SPL" + depends on SPL_DM_REGULATOR depends on DM_REGULATOR_FIXED select SPL_DM_REGULATOR_COMMON ---help---
fs/cbfs/Kconfig +1 -0
@@ -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
lib/Kconfig +13 -7
@@ -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
@@ -556,6 +557,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
@@ -640,6 +642,14 @@ config ZSTD help This enables Zstandard decompression library. +config VPL_LZMA + bool "Enable LZMA decompression support for VPL build" + default y if LZMA + help + This enables support for LZMA compression algorithm for VPL boot. + +if SPL + config SPL_LZ4 bool "Enable LZ4 decompression support in SPL" help
@@ -653,12 +663,6 @@ config SPL_LZMA help This enables support for LZMA compression algorithm for SPL boot. -config VPL_LZMA - bool "Enable LZMA decompression support for VPL build" - default y if LZMA - help - This enables support for LZMA compression algorithm for VPL boot. - config SPL_LZO bool "Enable LZO decompression support in SPL" help
@@ -681,6 +685,8 @@ config SPL_ZSTD help This enables Zstandard decompression library in the SPL. +endif + endmenu config ERRNO_STR
@@ -749,7 +755,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 || (SPL && FIT) default 0xff help Use this to change the assumptions made by libfdt in SPL about the
Signature · 1 line
2.20.1
Quoted 8 lines · Pali Rohár
It does not make sense to enable SPL options when not building SPL binary.
So disallow selecting SPL options for non-SPL builds.
Signed-off-by Pali Rohár <[email protected]>---
Changes in v2:
* Move SPL compression options under one big if SPL ... endif
This one I'll pick up and v3 myself as there's a few symbols here I did miss in:
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Signature · 1 line
Tom