summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-09-10 13:46:48 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-09-10 13:46:48 +0200
commitfdd06f86255a6d21870d70ec090a6b432013e09e (patch)
tree7a3afd7393100e1ad6d9a3d95bd279990b932c97 /include/configs
parent4f4a91a60470ffb0798f80ba95be371eafa02366 (diff)
colibri-imx6.h: adapt vidargs for i.MX6S/DL
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/colibri-imx6.h23
1 files changed, 5 insertions, 18 deletions
diff --git a/include/configs/colibri-imx6.h b/include/configs/colibri-imx6.h
index 2011e36ebce..9c6498d703a 100644
--- a/include/configs/colibri-imx6.h
+++ b/include/configs/colibri-imx6.h
@@ -216,25 +216,12 @@
"flash_mmc.img && source ${kernel_addr_r}\0" \
"vidargs=mxc_hdmi.only_cea=1 " \
"video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
- "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
- "fbmem=32M\0 " \
- "vidargs_edt=video=mxcfb0:dev=lcd,EDT-WVGA,if=RGB24 " \
- "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
- "fbmem=32M\0 " \
- "vidargs_hdmi_cea_only=mxc_hdmi.only_cea=1 " \
- "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
- "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
- "fbmem=32M\0 " \
- "vidargs_hdmi_lvds=mxc_hdmi.only_cea=1 " \
+ "video=mxcfb1:off fbmem=24M\0 " \
+ "vidargs_edt=video=mxcfb0:dev=lcd,EDT-WVGA,if=RGB666 " \
+ "video=mxcfb1:off fbmem=8M\0 " \
+ "vidargs=mxc_hdmi.only_cea=1 " \
"video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
- "video=mxcfb1:dev=ldb,LDB-LG_LP156WF1,if=RGB666 ldb=spl1 " \
- "video=mxcfb2:off video=mxcfb3:off " \
- "fbmem=32M\0 " \
- "vidargs_lvds=video=mxcfb0:dev=ldb,800x600M@60,if=RGB666 ldb=sin0 " \
- "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
- "fbmem=32M\0 " \
- "vidargs_vdac=video=mxcfb0:dev=vdac,1280x720M@60,if=RGB565 " \
- "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off fbmem=32M"
+ "video=mxcfb1:off fbmem=24M\0 " \
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP