From 66947a9d971821eff42dc9edcc7a28657d71c5c1 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 29 Jul 2014 09:52:03 -0500 Subject: [PATCH] mk_mmc.sh: major cleanup for non conf_smart_uboot devices Signed-off-by: Robert Nelson --- lib/debian-finish.sh | 55 +++----------------------------------------- lib/ubuntu-finish.sh | 55 +++----------------------------------------- mk_mmc.sh | 51 ++++------------------------------------ 3 files changed, 11 insertions(+), 150 deletions(-) diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index 3e17b6c..4a3d193 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -38,34 +38,6 @@ else echo "ERROR: [/boot/uboot/mounts] was missing..." >> /var/log/netinstall.log fi -#Cleanup: NetInstall Files -rm -f /boot/uboot/uInitrd.net || true -rm -f /boot/uboot/uImage.net || true -rm -f /boot/uboot/zImage.net || true -rm -f /boot/uboot/initrd.net || true - -#Cleanup: Initial Bootloader -rm -f /boot/uboot/boot.scr || true -rm -f /boot/uboot/uEnv.txt || true - -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ -f "/boot/uboot/backup/boot.scr" ] ; then - mv /boot/uboot/backup/boot.scr /boot/uboot/boot.scr - else - echo "WARN: [/boot/uboot/backup/boot.scr] was missing..." >> /var/log/netinstall.log - fi -fi - -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ -f "/boot/uboot/backup/normal.txt" ] ; then - sed -i -e 's:FINAL_PART:'$FINAL_PART':g' /boot/uboot/backup/normal.txt - sed -i -e 's:FINAL_FSTYPE:'$FINAL_FSTYPE':g' /boot/uboot/backup/normal.txt - mv /boot/uboot/backup/normal.txt /boot/uboot/uEnv.txt - else - echo "WARN: [/boot/uboot/backup/normal.txt] was missing..." >> /var/log/netinstall.log - fi -fi - if [ "x${serial_tty}" != "x" ] ; then cp /etc/inittab /boot/uboot/backup/inittab serial_num=$(echo -n "${serial_tty}"| tail -c -1) @@ -134,30 +106,9 @@ __EOF__ chmod u+x /etc/init.d/generic-boot-script.sh insserv generic-boot-script.sh || true -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ -f /boot/vmlinuz-`uname -r` ] ; then - cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage - else - echo "ERROR: [/boot/vmlinuz-`uname -r`] missing" >> /var/log/netinstall.log - fi - - if [ -f /boot/initrd.img-`uname -r` ] ; then - cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img - else - echo "ERROR: [/boot/initrd.img-`uname -r`] missing" >> /var/log/netinstall.log - fi -fi - - #Cleanup: - mv /boot/uboot/bootdrive /boot/uboot/backup/ || true - mv /boot/uboot/mounts /boot/uboot/backup/ || true - -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd - if [ "${zreladdr}" ] ; then - mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage - fi -fi +#Cleanup: +mv /boot/uboot/bootdrive /boot/uboot/backup/ || true +mv /boot/uboot/mounts /boot/uboot/backup/ || true wfile="/boot/uEnv.txt" diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh index 5a1fb1d..f0c113b 100644 --- a/lib/ubuntu-finish.sh +++ b/lib/ubuntu-finish.sh @@ -38,34 +38,6 @@ else echo "ERROR: [/boot/uboot/mounts] was missing..." >> /var/log/netinstall.log fi -#Cleanup: NetInstall Files -rm -f /boot/uboot/uInitrd.net || true -rm -f /boot/uboot/uImage.net || true -rm -f /boot/uboot/zImage.net || true -rm -f /boot/uboot/initrd.net || true - -#Cleanup: Initial Bootloader -rm -f /boot/uboot/boot.scr || true -rm -f /boot/uboot/uEnv.txt || true - -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ -f "/boot/uboot/backup/boot.scr" ] ; then - mv /boot/uboot/backup/boot.scr /boot/uboot/boot.scr - else - echo "WARN: [/boot/uboot/backup/boot.scr] was missing..." >> /var/log/netinstall.log - fi -fi - -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ -f "/boot/uboot/backup/normal.txt" ] ; then - sed -i -e 's:FINAL_PART:'$FINAL_PART':g' /boot/uboot/backup/normal.txt - sed -i -e 's:FINAL_FSTYPE:'$FINAL_FSTYPE':g' /boot/uboot/backup/normal.txt - mv /boot/uboot/backup/normal.txt /boot/uboot/uEnv.txt - else - echo "WARN: [/boot/uboot/backup/normal.txt] was missing..." >> /var/log/netinstall.log - fi -fi - if [ "x${serial_tty}" != "x" ] ; then cat > /etc/init/${serial_tty}.conf <<-__EOF__ start on stopped rc RUNLEVEL=[2345] @@ -104,30 +76,9 @@ end script __EOF__ -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ -f /boot/vmlinuz-`uname -r` ] ; then - cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage - else - echo "ERROR: [/boot/vmlinuz-`uname -r`] missing" >> /var/log/netinstall.log - fi - - if [ -f /boot/initrd.img-`uname -r` ] ; then - cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img - else - echo "ERROR: [/boot/initrd.img-`uname -r`] missing" >> /var/log/netinstall.log - fi -fi - - #Cleanup: - mv /boot/uboot/bootdrive /boot/uboot/backup/ || true - mv /boot/uboot/mounts /boot/uboot/backup/ || true - -if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd - if [ "${zreladdr}" ] ; then - mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage - fi -fi +#Cleanup: +mv /boot/uboot/bootdrive /boot/uboot/backup/ || true +mv /boot/uboot/mounts /boot/uboot/backup/ || true wfile="/boot/uEnv.txt" diff --git a/mk_mmc.sh b/mk_mmc.sh index 492d496..efc40ee 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -289,20 +289,11 @@ 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 - loadkernel=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} \${kernel_file} - 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 - loadximage=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} ${kernel} loadxfdt=${conf_fileload} mmc \${bootpart} ${conf_fdtaddr} /boot/dtbs/current/\${fdtfile} loadxrd=${conf_fileload} mmc \${bootpart} ${conf_initrdaddr} ${initrd}; setenv initrd_size \${filesize} @@ -312,9 +303,7 @@ boot_uenv_txt_template () { optargs=VIDEO_CONSOLE mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} rootfstype=\${mmcrootfstype} - uenvcmd=run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} - - #uenvcmd=run loadall; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} + uenvcmd=run loadall; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} __EOF__ @@ -326,19 +315,10 @@ 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 - loadkernel=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} \${kernel_file} - 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 - loadximage=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} ${kernel} loadxfdt=${conf_fileload} mmc \${bootpart} ${conf_fdtaddr} /boot/dtbs/current/\${fdtfile} loadxrd=${conf_fileload} mmc \${bootpart} ${conf_initrdaddr} ${initrd}; setenv initrd_size \${filesize} @@ -349,9 +329,7 @@ boot_uenv_txt_template () { optargs=${conf_optargs} mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} - uenvcmd=run xyz_message; run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} - - #uenvcmd=run xyz_message; run loadall; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} + uenvcmd=run xyz_message; run loadall; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} __EOF__ @@ -990,10 +968,7 @@ populate_boot () { cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/boot/vmlinuz-current if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - touch ${TEMPDIR}/disk/boot/trampoline.uboot - if [ "x${uboot_CONFIG_CMD_BOOTZ}" = "xenable" ] ; then - cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net - else + if [ ! "x${uboot_CONFIG_CMD_BOOTZ}" = "xenable" ] ; then mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net fi fi @@ -1007,9 +982,7 @@ populate_boot () { cp -v ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/boot/initrd.img-current if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then - if [ "x${uboot_CONFIG_SUPPORT_RAW_INITRD}" = "xenable" ] ; then - cp -v ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/initrd.net - else + if [ ! "x${uboot_CONFIG_SUPPORT_RAW_INITRD}" = "xenable" ] ; then mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net fi fi @@ -1017,13 +990,7 @@ populate_boot () { fi echo "Copying Device Tree Files:" - if [ "x${conf_smart_uboot}" = "xenable" ] ; then - cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/ - else - mkdir -p ${TEMPDIR}/disk/dtbs/ || true - cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/dtbs/ - cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/ - fi + cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/ if [ "${conf_uboot_bootscript}" ] ; then case "${dtb}" in @@ -1253,23 +1220,15 @@ process_dtb_conf () { if [ "x${uboot_CONFIG_CMD_BOOTZ}" = "xenable" ] ; then conf_bootcmd="bootz" - conf_normal_kernel_file=zImage - conf_net_kernel_file=zImage.net kernel=/boot/vmlinuz-current else conf_bootcmd="bootm" - conf_normal_kernel_file=uImage - conf_net_kernel_file=uImage.net kernel=/boot/uImage fi if [ "x${uboot_CONFIG_SUPPORT_RAW_INITRD}" = "xenable" ] ; then - conf_normal_initrd_file=initrd.img - conf_net_initrd_file=initrd.net initrd=/boot/initrd.img-current else - conf_normal_initrd_file=uInitrd - conf_net_initrd_file=uInitrd.net initrd=/boot/uInitrd fi