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>

diff --git a/common/board_r.c b/common/board_r.c
index c6c0c1ab1d9439ec914fb6e11095b9374ebd5e30..e45003353f7db72703ceaa29f09cfd2b290e43ff 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -796,6 +796,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.