mk_mmc.sh: combine these

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 11 years ago
parent bc5e1bc83d
commit 04a207932c

@ -272,23 +272,11 @@ boot_uenv_txt_template () {
echo "#Normal Boot" > ${TEMPDIR}/bootscripts/normal.cmd echo "#Normal Boot" > ${TEMPDIR}/bootscripts/normal.cmd
echo "#Debian Installer only Boot" > ${TEMPDIR}/bootscripts/netinstall.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"} drm_device_identifier=${drm_device_identifier:-"HDMI-A-1"}
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
#fdtfile=${dtb}
##Video: [ls /sys/class/drm/] ##Video: [ls /sys/class/drm/]
##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt
##Uncomment to override: ##Uncomment to override:
@ -297,6 +285,8 @@ boot_uenv_txt_template () {
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
#fdtfile=${dtb}
##Video: [ls /sys/class/drm/] ##Video: [ls /sys/class/drm/]
##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt ##Docs: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/fb/modedb.txt
##Uncomment to override: ##Uncomment to override:
@ -304,6 +294,10 @@ boot_uenv_txt_template () {
__EOF__ __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 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/normal.cmd
sed -i -e 's:#kms_force_mode:kms_force_mode:g' ${TEMPDIR}/bootscripts/netinstall.cmd sed -i -e 's:#kms_force_mode:kms_force_mode:g' ${TEMPDIR}/bootscripts/netinstall.cmd

Loading…
Cancel
Save