summaryrefslogtreecommitdiff
path: root/common/spl/spl.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-15 16:42:06 -0400
committerTom Rini <trini@konsulko.com>2020-05-15 16:42:06 -0400
commit506159549df76034dfbdee562304ce4c102d3a06 (patch)
tree85c116fc3267a1ce16d6771f0a08675788d48ccd /common/spl/spl.c
parent5f09f9af3cc335fe6a74c031cfa0b1d8bdf4b9db (diff)
parent24bf6e84ce22cd1b53cb79e4f89a4036af7e9c6b (diff)
Merge branch '2020-05-15-misc-bugfixes'
- A number of symbol name consistency updates - JFFS2 bugfix - Use /* fallthrough */ for now to help at least gcc know when we're intentionally not 'break;'ing in a switch statement, we'll adopt fallthrough; later on. - Assorted other fixes
Diffstat (limited to 'common/spl/spl.c')
-rw-r--r--common/spl/spl.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index b0f0e1557b..fc5cbbbeba 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -574,8 +574,7 @@ void board_init_f(ulong dummy)
}
}
- if (CONFIG_IS_ENABLED(SERIAL_SUPPORT))
- preloader_console_init();
+ preloader_console_init();
}
#endif
@@ -724,13 +723,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
jump_to_image_no_args(&spl_image);
}
-#ifdef CONFIG_SPL_SERIAL_SUPPORT
/*
* This requires UART clocks to be enabled. In order for this to work the
* caller must ensure that the gd pointer is valid.
*/
void preloader_console_init(void)
{
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
gd->baudrate = CONFIG_BAUDRATE;
serial_init(); /* serial communications setup */
@@ -744,8 +743,8 @@ void preloader_console_init(void)
#ifdef CONFIG_SPL_DISPLAY_PRINT
spl_display_print();
#endif
-}
#endif
+}
/**
* This function is called before the stack is changed from initial stack to