Skip to contentSkip to conversation

mx6qsabreauto: Use ttymxc3 as console

PATCH New Otavio Salvador 2 participants 3 messages Sep 26, 2012 – Sep 30, 2012

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 include/configs/mx6qsabre_common.h |    2 +-
 include/configs/mx6qsabreauto.h    |    4 +++-
 include/configs/mx6qsabresd.h      |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)
include/configs/mx6qsabre_common.h +1 -1
index c541691..1d52b52 100644
@@ -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" \
include/configs/mx6qsabreauto.h +3 -1
index 825d3b8..a878dec 100644
@@ -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 */
include/configs/mx6qsabresd.h +3 -1
index ca91aa5..f2ce79e 100644
@@ -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 */
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 mx6qsabreauto: Use ttymxc3 as console

Quoted 50 lines · Otavio Salvador

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

Signed-off-by Otavio Salvador <[email protected]>
---
 include/configs/mx6qsabre_common.h |    2 +-
 include/configs/mx6qsabreauto.h    |    4 +++-
 include/configs/mx6qsabresd.h      |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)
include/configs/mx6qsabre_common.h +1 -1
index c541691..1d52b52 100644
@@ -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" \
include/configs/mx6qsabreauto.h +3 -1
index 825d3b8..a878dec 100644
@@ -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 */
include/configs/mx6qsabresd.h +0 -0
index ca91aa5..f2ce79e 100644
@@ -16,10 +16,12 @@
 
 #ifndef __MX6QSABRESD_CONFIG_H
 #define __MX6QSABRESD_CONFIG_H

include/configs/mx6qsabresd.h line 27

Quoted 10 lines
include/configs/mx6qsabresd.h +3 -1
-#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 */

Nothing to say, console must be in sync with CONFIG_MXC_UART_BASE.

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#2 lore raw

PATCH 1/1 mx6qsabreauto: Use ttymxc3 as console

In reply to Otavio Salvador
Quoted 5 lines · Otavio Salvador

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

Signed-off-by Otavio Salvador <[email protected]>

---

Applied to u-boot-imx, next branch, thanks.

Bet regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================