Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Avoid #ifdef with CONFIG_SPL_PAYLOAD_ARGS_ADDR

Browse source 
Move the condition to the header file to improve readability.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-09-26 08:14:21 -06:00 • committed by Tom Rini
parent 6371c47999
commit e0be6eaf58
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/spl/spl.c
View file

@ -806,9 +806,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
} }
memset(&spl_image, '\0', sizeof(spl_image)); memset(&spl_image, '\0', sizeof(spl_image));
#ifdef CONFIG_SPL_PAYLOAD_ARGS_ADDR if (IS_ENABLED(CONFIG_SPL_OS_BOOT))
spl_image.arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR; spl_image.arg = (void *)SPL_PAYLOAD_ARGS_ADDR;
#endif
spl_image.boot_device = BOOT_DEVICE_NONE; spl_image.boot_device = BOOT_DEVICE_NONE;
board_boot_order(spl_boot_list); board_boot_order(spl_boot_list);
@ -865,9 +864,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
#if CONFIG_IS_ENABLED(OS_BOOT) #if CONFIG_IS_ENABLED(OS_BOOT)
case IH_OS_LINUX: case IH_OS_LINUX:
debug("Jumping to Linux\n"); debug("Jumping to Linux\n");
#if defined(CONFIG_SPL_PAYLOAD_ARGS_ADDR) if (IS_ENABLED(CONFIG_SPL_OS_BOOT))
spl_fixup_fdt((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR); spl_fixup_fdt((void *)SPL_PAYLOAD_ARGS_ADDR);
#endif
spl_board_prepare_for_linux(); spl_board_prepare_for_linux();
jump_to_image_linux(&spl_image); jump_to_image_linux(&spl_image);
#endif #endif

7
include/system-constants.h
View file

@ -34,4 +34,11 @@
#define SPL_SYS_MALLOC_SIZE \ #define SPL_SYS_MALLOC_SIZE \
IF_ENABLED_INT(CONFIG_SPL_SYS_MALLOC, CONFIG_SPL_SYS_MALLOC_SIZE) IF_ENABLED_INT(CONFIG_SPL_SYS_MALLOC, CONFIG_SPL_SYS_MALLOC_SIZE)
/* deal with an optional value */
#ifdef CONFIG_SPL_OS_BOOT
#define SPL_PAYLOAD_ARGS_ADDR CONFIG_SPL_PAYLOAD_ARGS_ADDR
#else
#define SPL_PAYLOAD_ARGS_ADDR 0
#endif
#endif #endif