|
@@ -87,7 +87,7 @@ __weak int dram_init_banksize(void)
|
|
|
* 0 to not start u-boot
|
|
|
* positive if u-boot should start
|
|
|
*/
|
|
|
-#ifdef CONFIG_SPL_OS_BOOT
|
|
|
+#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
|
__weak int spl_start_uboot(void)
|
|
|
{
|
|
|
puts(SPL_TPL_PROMPT
|
|
@@ -353,7 +353,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
|
|
|
panic("** no mkimage signature but raw image not supported");
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_SPL_OS_BOOT
|
|
|
+#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
|
ulong start, end;
|
|
|
|
|
|
if (!bootz_setup((ulong)header, &start, &end)) {
|
|
@@ -797,7 +797,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
|
|
spl_invoke_opensbi(&spl_image);
|
|
|
break;
|
|
|
#endif
|
|
|
-#ifdef CONFIG_SPL_OS_BOOT
|
|
|
+#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
|
case IH_OS_LINUX:
|
|
|
debug("Jumping to Linux\n");
|
|
|
#if defined(CONFIG_SYS_SPL_ARGS_ADDR)
|