From 36b44c6fc7ddde29aec7f39ebcb5cc959d24b469 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 24 Jul 2014 13:13:58 +0200 Subject: colibri_vf: disable automatic boot when using recovery mode Since we use the same UART to download U-Boot and get the U-Boot prompt, it is quite hard to switch between the download program and the terminal emulator within the boot delay. This patch disables the automatic boot by setting the bootdelay to -1 when using the recovery mode (serial downloader). --- arch/arm/include/asm/arch-vf610/imx-regs.h | 8 ++++++++ board/toradex/colibri_vf/colibri_vf.c | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h index 5a18801e5d..2d929e50fd 100644 --- a/arch/arm/include/asm/arch-vf610/imx-regs.h +++ b/arch/arm/include/asm/arch-vf610/imx-regs.h @@ -227,6 +227,14 @@ /* Slow Clock Source Controller Module (SCSC) */ #define SCSC_SOSC_CTR_SOSC_EN (0x1) +/* System Reset Controller (SRC) */ +#define SRC_SBMR2_BMOD_MASK (0x3 << 24) +#define SRC_SBMR2_BMOD_SHIFT 24 +#define SRC_SBMR2_BMOD_FUSES 0x0 +#define SRC_SBMR2_BMOD_SERIAL 0x1 +#define SRC_SBMR2_BMOD_RCON 0x2 + + #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index f079c3dcc8..71f30a4954 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -578,6 +578,7 @@ void get_board_serial(struct tag_serialnr *serialnr) #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { + struct src *src = (struct src *)SRC_BASE_ADDR; if (read_cfb()) printf("Missing Toradex config block\n"); @@ -597,6 +598,12 @@ int board_late_init(void) } } + if (((src->sbmr2 & SRC_SBMR2_BMOD_MASK) >> SRC_SBMR2_BMOD_SHIFT) + == SRC_SBMR2_BMOD_SERIAL) { + printf("Serial Downloader recovery mode, disable autoboot\n"); + setenv("bootdelay", "-1"); + } + return 0; } #endif /* CONFIG_BOARD_LATE_INIT */ -- cgit v1.2.3