From: Marek Vasut Date: Wed, 19 Mar 2014 01:21:36 +0000 (+0100) Subject: arm: mxs: Add serial console support into SPL X-Git-Tag: v2014.04~30 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=9926eb31b707cd7e769ab855186aa96ff7d5b7ff arm: mxs: Add serial console support into SPL Add support for serial console into the i.MX23/i.MX28 SPL. A full, uncrippled serial console support comes very helpful when debugging various spectacular hardware bringup issues early in the process. Because we do not use SPL framework, but have our own minimalistic SPL, which is compatible with the i.MX23/i.MX28 BootROM, we do not use preloader_console_init(), but instead use a similar function to start the console. Nonetheless, to avoid blowing up the size of the SPL binary, this support is enabled only if CONFIG_SPL_SERIAL_SUPPORT is defined, which is disabled by default. Signed-off-by: Marek Vasut Cc: Stefano Babic --- diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index b647e8a618..e643eade1b 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -18,7 +18,8 @@ #include "mxs_init.h" DECLARE_GLOBAL_DATA_PTR; -gd_t gdata __section(".data"); +static gd_t gdata __section(".data"); +static bd_t bdata __section(".data"); /* * This delay function is intended to be used only in early stage of boot, where @@ -118,6 +119,16 @@ static void mxs_spl_fixup_vectors(void) memcpy(0x0, &_start, 0x60); } +static void mxs_spl_console_init(void) +{ +#ifdef CONFIG_SPL_SERIAL_SUPPORT + gd->bd = &bdata; + gd->baudrate = CONFIG_BAUDRATE; + serial_init(); + gd->have_console = 1; +#endif +} + void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr, const iomux_cfg_t *iomux_setup, const unsigned int iomux_size) @@ -131,6 +142,8 @@ 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(); + mxs_power_init(); mxs_mem_init();