From 3cfda691787f12560cc0daac7cc130b51abb9f68 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jul 2014 12:54:28 -0500 Subject: [PATCH] mk_mmc.sh: these are the same Signed-off-by: Robert Nelson --- mk_mmc.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 05dcc16..b793057 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -411,34 +411,25 @@ boot_uenv_txt_template () { optargs=VIDEO_CONSOLE mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} rootfstype=\${mmcrootfstype} __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - optargs=${conf_optargs} - mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} - __EOF__ ;; serial) cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} rootfstype=\${mmcrootfstype} __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - optargs=${conf_optargs} - mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} - __EOF__ ;; *) cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} rootfstype=\${mmcrootfstype} __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - optargs=${conf_optargs} - mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} - __EOF__ ;; esac + cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ + optargs=${conf_optargs} + mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} + __EOF__ + + cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ ${conf_entrypt}=run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}