On 15.03.25 02:29, Tom Rini wrote:
As the code is today, we get a warning about "select" statements on
"choice" options not doing anything. However, it also works as intended
because SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is the default option
within that choice statement. To guard against future regressions, make
the choice statement in common/spl/Kconfig have an explicit default if
MVEBU_SPL_BOOT_DEVICE_MMC.
Signed-off-by: Tom Rini <[email protected]>
---
Cc: Stefan Roese <[email protected]>
Cc: "Marek BehĂșn" <[email protected]>
Cc: Chris Packham <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
Thanks,
Stefan
---
arch/arm/mach-mvebu/Kconfig | 1 -
common/spl/Kconfig | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index adb816982f87..c4be5d6e93e0 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -394,7 +394,6 @@ config MVEBU_SPL_BOOT_DEVICE_MMC
imply SPL_LIBDISK_SUPPORT
imply SPL_MMC
select SUPPORT_EMMC_BOOT if SPL_MMC
- select SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR if SPL_MMC
select SPL_BOOTROM_SUPPORT
config MVEBU_SPL_BOOT_DEVICE_SATA
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 97f542fcc8a5..c4715de0a582 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -538,6 +538,7 @@ if SPL_SYS_MMCSD_RAW_MODE
choice
prompt "Method for locating next phase of boot (e.g. U-Boot)"
+ default SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR if
MVEBU_SPL_BOOT_DEVICE_MMC
config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
bool "MMC raw mode: by sector"