From: Simon Glass <sjg@chromium.org>
Date: Sun, 28 Aug 2022 18:32:50 +0000 (-0600)
Subject: image: Drop another #ifdef for FIT
X-Git-Tag: v2023.07~312^2~17^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a68c039c500a97f46bd0ae180df01a42636fde8;p=platform%2Fkernel%2Fu-boot.git

image: Drop another #ifdef for FIT

Drop the prenultimate one of these from select_ramdisk().

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/boot/image-board.c b/boot/image-board.c
index 07b7e46..8858a2f 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