diff options
| author | Simon Glass <sjg@chromium.org> | 2022-08-28 12:32:50 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-14 09:03:06 -0400 |
| commit | 1a68c039c500a97f46bd0ae180df01a42636fde8 (patch) | |
| tree | 04ef927cb0d4547856a6bd1750e9a705ed6be752 | |
| parent | f7659f69f70743dbd772b1dea24f346a63757eb8 (diff) | |
| download | u-boot-1a68c039c500a97f46bd0ae180df01a42636fde8.zip u-boot-1a68c039c500a97f46bd0ae180df01a42636fde8.tar.gz u-boot-1a68c039c500a97f46bd0ae180df01a42636fde8.tar.bz2 | |
image: Drop another #ifdef for FIT
Drop the prenultimate one of these from select_ramdisk().
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | boot/image-board.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 |