arm: mxs: Prevent serial console init when in very early SPL boot code

When DM_SERIAL is enabled on mxs (i.e. imx28) platform, the console
early initialization must be postponed until the driver model is
correctly setup.

Signed-off-by: Lukasz Majewski <lukma@denx.de>

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 763d79e8036a41a0f157ce11f534d33dd19d5d01..5598c552ab9b33f1d3cd4b3b0bc6c5f44619a517 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -128,8 +128,10 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
 
        mxs_iomux_setup_multiple_pads(iomux_setup, iomux_size);
 
-       mxs_spl_console_init();
-       debug("SPL: Serial Console Initialised\n");
+       if (!CONFIG_IS_ENABLED(DM_SERIAL)) {
+               mxs_spl_console_init();
+               debug("SPL: Serial Console Initialised\n");
+       }
 
        mxs_power_init();