diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:40:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:40:43 -0500 |
| commit | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (patch) | |
| tree | 087641ed4c29320f8759cda28e377e36ff82cb78 /arch/arm/cpu/arm926ejs/mxs/spl_boot.c | |
| parent | a4fb5df214c7e8d5bc949c1068d92252f105427a (diff) | |
| parent | aee0013e53b339a573e2a8d66062fe87765aa3bd (diff) | |
| download | blackbird-obmc-uboot-307367eaffc8638e10ba1784fc66bfe623ae79e2.tar.gz blackbird-obmc-uboot-307367eaffc8638e10ba1784fc66bfe623ae79e2.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu/arm926ejs/mxs/spl_boot.c')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index d29b9aaf3d..d7956e57de 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -147,6 +147,7 @@ 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"); mxs_power_init(); @@ -156,6 +157,11 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr, data->boot_mode_idx = bootmode; mxs_power_wait_pswitch(); + + if (mxs_boot_modes[data->boot_mode_idx].boot_pads == MXS_BM_JTAG) { + debug("SPL: Waiting for JTAG user\n"); + asm volatile ("x: b x"); + } } /* Support aparatus */ |
