mx6qsabreauto: Use ttymxc3 as console

The mx6qsabreauto console is different than mx6qsabresd so the console
configuration is now set in the board file.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Stefano Babic <sbabic@denx.de>

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index c541691..1d52b52 100644 (file)
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -83,7 +83,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "uimage=uImage\0" \
-       "console=ttymxc0\0" \
+       "console=" CONFIG_CONSOLE_DEV "\0" \
        "fdt_high=0xffffffff\0"   \
        "initrd_high=0xffffffff\0" \
        "mmcdev=0\0" \

diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 825d3b8..a878dec 100644 (file)
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -11,10 +11,12 @@
 
 #ifndef __MX6QSABREAUTO_CONFIG_H
 #define __MX6QSABREAUTO_CONFIG_H
-#include "mx6qsabre_common.h"
 
 #define CONFIG_MACH_TYPE       3529
 #define CONFIG_MXC_UART_BASE   UART4_BASE
+#define CONFIG_CONSOLE_DEV             "ttymxc3"
 #define PHYS_SDRAM_SIZE                (2u * 1024 * 1024 * 1024)
 
+#include "mx6qsabre_common.h"
+
 #endif                         /* __MX6QSABREAUTO_CONFIG_H */

diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index ca91aa5..f2ce79e 100644 (file)
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -16,10 +16,12 @@
 
 #ifndef __MX6QSABRESD_CONFIG_H
 #define __MX6QSABRESD_CONFIG_H
-#include "mx6qsabre_common.h"
 
 #define CONFIG_MACH_TYPE       3980
 #define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CONFIG_CONSOLE_DEV             "ttymxc0"
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
+#include "mx6qsabre_common.h"
+
 #endif                         /* __MX6QSABRESD_CONFIG_H */