GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: 431889d6ad ("spl: zImage support in Falcon mode")
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2021-04-17 09:34:37 -05:00 • committed by Stefan Roese
parent 4b37a83dc4
commit 2e1af1e3e7
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/lib/zimage.c
View file

@ -25,18 +25,16 @@ int bootz_setup(ulong image, ulong *start, ulong *end)
if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC && if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC &&
zi->zi_magic != BAREBOX_IMAGE_MAGIC) { zi->zi_magic != BAREBOX_IMAGE_MAGIC) {
#ifndef CONFIG_SPL_FRAMEWORK if (!IS_ENABLED(CONFIG_SPL_BUILD))
puts("zimage: Bad magic!\n"); puts("zimage: Bad magic!\n");
#endif
return 1; return 1;
} }
*start = zi->zi_start; *start = zi->zi_start;
*end = zi->zi_end; *end = zi->zi_end;
#ifndef CONFIG_SPL_FRAMEWORK if (!IS_ENABLED(CONFIG_SPL_BUILD))
printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n", printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
image, *start, *end); image, *start, *end);
#endif
return 0; return 0;
} }