dra7xx_evm: Enabled UART-boot mode and add dra7xx_evm_uart3 build
authorMinal Shah <minal.shah@ti.com>
Fri, 4 Oct 2013 18:52:02 +0000 (14:52 -0400)
committerTom Rini <trini@ti.com>
Fri, 1 Nov 2013 19:56:00 +0000 (15:56 -0400)
UART booting is supported on this SoC, but via UART3 rather than UART1.
Because of this we must change the board to use UART3 for all console
access (only one UART is exposed on this board and a slight HW mod is
required to switch UARTs).

Signed-off-by: Minal Shah <minal.shah@ti.com>
[trini: Make apply to mainline, reword commit]
Signed-off-by: Tom Rini <trini@ti.com>
arch/arm/include/asm/arch-omap5/spl.h
boards.cfg
include/configs/dra7xx_evm.h

index 57f0de5ffe48c105d410f6bc30bed788317e9f21..2d5a62e660338f1c2ed6bd8f2bc8fad4c43177bc 100644 (file)
@@ -16,6 +16,7 @@
 #define BOOT_DEVICE_MMC2        6
 #define BOOT_DEVICE_MMC2_2     7
 #define BOOT_DEVICE_SPI                10
+#define BOOT_DEVICE_UART       0x43
 
 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
 #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
index 0d4f2e0866f1e3590392e55430acd20d14ec7f79..3a56eab28ef3f5731f7a3684fa7bb49c648aef65 100644 (file)
@@ -334,7 +334,8 @@ Active  arm         armv7          omap3       ti              sdp3430
 Active  arm         armv7          omap3       timll           devkit8000          devkit8000                           -                                                                                                                                 Thomas Weber <weber@corscience.de>
 Active  arm         armv7          omap4       ti              panda               omap4_panda                          -                                                                                                                                 Sricharan R <r.sricharan@ti.com>
 Active  arm         armv7          omap4       ti              sdp4430             omap4_sdp4430                        -                                                                                                                                 Sricharan R <r.sricharan@ti.com>
-Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm                           -                                                                                                                                 Lokesh Vutla <lokeshvutla@ti.com>
+Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm                           dra7xx_evm:CONS_INDEX=1                                                                                                           Lokesh Vutla <lokeshvutla@ti.com>
+Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm_uart3                     dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT                                                                                        Lokesh Vutla <lokeshvutla@ti.com>
 Active  arm         armv7          omap5       ti              omap5_uevm          omap5_uevm                           -                                                                                                                                 -
 Active  arm         armv7          rmobile     atmark-techno   armadillo-800eva    armadillo-800eva                     -                                                                                                                                 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
 Active  arm         armv7          rmobile     kmc             kzm9g               kzm9g                                -                                                                                                                                 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:Tetsuyuki Kobayashi <koba@kmckk.co.jp>
index 3a4c06bc8fe84b53ad58f1beff260dd86bc6723b..7186ce709cbfaa75da3a109dd10b6d6455c308f8 100644 (file)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_CMD_SAVEENV
 
+#if (CONFIG_CONS_INDEX == 1)
 #define CONSOLEDEV                     "ttyO0"
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_SYS_NS16550_COM1                UART1_BASE
+#elif (CONFIG_CONS_INDEX == 3)
+#define CONSOLEDEV                     "ttyO2"
+#endif
+#define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */
+#define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */
+#define CONFIG_SYS_NS16550_COM3                UART3_BASE      /* UART3 */
 #define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_SYS_OMAP_ABE_SYSCK