spl: Always define preloader_console_init

[oweals/u-boot.git] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index b0f0e1557b923f8be107e8bdee42f376295f3657..fc5cbbbeba3aae9de3c9ac9f49758adc6b5bf2df 100644 (file)
--- 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