mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
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: 431889d6ad
("spl: zImage support in Falcon mode")
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
parent
4b37a83dc4
commit
2e1af1e3e7
1 changed files with 5 additions and 7 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue