Skip to content
Snippets Groups Projects
Commit c2343695 authored by Samuel Holland's avatar Samuel Holland Committed by Tom Rini
Browse files

arm: zimage: Use correct symbol to hide messages in SPL


When zImage support was added to SPL, the messages were hidden to reduce
code size. However, the wrong config symbol was used. Since this file is
only built when CONFIG_SPL_FRAMEWORK=y, the messages were always hidden.

Use the correct symbol so the messages are printed in U-Boot proper.
Also use IS_ENABLED to drop the #ifdef.

Fixes: 431889d6 ("spl: zImage support in Falcon mode")
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
parent ff8cb34d
No related branches found
No related tags found
No related merge requests found
......@@ -25,18 +25,16 @@ int bootz_setup(ulong image, ulong *start, ulong *end)
if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC &&
zi->zi_magic != BAREBOX_IMAGE_MAGIC) {
#ifndef CONFIG_SPL_FRAMEWORK
puts("zimage: Bad magic!\n");
#endif
if (!IS_ENABLED(CONFIG_SPL_BUILD))
puts("zimage: Bad magic!\n");
return 1;
}
*start = zi->zi_start;
*end = zi->zi_end;
#ifndef CONFIG_SPL_FRAMEWORK
printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
image, *start, *end);
#endif
if (!IS_ENABLED(CONFIG_SPL_BUILD))
printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
image, *start, *end);
return 0;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment