diff mbox

[U-Boot,1/2] mx51evk: do not overwrite the console

Message ID 1344187894-30940-1-git-send-email-festevam@gmail.com
State Accepted
Commit 1e080988d035ed4c472e613462a3bc9f64108a3a
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Aug. 5, 2012, 5:31 p.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

On this board, the console is always set to the serial line.
Do not allow to overwrite it when video is enabled.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 board/freescale/mx51evk/mx51evk.c |   10 +++++++++-
 include/configs/mx51evk.h         |    2 ++
 2 files changed, 11 insertions(+), 1 deletions(-)

Comments

Stefano Babic Aug. 6, 2012, 8:15 a.m. UTC | #1 
On 05/08/2012 19:31, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> On this board, the console is always set to the serial line.
> Do not allow to overwrite it when video is enabled.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Hi Fabio,

it seems you agree with my patch from yesterday - I will apply all three
patches soon !

Regards,
Stefano
Fabio Estevam Aug. 6, 2012, 1:48 p.m. UTC | #2 
On Mon, Aug 6, 2012 at 5:15 AM, Stefano Babic <sbabic@denx.de> wrote:

> Hi Fabio,
>
> it seems you agree with my patch from yesterday - I will apply all three
> patches soon !

Yes, your solution is very good.

Thanks,

Fabio Estevam
Stefano Babic Aug. 7, 2012, 9:35 a.m. UTC | #3 
On 05/08/2012 19:31, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> On this board, the console is always set to the serial line.
> Do not allow to overwrite it when video is enabled.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 514a7ac..97c8a2c 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -536,12 +536,20 @@  int board_late_init(void)
 	setup_iomux_spi();
 	power_init();
 #endif
-	setenv("stdout", "serial");
 
 	return 0;
 }
 #endif
 
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+	return 1;
+}
+
 int checkboard(void)
 {
 	puts("Board: MX51EVK\n");
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 6af5ed7..635678a 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -129,6 +129,8 @@ 
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP