]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
riscv: binman: Always set default configuration in FIT image
authorRaymond Mao <raymond.mao@riscstar.com>
Wed, 20 May 2026 10:45:49 +0000 (06:45 -0400)
committerTim Ouyang <tim609@andestech.com>
Tue, 21 Jul 2026 09:16:02 +0000 (17:16 +0800)
When CONFIG_MULTI_DTB_FIT is enabled, the FIT image contains multiple
device tree configurations for different boards. The default
configuration must be explicitly set to ensure the FIT framework
traverses all available configurations instead of falling back to
CONFIG_DEFAULT_DEVICE_TREE.

Without this default property, fit_find_config_node() will use
CONFIG_DEFAULT_DEVICE_TREE as the configuration name to match.
This prevents the SPL from correctly selecting the appropriate
DTB based on runtime board detection (e.g., from EEPROM).

Remove the conditional guard so that "default = conf-1" is always
present in the FIT image, regardless of CONFIG_MULTI_DTB_FIT.

Signed-off-by: Raymond Mao <raymond.mao@riscstar.com>
Signed-off-by: Guodong Xu <guodong@riscstar.com>
arch/riscv/dts/binman.dtsi

index b518560bb94cdc583c6a50bc6e643ef74fa9ac41..84c261c684954aead51a3db8b1fc17ca09ae53c5 100644 (file)
@@ -93,9 +93,7 @@
 
                        configurations {
 
-#ifndef CONFIG_MULTI_DTB_FIT
                                default = "conf-1";
-#endif
 
 #if !defined(CONFIG_OF_BOARD) || defined(CONFIG_MULTI_DTB_FIT)
                                @conf-SEQ {