[PATCH 5/8] image: Drop another #ifdef for FIT
Simon Glass
sjg at chromium.org
Sun Aug 28 20:32:50 CEST 2022
Drop the prenultimate one of these from select_ramdisk().
Signed-off-by: Simon Glass <sjg at chromium.org>
---
boot/image-board.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/boot/image-board.c b/boot/image-board.c
index 07b7e467cc4..8858a2fe126 100644
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -363,7 +363,9 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
rd_addr);
}
#if CONFIG_IS_ENABLED(FIT)
- } else {
+ }
+#endif
+ if (CONFIG_IS_ENABLED(FIT) && !select) {
/* use FIT configuration provided in first bootm
* command argument. If the property is not defined,
* quit silently (with -ENOPKG)
@@ -377,7 +379,6 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
else if (rd_noffset < 0)
return rd_noffset;
}
-#endif
/*
* Check if there is an initrd image at the
--
2.37.2.672.g94769d06f0-goog
More information about the U-Boot
mailing list