Apalis/Colibri iMX6: use Toradex boot logo

This uses the tools/logos/toradex.bmp instead of the default
tux logo and places it centered on screen.
While at it group the display releated variables together.

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 5513c0ee0753e5c72b3cb47e54391690e109ea65..c08b1966435ef3f69bcd7b3e1657c935f6a47c73 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -160,13 +160,16 @@
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK               260000000
 #define CONFIG_CMD_HDMIDETECT
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_CMD_BMP
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -296,6 +299,7 @@
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
                "load ${interface} ${drive}:1 ${kernel_addr_r} " \
                "flash_blk.img\0" \
+       "splashpos=m,m\0" \
        "vidargs=mxc_hdmi.only_cea=1 " \
                "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
                "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
@@ -351,8 +355,6 @@
 #define CONFIG_CMD_CACHE
 #endif
 
-#define CONFIG_CMD_BMP
-
 #define CONFIG_CMD_TIME
 
 #define CONFIG_CMD_BOOTZ

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index e05ad320bb53047793ea9b48df7ec2d67df7825c..2e8ea271f55b242d24230d0ada8eaab39ca02a65 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -137,13 +137,16 @@
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK               260000000
 #define CONFIG_CMD_HDMIDETECT
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_CMD_BMP
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -258,6 +261,7 @@
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
                "load ${interface} ${drive}:1 ${kernel_addr_r} " \
                "flash_blk.img\0" \
+       "splashpos=m,m\0" \
        "vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \
                "video=mxcfb1:off fbmem=8M\0 "
 
@@ -311,8 +315,6 @@
 #define CONFIG_CMD_CACHE
 #endif
 
-#define CONFIG_CMD_BMP
-
 #define CONFIG_CMD_TIME
 
 #define CONFIG_CMD_BOOTZ