ARM: vf610: rename/add bmode for Colibri VFxx

Rename the serial loader boot mode to "serial". Also add an alias
for the ESDHC1 controller, which provides the standard MMC connection
for the Colibri SO-DIMM default pinout.

diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index 1b17fdf74d0c1527f8b3a3d9e16f7a42e122cd7c..fdeabddfd8e8035b227294121abf09fb8a80acc1 100644 (file)
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -327,7 +327,7 @@ void boot_mode_apply(unsigned cfg_val)
 const struct boot_mode soc_boot_modes[] = {
        {"normal",      MAKE_CFGVAL(0x00, 0x00, 0x00, 0x00)},
        /* reserved value should start ROM's serial loader */
-       {"ser",         MAKE_CFGVAL(0x40, 0x00, 0x00, 0x00)},
+       {"serial",      MAKE_CFGVAL(0x40, 0x00, 0x00, 0x00)},
        /* 4 bit bus width */
        {"esdhc0",      MAKE_CFGVAL(0x60, 0x20, 0x00, 0x00)},
        {"esdhc1",      MAKE_CFGVAL(0x60, 0x28, 0x00, 0x00)},

diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 696eb105bd121f18e8b1b774e1c53bf59ea84df0..bea269665ea97e99a9abd59e80ad504ba9feddfc 100644 (file)
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -401,7 +401,8 @@ int board_early_init_f(void)
 
 #ifdef CONFIG_CMD_BMODE
 static const struct boot_mode board_boot_modes[] = {
-       {"nand", MAKE_CFGVAL(0x80, 0x02, 0x00, 0x00)},
+       {"nand",        MAKE_CFGVAL(0x80, 0x02, 0x00, 0x00)},
+       {"mmc",         MAKE_CFGVAL(0x60, 0x28, 0x00, 0x00)},
        {NULL,   0},
 };
 #endif