aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-11-20 05:21:19 +0000
committerLuka Perkov <luka@openwrt.org>2015-11-20 05:21:19 +0000
commit8d8ef5288cdb914ded16d9f81c85b0144fda074a (patch)
tree7229f11d1a482bc31dee5979aafe3278797c4357 /target/linux/imx6
parentd85d4778fcf84640e88887a5cfd85720d048ce1c (diff)
downloadupstream-8d8ef5288cdb914ded16d9f81c85b0144fda074a.tar.gz
upstream-8d8ef5288cdb914ded16d9f81c85b0144fda074a.tar.bz2
upstream-8d8ef5288cdb914ded16d9f81c85b0144fda074a.zip
imx6: ventana: remove invalid video options from bootscript
Removed video related kernel params that are only appropriate for the Freescale downstream vendor kernel and not appriate for mainline linux. Signed-off-by: Tim Harvey <tharvey@gateworks.com> SVN-Revision: 47532
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/image/bootscript-ventana76
1 files changed, 1 insertions, 75 deletions
diff --git a/target/linux/imx6/image/bootscript-ventana b/target/linux/imx6/image/bootscript-ventana
index 8c789e57c9..8775733698 100644
--- a/target/linux/imx6/image/bootscript-ventana
+++ b/target/linux/imx6/image/bootscript-ventana
@@ -9,80 +9,6 @@ setenv bootargs console=${console},${baudrate}
setenv loadaddr 10800000
setenv fdt_addr 18000000
-# detect displays in the following priority: HDMI, LVDS
-# setenv display to override detection for a single display
-# or setenv video if you want multiple displays
-if test -n "$video" ; then
- echo "using video config from env: $video"
- setenv bootargs "${bootargs}" "${video}"
-else
- if test -n "$display" ; then
- echo "using display from env: $display"
- elif test -n "$panel" ; then
- echo "using display from env: $panel"
- setenv display "$panel"
- else
- echo "Detecting displays..."
- i2c dev 2
- if hdmidet ; then
- echo " HDMI detected"
- setenv display "HDMI"
- elif i2c probe 0x04 ; then
- echo " Freescale MXC-LVDS1 detected"
- setenv display "LVDS"
- elif i2c probe 0x14 ; then
- echo " DLC800FIGT3 detected"
- setenv display "LVDS"
- elif i2c probe 0x38 ; then
- echo " DLC700JMGT4 detected"
- setenv display "LVDS"
- fi
- fi
-
- # configure displays
- echo "Configuring kernel bootargs for display(s): $display"
- for p in ${display}; do
- if itest.s "x${p}" == "xHannstar-XGA" ; then
- setenv ptype "LVDS"
- elif itest.s "x${p}" == "xDLC700JMGT4" ; then
- setenv ptype "LVDS"
- elif itest.s "x${p}" == "xDLC800FIGT3" ; then
- setenv ptype "LVDS"
- elif itest.s "x${p}" == "xLVDS" ; then
- setenv ptype "LVDS"
- elif itest.s "x${p}" == "xHDMI" ; then
- setenv ptype "HDMI"
- test -n "$hdmi" || hdmi=1080p
- if itest.s "x${hdmi}" == "x1080p" ; then
- setenv hdmi "1920x1080M@60"
- elif itest.s "x${hdmi}" == "x720p" ; then
- setenv hdmi "1280x720M@60"
- elif itest.s "x${hdmi}" == "x480p" ; then
- setenv hdmi "720x480M@60"
- fi
- else
- echo "${p} not supported"
- fi
-
- if itest.s "x${ptype}" == "xLVDS" ; then
- echo " mxcfb${nextcon}: LVDS ($p)"
- setenv bootargs "${bootargs}" video=mxcfb${nextcon}:dev=ldb,bpp=32,if=RGB666
- setexpr nextcon $nextcon + 1
- elif itest.s "x${ptype}" == "xHDMI" ; then
- echo " mxcfb${nextcon}: HDMI ($hdmi)"
- setenv bootargs "${bootargs}" video=mxcfb${nextcon}:dev=hdmi,bpp=32,${hdmi},if=RGB24
- setexpr nextcon $nextcon + 1
- fi
-
- done
-
- # disable remaining mxcfb devices
- while test "4" -ne $nextcon ; do
- setenv bootargs "${bootargs}" video=mxcfb${nextcon}:off
- setexpr nextcon $nextcon + 1
- done
-fi
-
# detect dtype and bootdev by looking for kernel on media the bootloader
# has mounted (in order of preference: usb/mmc/sata)
#
@@ -131,7 +57,7 @@ else
setenv root "root=/dev/${bootdev}"
fi
-setenv bootargs "${bootargs}" "${root}" "${extra}"
+setenv bootargs "${bootargs}" "${root}" "${video}" "${extra}"
if ${fsload} ${loadaddr} ${bootdir}/uImage; then
if ${fsload} ${fdt_addr} ${bootdir}/${fdt_file}; then
echo Loaded DTB from ${bootdir}/${fdt_file}