From eae0cc26aedd2ea6677ef5361a29fa47b0f55832 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 28 Jul 2014 09:55:50 -0500 Subject: [PATCH] mk_mmc.sh: refactor mmcargs setup Signed-off-by: Robert Nelson --- mk_mmc.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index f7893ce..cb057ed 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1146,20 +1146,22 @@ populate_boot () { echo "uname_r=current" > ${wfile} + mmcargs="mmcargs=run message; setenv bootargs console" + if [ "x${di_serial_mode}" = "xenable" ] ; then echo "message=echo; echo Installer for [${DISTARCH}] is using the Serial Interface; echo;" >> ${wfile} - echo "mmcargs=run message; setenv bootargs console=${SERIAL_CONSOLE} root=/dev/ram0 rw" >> ${wfile} + mmcargs="${mmcargs}=${SERIAL_CONSOLE} root=/dev/ram0 rw" else echo "message=echo; echo Installer for [${DISTARCH}] is using the Video Interface; echo Use [--serial-mode] to force Installing over the Serial Interface; echo;" >> ${wfile} + mmcargs="${mmcargs}=tty0 root=/dev/ram0 rw" + fi - if [ "x${drm_read_edid_broken}" = "xenable" ] ; then - echo "mmcargs=run message; setenv bootargs console=tty0 root=/dev/ram0 rw video=${drm_device_identifier}:1024x768@60e" >> ${wfile} - else - echo "mmcargs=run message; setenv bootargs console=tty0 root=/dev/ram0 rw" >> ${wfile} - fi - + if [ "x${drm_read_edid_broken}" = "xenable" ] ; then + mmcargs="${mmcargs} video=${drm_device_identifier}:1024x768@60e" fi + echo "${mmcargs}" >> ${wfile} + echo "Net Install Boot Script:" cat ${wfile} echo "-----------------------------"