From: Minal Shah <minal.s...@ti.com>

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.s...@ti.com>
[trini: Make apply to mainline, reword commit]
Signed-off-by: Tom Rini <tr...@ti.com>
---
 arch/arm/include/asm/arch-omap5/spl.h |    1 +
 boards.cfg                            |    3 ++-
 include/configs/dra7xx_evm.h          |    9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/arch-omap5/spl.h 
b/arch/arm/include/asm/arch-omap5/spl.h
index fe8b0c0..1fdaa75 100644
--- a/arch/arm/include/asm/arch-omap5/spl.h
+++ b/arch/arm/include/asm/arch-omap5/spl.h
@@ -15,6 +15,7 @@
 #define BOOT_DEVICE_MMC1        5
 #define BOOT_DEVICE_MMC2        6
 #define BOOT_DEVICE_MMC2_2     7
+#define BOOT_DEVICE_UART       0x43
 
 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
 #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
diff --git a/boards.cfg b/boards.cfg
index dbd8479..57505b0 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -329,7 +329,8 @@ Active  arm         armv7          omap3       ti           
   sdp3430
 Active  arm         armv7          omap3       timll           devkit8000      
    devkit8000                           -                                      
                                                                                
           Thomas Weber <we...@corscience.de>
 Active  arm         armv7          omap4       ti              panda           
    omap4_panda                          -                                      
                                                                                
           Sricharan R <r.sricha...@ti.com>
 Active  arm         armv7          omap4       ti              sdp4430         
    omap4_sdp4430                        -                                      
                                                                                
           Sricharan R <r.sricha...@ti.com>
-Active  arm         armv7          omap5       ti              dra7xx          
    dra7xx_evm                           -                                      
                                                                                
           Lokesh Vutla <lokeshvu...@ti.com>
+Active  arm         armv7          omap5       ti              dra7xx          
    dra7xx_evm                           dra7xx_evm:CONS_INDEX=1                
                                                                                
           Lokesh Vutla <lokeshvu...@ti.com>
+Active  arm         armv7          omap5       ti              dra7xx          
    dra7xx_evm_uart3                     
dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT                                      
                                                  Lokesh Vutla 
<lokeshvu...@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...@renesas.com>
 Active  arm         armv7          rmobile     kmc             kzm9g           
    kzm9g                                -                                      
                                                                                
           Nobuhiro Iwamatsu <nobuhiro.iwamatsu...@renesas.com>:Tetsuyuki 
Kobayashi <k...@kmckk.co.jp>
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 7b120de..a0b0d3f 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -22,9 +22,14 @@
 #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
-- 
1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to