diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index ee3e045e94..fe0873e0c5 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -67,6 +67,14 @@ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +#ifndef VIDEO_ARGS +#define VIDEO_ARGS "" +#endif + +#ifndef VIDEO_ARGS_SCRIPT +#define VIDEO_ARGS_SCRIPT "" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -98,8 +106,22 @@ "fi; " \ "fi\0" \ EMMC_ENV \ + "video_args_hdmi=setenv video_args $video_args " \ + "video=mxcfb${fb}:dev=hdmi,1280x720M@60,if=RGB24\0" \ + "video_args_lvds=setenv video_args $video_args " \ + "video=mxcfb${fb}:dev=ldb,LDB-XGA,if=RGB666\0" \ + "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}; " \ + "setexpr fb $fb + 1; " \ + "done\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=${mmcroot}\0" \ + "root=${mmcroot} " \ + VIDEO_ARGS "\0" \ "loadbootscript=" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ @@ -107,6 +129,7 @@ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ + VIDEO_ARGS_SCRIPT \ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 97ef2a8851..4a55652630 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -22,6 +22,9 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ +#define VIDEO_ARGS "${video_args}" +#define VIDEO_ARGS_SCRIPT "run video_args_script; " + #include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 3