diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-05-04 17:56:49 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-05-04 17:56:49 +0200 |
commit | 63869c9d34d75cd8df5a1c448b67301bc3809d33 (patch) | |
tree | ec810901bea0c6197f228d7049d66c1344b97820 | |
parent | 7341581eb4990cff3255b6451742aa1c7ec0ee44 (diff) |
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.
-rw-r--r-- | arch/arm/cpu/armv7/vf610/generic.c | 2 | ||||
-rw-r--r-- | board/toradex/colibri_vf/colibri_vf.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index 1b17fdf74d..fdeabddfd8 100644 --- 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 696eb105bd..bea269665e 100644 --- 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 |