mk_mmc.sh: cleanup USE_KMS

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 11 years ago
parent d57a29cf67
commit 33e3a66a53

@ -57,7 +57,7 @@ SYSTEM="video"
SERIAL="ttyO0" SERIAL="ttyO0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host." conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
# #

@ -58,7 +58,7 @@ SERIAL="ttyO0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
conf_optargs="capemgr.disable_partno=BB-BONE-EMMC-2G" conf_optargs="capemgr.disable_partno=BB-BONE-EMMC-2G"
USE_KMS=1 di_kms_mode=enable
conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power." conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power."
# #

@ -58,5 +58,5 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
di_serial_mode=enable di_serial_mode=enable

@ -59,5 +59,5 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="VGA-1" drm_device_identifier="VGA-1"

@ -59,5 +59,5 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="VGA-1" drm_device_identifier="VGA-1"

@ -60,5 +60,5 @@ SYSTEM="video"
SERIAL="ttymxc1" SERIAL="ttymxc1"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="HDMI-A-1" drm_device_identifier="HDMI-A-1"

@ -54,6 +54,6 @@ SYSTEM="video"
SERIAL="ttymxc1" SERIAL="ttymxc1"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
conf_note_bootloader="http://eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite+SPI+Flash+Recovery" conf_note_bootloader="http://eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite+SPI+Flash+Recovery"

@ -59,6 +59,6 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
#video broken... #video broken...
di_serial_mode=enable di_serial_mode=enable

@ -60,5 +60,5 @@ SYSTEM="video"
SERIAL="ttymxc1" SERIAL="ttymxc1"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="HDMI-A-1" drm_device_identifier="HDMI-A-1"

@ -57,5 +57,5 @@ SYSTEM="video"
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="DVI-D-1" drm_device_identifier="DVI-D-1"

@ -57,6 +57,6 @@ SYSTEM="video-musb"
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="DVI-D-1" drm_device_identifier="DVI-D-1"
di_serial_mode=enable di_serial_mode=enable

@ -60,6 +60,6 @@ SYSTEM="video"
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="DVI-D-1" drm_device_identifier="DVI-D-1"
di_serial_mode=enable di_serial_mode=enable

@ -60,6 +60,6 @@ SYSTEM="video"
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="DVI-D-1" drm_device_identifier="DVI-D-1"
di_serial_mode=enable di_serial_mode=enable

@ -60,6 +60,6 @@ SYSTEM="video"
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="DVI-D-1" drm_device_identifier="DVI-D-1"
di_serial_mode=enable di_serial_mode=enable

@ -61,6 +61,6 @@ SYSTEM="video"
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="HDMI-A-1" drm_device_identifier="HDMI-A-1"
di_serial_mode=enable di_serial_mode=enable

@ -60,6 +60,6 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="HDMI-A-1" drm_device_identifier="HDMI-A-1"
drm_read_edid_broken="enable" drm_read_edid_broken="enable"

@ -60,6 +60,6 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="HDMI-A-1" drm_device_identifier="HDMI-A-1"
drm_read_edid_broken="enable" drm_read_edid_broken="enable"

@ -60,6 +60,6 @@ SYSTEM="video"
SERIAL="ttymxc0" SERIAL="ttymxc0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"
USE_KMS=1 di_kms_mode=enable
drm_device_identifier="HDMI-A-1" drm_device_identifier="HDMI-A-1"
drm_read_edid_broken="enable" drm_read_edid_broken="enable"

@ -491,7 +491,7 @@ tweak_boot_scripts () {
#Set the Serial Console #Set the Serial Console
sed -i -e 's:SERIAL_CONSOLE:'$SERIAL_CONSOLE':g' ${TEMPDIR}/bootscripts/${ALL} sed -i -e 's:SERIAL_CONSOLE:'$SERIAL_CONSOLE':g' ${TEMPDIR}/bootscripts/${ALL}
if [ "${USE_KMS}" ] && [ ! "x${di_serial_mode}" = "xenable" ] ; then if [ "x${di_kms_mode}" = "xenable" ] && [ ! "x${di_serial_mode}" = "xenable" ] ; then
#optargs=VIDEO_CONSOLE #optargs=VIDEO_CONSOLE
sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${ALL} sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${ALL}
@ -510,7 +510,7 @@ tweak_boot_scripts () {
sed -i -e 's:kms_force_mode:#kms_force_mode:g' ${TEMPDIR}/bootscripts/${NET} sed -i -e 's:kms_force_mode:#kms_force_mode:g' ${TEMPDIR}/bootscripts/${NET}
#Unlike the debian-installer, normal boot will boot fine with the display enabled... #Unlike the debian-installer, normal boot will boot fine with the display enabled...
if [ "${USE_KMS}" ] ; then if [ "x${di_kms_mode}" = "xenable" ] ; then
#optargs=VIDEO_CONSOLE #optargs=VIDEO_CONSOLE
sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${FINAL} sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${FINAL}
fi fi

Loading…
Cancel
Save