image: Drop another #ifdef for FIT
authorSimon Glass <sjg@chromium.org>
Sun, 28 Aug 2022 18:32:50 +0000 (12:32 -0600)
committerTom Rini <trini@konsulko.com>
Wed, 14 Sep 2022 13:03:06 +0000 (09:03 -0400)
Drop the prenultimate one of these from select_ramdisk().

Signed-off-by: Simon Glass <sjg@chromium.org>
boot/image-board.c

index 07b7e46..8858a2f 100644 (file)
@@ -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