Merge pull request #3 from brain-hackers/feature/enable-video

Video再有効化, コンソール表示, etc.

configs/pwsh1_defconfig

@@ -8,7 +8,6 @@ CONFIG_TARGET_PWSH1=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_NR_DRAM_BANKS=1
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
@@ -27,4 +26,5 @@ CONFIG_ENV_IS_IN_MMC=y
 # CONFIG_NET is not set
 CONFIG_MMC_MXS=y
 CONFIG_CONS_INDEX=0
+CONFIG_VIDEO=y
 CONFIG_OF_LIBFDT=y

include/configs/pwsh1.h

@@ -42,11 +42,14 @@
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_MXS_MODE_SYSTEM
 #define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
+#define CONFIG_HIDE_LOGO_VERSION
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(512 << 10)
+#define CONFIG_VIDEO_FONT_6X11
 #define LCD_BPP LCD_COLOR16
 #endif
 
@@ -57,6 +60,9 @@
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
+	"stdin=serial\0" \
+	"stdout=serial,vga\0" \
+	"stderr=serial,vga\0" \
 	"videomode=video=ctfb:x:800,y:480,depth:16,pclk:30857,le:0,ri:0,up:0,lo:0,hs:0,vs:0,sync:0,vmode:0\0" \
 	"bootdelay=0\0" \
 	"image=zImage\0" \

include/video_font.h

@@ -9,6 +9,8 @@
 
 #ifdef CONFIG_VIDEO_FONT_4X6
 #include <video_font_4x6.h>
+#elif defined CONFIG_VIDEO_FONT_6X11
+#include <video_font_6x11.h>
 #else
 #include <video_font_data.h>
 #endif

scripts/config_whitelist.txt

@@ -4652,6 +4652,7 @@ CONFIG_VIDEO_BMP_RLE8
 CONFIG_VIDEO_CORALP
 CONFIG_VIDEO_DA8XX
 CONFIG_VIDEO_FONT_4X6
+CONFIG_VIDEO_FONT_6X11
 CONFIG_VIDEO_LCD_I2C_BUS
 CONFIG_VIDEO_LOGO
 CONFIG_VIDEO_MB862xx