All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console
@ 2012-09-26 21:37 Otavio Salvador
  2012-09-27  8:08 ` Stefano Babic
  2012-09-30 12:32 ` Stefano Babic
  0 siblings, 2 replies; 3+ messages in thread
From: Otavio Salvador @ 2012-09-26 21:37 UTC (permalink / raw)
  To: u-boot

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>
---
 include/configs/mx6qsabre_common.h |    2 +-
 include/configs/mx6qsabreauto.h    |    4 +++-
 include/configs/mx6qsabresd.h      |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index c541691..1d52b52 100644
--- 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
--- 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
--- 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 */
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console
  2012-09-26 21:37 [U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console Otavio Salvador
@ 2012-09-27  8:08 ` Stefano Babic
  2012-09-30 12:32 ` Stefano Babic
  1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2012-09-27  8:08 UTC (permalink / raw)
  To: u-boot

On 26/09/2012 23:37, Otavio Salvador wrote:
> 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>
> ---
>  include/configs/mx6qsabre_common.h |    2 +-
>  include/configs/mx6qsabreauto.h    |    4 +++-
>  include/configs/mx6qsabresd.h      |    4 +++-
>  3 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
> index c541691..1d52b52 100644
> --- 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
> --- 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
> --- 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 */
> 

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


Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic


-- 
=====================================================================
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
=====================================================================

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console
  2012-09-26 21:37 [U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console Otavio Salvador
  2012-09-27  8:08 ` Stefano Babic
@ 2012-09-30 12:32 ` Stefano Babic
  1 sibling, 0 replies; 3+ messages in thread
From: Stefano Babic @ 2012-09-30 12:32 UTC (permalink / raw)
  To: u-boot

On 26/09/2012 23:37, Otavio Salvador wrote:
> 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>
> ---

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

Bet regards,
Stefano Babic


-- 
=====================================================================
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
=====================================================================

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-30 12:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-26 21:37 [U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console Otavio Salvador
2012-09-27  8:08 ` Stefano Babic
2012-09-30 12:32 ` Stefano Babic

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.