* [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console
@ 2012-08-05 17:31 Fabio Estevam
2012-08-05 17:31 ` [U-Boot] [PATCH 2/2] vision2: " Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-08-05 17:31 UTC (permalink / raw)
To: u-boot
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(-)
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
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] vision2: do not overwrite the console
2012-08-05 17:31 [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console Fabio Estevam
@ 2012-08-05 17:31 ` Fabio Estevam
2012-08-07 9:35 ` Stefano Babic
2012-08-06 8:15 ` [U-Boot] [PATCH 1/2] mx51evk: " Stefano Babic
2012-08-07 9:35 ` Stefano Babic
2 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2012-08-05 17:31 UTC (permalink / raw)
To: u-boot
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/ttcontrol/vision2/vision2.c | 11 +++++++++--
include/configs/vision2.h | 2 ++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c
index d68bef7..d287544 100644
--- a/board/ttcontrol/vision2/vision2.c
+++ b/board/ttcontrol/vision2/vision2.c
@@ -674,11 +674,18 @@ int board_late_init(void)
udelay(2000);
#endif
- setenv("stdout", "serial");
-
return 0;
}
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+ return 1;
+}
+
int checkboard(void)
{
puts("Board: TTControl Vision II CPU V\n");
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 0ed53d2..34fc1cb 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -215,6 +215,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_CMD_BMP
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console
2012-08-05 17:31 [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console Fabio Estevam
2012-08-05 17:31 ` [U-Boot] [PATCH 2/2] vision2: " Fabio Estevam
@ 2012-08-06 8:15 ` Stefano Babic
2012-08-06 13:48 ` Fabio Estevam
2012-08-07 9:35 ` Stefano Babic
2 siblings, 1 reply; 6+ messages in thread
From: Stefano Babic @ 2012-08-06 8:15 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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] 6+ messages in thread
* [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console
2012-08-06 8:15 ` [U-Boot] [PATCH 1/2] mx51evk: " Stefano Babic
@ 2012-08-06 13:48 ` Fabio Estevam
0 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2012-08-06 13:48 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] vision2: do not overwrite the console
2012-08-05 17:31 ` [U-Boot] [PATCH 2/2] vision2: " Fabio Estevam
@ 2012-08-07 9:35 ` Stefano Babic
0 siblings, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2012-08-07 9:35 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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] 6+ messages in thread
* [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console
2012-08-05 17:31 [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console Fabio Estevam
2012-08-05 17:31 ` [U-Boot] [PATCH 2/2] vision2: " Fabio Estevam
2012-08-06 8:15 ` [U-Boot] [PATCH 1/2] mx51evk: " Stefano Babic
@ 2012-08-07 9:35 ` Stefano Babic
2 siblings, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2012-08-07 9:35 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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] 6+ messages in thread
end of thread, other threads:[~2012-08-07 9:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-05 17:31 [U-Boot] [PATCH 1/2] mx51evk: do not overwrite the console Fabio Estevam
2012-08-05 17:31 ` [U-Boot] [PATCH 2/2] vision2: " Fabio Estevam
2012-08-07 9:35 ` Stefano Babic
2012-08-06 8:15 ` [U-Boot] [PATCH 1/2] mx51evk: " Stefano Babic
2012-08-06 13:48 ` Fabio Estevam
2012-08-07 9:35 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox