mx51evk: do not overwrite the console

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>

mx51evk: do not overwrite the console
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>
Fabio Estevam · Albert ARIBAUD
1 parent 3e0773708d
Showing 2 changed files with 11 additions and 1 deletions Side-by-side Diff
board/freescale/mx51evk/mx51evk.c
include/configs/mx51evk.h
@@ -536,11 +536,19 @@
 	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)
 {
@@ -128,6 +128,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
...	...	@@ -536,11 +536,19 @@
536	536	setup_iomux_spi();
537	537	power_init();
538	538	#endif
539		- setenv("stdout", "serial");
540	539
541	540	return 0;
542	541	}
543	542	#endif
	543	+
	544	+/*
	545	+ * Do not overwrite the console
	546	+ * Use always serial for U-Boot console
	547	+ */
	548	+int overwrite_console(void)
	549	+{
	550	+ return 1;
	551	+}
544	552
545	553	int checkboard(void)
546	554	{
...	...	@@ -128,6 +128,8 @@
128	128	#define CONFIG_VIDEO_IPUV3
129	129	#define CONFIG_CFB_CONSOLE
130	130	#define CONFIG_VGA_AS_SINGLE_DEVICE
	131	+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
	132	+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
131	133	#define CONFIG_VIDEO_BMP_RLE8
132	134	#define CONFIG_SPLASH_SCREEN
133	135	#define CONFIG_BMP_16BPP