From 19508e8135bdb5808f28feb4bc797e9790b9603f Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jul 2014 14:40:47 -0500 Subject: [PATCH] mk_mmc.sh: combine these Signed-off-by: Robert Nelson --- mk_mmc.sh | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 2e89dd1..4e51cf5 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -282,6 +282,14 @@ boot_uenv_txt_template () { ##Uncomment to override: #kms_force_mode=video=${drm_device_identifier}:1024x768@60e + kernel_file=${conf_normal_kernel_file} + initrd_file=${conf_normal_initrd_file} + + console=SERIAL_CONSOLE + + mmcroot=FINAL_PART ro + mmcrootfstype=FINAL_FSTYPE rootwait fixrtc + __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ @@ -292,6 +300,13 @@ boot_uenv_txt_template () { ##Uncomment to override: #kms_force_mode=video=${drm_device_identifier}:1024x768@60e + kernel_file=${conf_net_kernel_file} + initrd_file=${conf_net_initrd_file} + + console=DICONSOLE + + mmcroot=/dev/ram0 rw + __EOF__ if [ ! "${uboot_fdt_auto_detection}" ] ; then @@ -302,17 +317,6 @@ 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__ - kernel_file=${conf_normal_kernel_file} - initrd_file=${conf_normal_initrd_file} - - console=SERIAL_CONSOLE - - mmcroot=FINAL_PART ro - mmcrootfstype=FINAL_FSTYPE rootwait fixrtc - - __EOF__ - if [ ${conf_uboot_use_bootpart} ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ loadkernel=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} \${kernel_file} @@ -333,15 +337,6 @@ boot_uenv_txt_template () { boot_fdt=run loadkernel; run loadinitrd; run loadfdt __EOF__ - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - kernel_file=${conf_net_kernel_file} - initrd_file=${conf_net_initrd_file} - - console=DICONSOLE - - mmcroot=/dev/ram0 rw - - __EOF__ if [ ${conf_uboot_use_bootpart} ] ; then cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__