summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Majewski <[email protected]>2023-05-19 12:43:54 +0200
committerStefano Babic <[email protected]>2023-07-11 14:40:04 +0200
commit191f683ee204c68eab2d6b28b9e4e81b1c6a0885 (patch)
treea5099e1078296468ebd5cf65c865bb82f5ca401a
parenta21789194873d768ba829eb0169c7f0e3ceb85ef (diff)
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 <[email protected]>
-rw-r--r--arch/arm/cpu/arm926ejs/mxs/spl_boot.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 763d79e8036..5598c552ab9 100644
--- 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();