diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-08 14:19:22 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-08 14:19:22 -0600 |
| commit | 3bfd12008bef1a8353e7ceaca2cb06cf388527ed (patch) | |
| tree | ac25e8db2f18bcba9f48518249fc020a05cb576c /common/spl/spl.c | |
| parent | 6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72 (diff) | |
| parent | d6da3dbaef57fc1d319b6b552efa009e2489d7d9 (diff) | |
Merge branch 'next'
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 1ceb63daf31..ad31a2f8b6c 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -631,10 +631,13 @@ static int boot_from_devices(struct spl_image_info *spl_image, "Unsupported Boot Device!\n"); } } - if (loader && - !spl_load_image(spl_image, loader)) { - spl_image->boot_device = bootdev; - return 0; + if (loader) { + ret = spl_load_image(spl_image, loader); + if (!ret) { + spl_image->boot_device = bootdev; + return 0; + } + printf("Error: %d\n", ret); } } } @@ -833,7 +836,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) */ void preloader_console_init(void) { -#ifdef CONFIG_SPL_SERIAL +#if CONFIG_IS_ENABLED(SERIAL) gd->baudrate = CONFIG_BAUDRATE; serial_init(); /* serial communications setup */ @@ -892,7 +895,7 @@ __weak void spl_relocate_stack_check(void) */ ulong spl_relocate_stack_gd(void) { -#ifdef CONFIG_SPL_STACK_R +#if CONFIG_IS_ENABLED(STACK_R) gd_t *new_gd; ulong ptr = CONFIG_SPL_STACK_R_ADDR; |