mx6sabre_common: Dynamically change the video output

Use the 'hdmidetect' command in U-boot to load the appropriate
video arguments. If HDMI is connected during boot then make HDMI
as the primary framebuffer, otherwise let LVDS be the primary framebuffer.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 8283189315607408f3688e03a309fe91cf705d32..edbf4d024ce00168a31c033a80eedb8ac88b2023 100644 (file)
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index 0e49e69c8cd5e48f5d1f5cb9850a257ae91cd355..317bc403f621874df19133f12bc2f888f8436c3c 100644 (file)
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_VIDEO=y
+CONFIG_CMD_HDMIDETECT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 87a24f39adeb0d539be41ee99bcbbf9a646641e0..0299d2b587d1db7d6e1f0b8ec2037bb1b1771fbb 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -63,6 +63,13 @@
 #define VIDEO_ARGS        "${video_args}"
 #define VIDEO_ARGS_SCRIPT "run video_args_script; "
 
+#define CONFIG_PREBOOT \
+       "if hdmidet; then " \
+               "setenv video_interfaces hdmi lvds; " \
+       "else " \
+               "setenv video_interfaces lvds hdmi; " \
+       "fi;"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -101,7 +108,6 @@
        "video_args_lcd=setenv video_args $video_args " \
                "video=mxcfb${fb}:dev=lcd,CLAA-WVGA,if=RGB666\0" \
        "fb=0\0" \
-       "video_interfaces=hdmi lvds lcd\0" \
        "video_args_script=" \
                "for v in ${video_interfaces}; do " \
                        "run video_args_${v}; " \