Hi Simon,
glad to "hear" something from you again. ;)
...
On 9/25/25 02:23, Simon Glass wrote:
From: Simon Glass <[email protected]>
With recent changes to how BLK works, we must use 'select' to enable the
BLK feature, which is currently required by BOOTSTD.
This fixes the following error:
GEN Makefile
scripts/kconfig/conf --syncconfig Kconfig
boot/Kconfig:496:error: recursive dependency detected!
boot/Kconfig:496: symbol BOOTSTD_DEFAULTS depends on BOOTSTD
boot/Kconfig:441: symbol BOOTSTD default is visible depending on BLK
drivers/block/Kconfig:1: symbol BLK is selected by USB
drivers/usb/Kconfig:1: symbol USB is selected by BOOTSTD_DEFAULTS
Disable BOOTSTD for the boards which don't have enough space or some
other problem:
zynq_cse_nand
zynq_cse_nor
zynq_cse_qspi
gardena-smart-gateway-mt7688
10m50
3c120
Signed-off-by: Simon Glass <[email protected]>
---
Changes in v7:
- Put this patch earlier in the series, so it is bisectable
- Disable some boards which lack space
Changes in v6:
- Add new patch to select BLK rather than depending on it
boot/Kconfig | 3 ++-
configs/10m50_defconfig | 1 +
configs/3c120_defconfig | 1 +
configs/gardena-smart-gateway-mt7688_defconfig | 1 +
For this platform:
Reviewed-by: Stefan Roese <[email protected]>
Thanks,
Stefan
configs/zynq_cse_nand_defconfig | 1 +
configs/zynq_cse_nor_defconfig | 1 +
configs/zynq_cse_qspi_defconfig | 1 +
7 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/boot/Kconfig b/boot/Kconfig
index d1e608f2595..2cc33cc874d 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -438,8 +438,9 @@ config BOOT_DEFAULTS
menuconfig BOOTSTD
bool "Standard boot"
- default y if BLK
+ default y
depends on DM && OF_CONTROL
+ select BLK
help
U-Boot supports a standard way of locating something to boot,
typically an Operating System such as Linux, provided by a distro such
diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig
index 8180ed55e3e..0d4b1dc8d94 100644
--- a/configs/10m50_defconfig
+++ b/configs/10m50_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0xcc000000
CONFIG_ENV_ADDR=0xF4080000
CONFIG_SYS_MONITOR_BASE=0xCFF80000
CONFIG_FIT=y
+# CONFIG_BOOTSTD is not set
# CONFIG_AUTOBOOT is not set
CONFIG_SYS_CBSIZE=256
CONFIG_SYS_PBSIZE=276
diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig
index 0a6eae4b5dd..c444a12f485 100644
--- a/configs/3c120_defconfig
+++ b/configs/3c120_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0xd4000000
CONFIG_ENV_ADDR=0xE2880000
CONFIG_SYS_MONITOR_BASE=0xD7F80000
CONFIG_FIT=y
+# CONFIG_BOOTSTD is not set
# CONFIG_AUTOBOOT is not set
CONFIG_SYS_CBSIZE=256
CONFIG_SYS_PBSIZE=276
diff --git a/configs/gardena-smart-gateway-mt7688_defconfig
b/configs/gardena-smart-gateway-mt7688_defconfig
index 3c2bcc6a3c4..ea0094394eb 100644
--- a/configs/gardena-smart-gateway-mt7688_defconfig
+++ b/configs/gardena-smart-gateway-mt7688_defconfig
@@ -31,6 +31,7 @@ CONFIG_HAS_BOARD_SIZE_LIMIT=y
CONFIG_BOARD_SIZE_LIMIT=655360
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
+# CONFIG_BOOTSTD is not set
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR="x"
diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig
index 4272b7320b6..9b85b23a9d5 100644
--- a/configs/zynq_cse_nand_defconfig
+++ b/configs/zynq_cse_nand_defconfig
@@ -23,6 +23,7 @@ CONFIG_SPL=y
CONFIG_REMAKE_ELF=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
+# CONFIG_BOOTSTD is not set
# CONFIG_AUTOBOOT is not set
CONFIG_USE_PREBOOT=y
CONFIG_SYS_CBSIZE=1024
diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig
index 74c4595eb43..fab02bfdb0a 100644
--- a/configs/zynq_cse_nor_defconfig
+++ b/configs/zynq_cse_nor_defconfig
@@ -23,6 +23,7 @@ CONFIG_SPL=y
CONFIG_REMAKE_ELF=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
+# CONFIG_BOOTSTD is not set
# CONFIG_AUTOBOOT is not set
CONFIG_USE_PREBOOT=y
CONFIG_SYS_CBSIZE=1024
diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
index 145b7fd33bb..31ff00c689c 100644
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -29,6 +29,7 @@ CONFIG_DEBUG_UART=y
CONFIG_REMAKE_ELF=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
+# CONFIG_BOOTSTD is not set
# CONFIG_AUTOBOOT is not set
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
CONFIG_USE_PREBOOT=y
