From 04a207932c4ea46ed93dab4f74a6ef58f08a520a Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jul 2014 14:38:24 -0500 Subject: [PATCH] mk_mmc.sh: combine these Signed-off-by: Robert Nelson --- mk_mmc.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 860391c..de0075c 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -272,23 +272,11 @@ boot_uenv_txt_template () { echo "#Normal Boot" > ${TEMPDIR}/bootscripts/normal.cmd echo "#Debian Installer only Boot" > ${TEMPDIR}/bootscripts/netinstall.cmd - cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - #fdtfile=${dtb} - - __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - #fdtfile=${dtb} - - __EOF__ - - if [ ! "${uboot_fdt_auto_detection}" ] ; then - sed -i -e 's:#fdtfile:fdtfile:g' ${TEMPDIR}/bootscripts/*.cmd - fi - drm_device_identifier=${drm_device_identifier:-"HDMI-A-1"} cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ + #fdtfile=${dtb} + ##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: @@ -297,6 +285,8 @@ boot_uenv_txt_template () { __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ + #fdtfile=${dtb} + ##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: @@ -304,6 +294,10 @@ boot_uenv_txt_template () { __EOF__ + if [ ! "${uboot_fdt_auto_detection}" ] ; then + sed -i -e 's:#fdtfile:fdtfile:g' ${TEMPDIR}/bootscripts/*.cmd + fi + if [ "x${drm_read_edid_broken}" = "xenable" ] ; then sed -i -e 's:#kms_force_mode:kms_force_mode:g' ${TEMPDIR}/bootscripts/normal.cmd sed -i -e 's:#kms_force_mode:kms_force_mode:g' ${TEMPDIR}/bootscripts/netinstall.cmd