Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-29 01:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: Rename SPL_TPL_NAME and SPL_TPL_PROMPT

Browse source 
Rename these to use the word PHASE instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-09-29 19:49:55 -06:00 • committed by Tom Rini
parent 5c10c8badf
commit 96ed5b0e3e
4 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
common/spl/spl.c
View file

@ -97,9 +97,9 @@ __weak int dram_init_banksize(void)
#if CONFIG_IS_ENABLED(OS_BOOT) #if CONFIG_IS_ENABLED(OS_BOOT)
__weak int spl_start_uboot(void) __weak int spl_start_uboot(void)
{ {
puts(SPL_TPL_PROMPT puts(PHASE_PROMPT
"Please implement spl_start_uboot() for your board\n"); "Please implement spl_start_uboot() for your board\n");
puts(SPL_TPL_PROMPT "Direct Linux boot not active!\n"); puts(PHASE_PROMPT "Direct Linux boot not active!\n");
return 1; return 1;
} }
@ -140,13 +140,13 @@ void spl_fixup_fdt(void *fdt_blob)
/* fixup the memory dt node */ /* fixup the memory dt node */
err = fdt_shrink_to_minimum(fdt_blob, 0); err = fdt_shrink_to_minimum(fdt_blob, 0);
if (err == 0) { if (err == 0) {
printf(SPL_TPL_PROMPT "fdt_shrink_to_minimum err - %d\n", err); printf(PHASE_PROMPT "fdt_shrink_to_minimum err - %d\n", err);
return; return;
} }
err = arch_fixup_fdt(fdt_blob); err = arch_fixup_fdt(fdt_blob);
if (err) { if (err) {
printf(SPL_TPL_PROMPT "arch_fixup_fdt err - %d\n", err); printf(PHASE_PROMPT "arch_fixup_fdt err - %d\n", err);
return; return;
} }
#endif #endif
@ -330,7 +330,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
spl_image->load_addr = start; spl_image->load_addr = start;
spl_image->entry_point = start; spl_image->entry_point = start;
spl_image->size = size; spl_image->size = size;
debug(SPL_TPL_PROMPT debug(PHASE_PROMPT
"payload Image, load addr: 0x%lx size: %d\n", "payload Image, load addr: 0x%lx size: %d\n",
spl_image->load_addr, spl_image->size); spl_image->load_addr, spl_image->size);
return 0; return 0;
@ -344,7 +344,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
spl_image->load_addr = CONFIG_SYS_LOAD_ADDR; spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;
spl_image->entry_point = CONFIG_SYS_LOAD_ADDR; spl_image->entry_point = CONFIG_SYS_LOAD_ADDR;
spl_image->size = end - start; spl_image->size = end - start;
debug(SPL_TPL_PROMPT debug(PHASE_PROMPT
"payload zImage, load addr: 0x%lx size: %d\n", "payload zImage, load addr: 0x%lx size: %d\n",
spl_image->load_addr, spl_image->size); spl_image->load_addr, spl_image->size);
return 0; return 0;
@ -423,7 +423,7 @@ static int write_spl_handoff(void)
ret = handoff_arch_save(ho); ret = handoff_arch_save(ho);
if (ret) if (ret)
return ret; return ret;
debug(SPL_TPL_PROMPT "Wrote SPL handoff\n"); debug(PHASE_PROMPT "Wrote SPL handoff\n");
return 0; return 0;
} }
@ -623,11 +623,11 @@ static int boot_from_devices(struct spl_image_info *spl_image,
printf("Trying to boot from %s\n", printf("Trying to boot from %s\n",
spl_loader_name(loader)); spl_loader_name(loader));
else if (CONFIG_IS_ENABLED(SHOW_ERRORS)) { else if (CONFIG_IS_ENABLED(SHOW_ERRORS)) {
printf(SPL_TPL_PROMPT printf(PHASE_PROMPT
"Unsupported Boot Device %d\n", "Unsupported Boot Device %d\n",
bootdev); bootdev);
} else { } else {
puts(SPL_TPL_PROMPT puts(PHASE_PROMPT
"Unsupported Boot Device!\n"); "Unsupported Boot Device!\n");
} }
} }
@ -673,7 +673,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
struct spl_image_info spl_image; struct spl_image_info spl_image;
int ret, os; int ret, os;
debug(">>" SPL_TPL_PROMPT "board_init_r()\n"); debug(">>" PHASE_PROMPT "board_init_r()\n");
spl_set_bd(); spl_set_bd();
@ -693,7 +693,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
if (ret) { if (ret) {
debug("%s: Failed to set up bloblist: ret=%d\n", debug("%s: Failed to set up bloblist: ret=%d\n",
__func__, ret); __func__, ret);
puts(SPL_TPL_PROMPT "Cannot set up bloblist\n"); puts(PHASE_PROMPT "Cannot set up bloblist\n");
hang(); hang();
} }
} }
@ -702,7 +702,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
ret = setup_spl_handoff(); ret = setup_spl_handoff();
if (ret) { if (ret) {
puts(SPL_TPL_PROMPT "Cannot set up SPL handoff\n"); puts(PHASE_PROMPT "Cannot set up SPL handoff\n");
hang(); hang();
} }
} }
@ -723,7 +723,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
if (CONFIG_IS_ENABLED(PCI) && !(gd->flags & GD_FLG_DM_DEAD)) { if (CONFIG_IS_ENABLED(PCI) && !(gd->flags & GD_FLG_DM_DEAD)) {
ret = pci_init(); ret = pci_init();
if (ret) if (ret)
puts(SPL_TPL_PROMPT "Cannot initialize PCI\n"); puts(PHASE_PROMPT "Cannot initialize PCI\n");
/* Don't fail. We still can try other boot methods. */ /* Don't fail. We still can try other boot methods. */
} }
@ -750,10 +750,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
ARRAY_SIZE(spl_boot_list)); ARRAY_SIZE(spl_boot_list));
if (ret) { if (ret) {
if (CONFIG_IS_ENABLED(SHOW_ERRORS)) if (CONFIG_IS_ENABLED(SHOW_ERRORS))
printf(SPL_TPL_PROMPT "failed to boot from all boot devices (err=%d)\n", printf(PHASE_PROMPT "failed to boot from all boot devices (err=%d)\n",
ret); ret);
else else
puts(SPL_TPL_PROMPT "failed to boot from all boot devices\n"); puts(PHASE_PROMPT "failed to boot from all boot devices\n");
hang(); hang();
} }
@ -807,13 +807,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
if (CONFIG_IS_ENABLED(HANDOFF)) { if (CONFIG_IS_ENABLED(HANDOFF)) {
ret = write_spl_handoff(); ret = write_spl_handoff();
if (ret) if (ret)
printf(SPL_TPL_PROMPT printf(PHASE_PROMPT
"SPL hand-off write failed (err=%d)\n", ret); "SPL hand-off write failed (err=%d)\n", ret);
} }
if (CONFIG_IS_ENABLED(UPL_OUT) && (gd->flags & GD_FLG_UPL)) { if (CONFIG_IS_ENABLED(UPL_OUT) && (gd->flags & GD_FLG_UPL)) {
ret = spl_write_upl_handoff(&spl_image); ret = spl_write_upl_handoff(&spl_image);
if (ret) { if (ret) {
printf(SPL_TPL_PROMPT printf(PHASE_PROMPT
"UPL hand-off write failed (err=%d)\n", ret); "UPL hand-off write failed (err=%d)\n", ret);
hang(); hang();
} }
@ -843,7 +843,7 @@ void preloader_console_init(void)
gd->flags |= GD_FLG_HAVE_CONSOLE; gd->flags |= GD_FLG_HAVE_CONSOLE;
#if CONFIG_IS_ENABLED(BANNER_PRINT) #if CONFIG_IS_ENABLED(BANNER_PRINT)
puts("\nU-Boot " SPL_TPL_NAME " " PLAIN_VERSION " (" U_BOOT_DATE " - " puts("\nU-Boot " PHASE_NAME " " PLAIN_VERSION " (" U_BOOT_DATE " - "
U_BOOT_TIME " " U_BOOT_TZ ")\n"); U_BOOT_TIME " " U_BOOT_TZ ")\n");
#endif #endif
#ifdef CONFIG_SPL_DISPLAY_PRINT #ifdef CONFIG_SPL_DISPLAY_PRINT

2
common/spl/spl_fit.c
View file

@ -904,7 +904,7 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
spl_image->os = IH_OS_INVALID; spl_image->os = IH_OS_INVALID;
spl_image->name = genimg_get_os_name(spl_image->os); spl_image->name = genimg_get_os_name(spl_image->os);
debug(SPL_TPL_PROMPT "payload image: %32s load addr: 0x%lx size: %d\n", debug(PHASE_PROMPT "payload image: %32s load addr: 0x%lx size: %d\n",
spl_image->name, spl_image->load_addr, spl_image->size); spl_image->name, spl_image->load_addr, spl_image->size);
#ifdef CONFIG_SPL_FIT_SIGNATURE #ifdef CONFIG_SPL_FIT_SIGNATURE

2
common/spl/spl_legacy.c
View file

@ -71,7 +71,7 @@ int spl_parse_legacy_header(struct spl_image_info *spl_image,
spl_image->os = image_get_os(header); spl_image->os = image_get_os(header);
spl_image->name = image_get_name(header); spl_image->name = image_get_name(header);
debug(SPL_TPL_PROMPT debug(PHASE_PROMPT
"payload image: %32s load addr: 0x%lx size: %d\n", "payload image: %32s load addr: 0x%lx size: %d\n",
spl_image->name, spl_image->load_addr, spl_image->size); spl_image->name, spl_image->load_addr, spl_image->size);

14
include/spl.h
View file

@ -241,16 +241,16 @@ static inline const char *xpl_prefix(enum xpl_phase_t phase)
/* A string name for SPL or TPL */ /* A string name for SPL or TPL */
#ifdef CONFIG_XPL_BUILD #ifdef CONFIG_XPL_BUILD
# ifdef CONFIG_TPL_BUILD # ifdef CONFIG_TPL_BUILD
# define SPL_TPL_NAME "TPL" # define PHASE_NAME "TPL"
# elif defined(CONFIG_VPL_BUILD) # elif defined(CONFIG_VPL_BUILD)
# define SPL_TPL_NAME "VPL" # define PHASE_NAME "VPL"
# else # elif defined(CONFIG_SPL_BUILD)
# define SPL_TPL_NAME "SPL" # define PHASE_NAME "SPL"
# endif # endif
# define SPL_TPL_PROMPT SPL_TPL_NAME ": " # define PHASE_PROMPT PHASE_NAME ": "
#else #else
# define SPL_TPL_NAME "" # define PHASE_NAME ""
# define SPL_TPL_PROMPT "" # define PHASE_PROMPT ""
#endif #endif
/** /**