aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass2023-01-15 14:15:41 -0700
committerTom Rini2023-02-11 12:22:34 -0500
commitc38a21d7199b2e34af2d161fc58674ec81b2105d (patch)
tree24c7b8eaf4f717d997bc45606ec185d3c71ad95e
parent2c88d5e110517ba7565b33eb8bfabb0ae0885eab (diff)
dm: Allow serial output during the relocation process
Reset the serial flags so that the debug UART can be used (if enabled) in the small window where there is no serial device. This can avoid a hang in some cases. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/board_r.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c
index c6c0c1ab1d9..e45003353f7 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -797,6 +797,15 @@ static init_fnc_t init_sequence_r[] = {
void board_init_r(gd_t *new_gd, ulong dest_addr)
{
/*
+ * The pre-relocation drivers may be using memory that has now gone
+ * away. Mark serial as unavailable - this will fall back to the debug
+ * UART if available.
+ *
+ * Do the same with log drivers since the memory may not be available.
+ */
+ gd->flags &= ~(GD_FLG_SERIAL_READY | GD_FLG_LOG_READY);
+
+ /*
* Set up the new global data pointer. So far only x86 does this
* here.
* TODO(sjg@chromium.org): Consider doing this for all archs, or