From 80f2a4bdb8813b07b252d41027d3a66e5f999e6b Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jul 2014 14:35:36 -0500 Subject: [PATCH] mk_mmc.sh: cleanup: drm_device_identifier Signed-off-by: Robert Nelson --- hwpack/tegra124-jetson-tk1.conf | 2 +- mk_mmc.sh | 42 ++++++++++----------------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/hwpack/tegra124-jetson-tk1.conf b/hwpack/tegra124-jetson-tk1.conf index 702e52a..b45ad7a 100644 --- a/hwpack/tegra124-jetson-tk1.conf +++ b/hwpack/tegra124-jetson-tk1.conf @@ -50,5 +50,5 @@ SERIAL_CONSOLE="${SERIAL},115200n8" di_serial_mode=enable -conf_note="Required: https://github.com/NVIDIA/tegra-uboot-flasher-scripts." +conf_note="Required: https://github.com/NVIDIA/tegra-uboot-flasher-scripts" # diff --git a/mk_mmc.sh b/mk_mmc.sh index 6d55aa6..c0b833d 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -284,39 +284,23 @@ boot_uenv_txt_template () { __EOF__ fi - if [ "${drm_device_identifier}" ] ; then - cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - ##Video: [ls /sys/class/drm/] - ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt - ##Uncomment to override: - #kms_force_mode=video=${drm_device_identifier}:1024x768@60e - - __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - ##Video: [ls /sys/class/drm/] - ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt - ##Uncomment to override: - #kms_force_mode=video=${drm_device_identifier}:1024x768@60e + drm_device_identifier=${drm_device_identifier:-"HDMI-A-1"} - __EOF__ - else - cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - ##Video: [ls /sys/class/drm/] - ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt - ##Uncomment to override: - #kms_force_mode=video=HDMI-A-1:1024x768@60e + cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ + ##Video: [ls /sys/class/drm/] + ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt + ##Uncomment to override: + #kms_force_mode=video=${drm_device_identifier}:1024x768@60e - __EOF__ + __EOF__ - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - ##Video: [ls /sys/class/drm/] - ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt - ##Uncomment to override: - #kms_force_mode=video=HDMI-A-1:1024x768@60e + cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ + ##Video: [ls /sys/class/drm/] + ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt + ##Uncomment to override: + #kms_force_mode=video=${drm_device_identifier}:1024x768@60e - __EOF__ - fi + __EOF__ if [ "x${drm_read_edid_broken}" = "xenable" ] ; then sed -i -e 's:#kms_force_mode:kms_force_mode:g' ${TEMPDIR}/bootscripts/normal.cmd