From a90c00e3fa10025813f2a2a841e85dcd48a20e53 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jul 2014 14:43:53 -0500 Subject: [PATCH] mk_mmc.sh: optimize these Signed-off-by: Robert Nelson --- mk_mmc.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 2255646..1183076 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -296,6 +296,7 @@ boot_uenv_txt_template () { loadinitrd=${conf_fileload} mmc \${bootpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} loadfdt=${conf_fileload} mmc \${bootpart} ${conf_fdtaddr} /dtbs/\${fdtfile} + boot_fdt=run loadkernel; run loadinitrd; run loadfdt __EOF__ @@ -320,6 +321,7 @@ boot_uenv_txt_template () { loadinitrd=${conf_fileload} mmc \${bootpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize} loadfdt=${conf_fileload} mmc \${bootpart} ${conf_fdtaddr} /dtbs/\${fdtfile} + boot_fdt=run loadkernel; run loadinitrd; run loadfdt __EOF__ @@ -331,22 +333,10 @@ boot_uenv_txt_template () { sed -i -e 's:#kms_force_mode:kms_force_mode:g' ${TEMPDIR}/bootscripts/*.cmd fi - cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - boot_fdt=run loadkernel; run loadinitrd; run loadfdt - __EOF__ - - if [ "${uboot_fdt_variable_name}" ] ; then - sed -i -e 's:fdtfile:'$uboot_fdt_variable_name':g' ${TEMPDIR}/bootscripts/normal.cmd - sed -i -e 's:fdtfile:'$uboot_fdt_variable_name':g' ${TEMPDIR}/bootscripts/netinstall.cmd + sed -i -e 's:fdtfile:'$uboot_fdt_variable_name':g' ${TEMPDIR}/bootscripts/*.cmd fi - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - - boot_fdt=run loadkernel; run loadinitrd; run loadfdt - - __EOF__ - if [ "x${di_serial_mode}" = "xenable" ] ; then cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__