From ffd7a61e65670e46ce27a83a5f599eb14f0f301f Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 26 Nov 2011 12:59:52 -0600 Subject: [PATCH] Revert "sync with omap-image-builder" This reverts commit 0968a7629e82e42ade2831054873a61b8f640f80. and should fix issue4 Signed-off-by: Robert Nelson --- mk_mmc.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 646687a..ae20cf7 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -926,16 +926,10 @@ if [ ! "${DO_UBOOT_DD}" ] ; then fi fi - if ls ${TEMPDIR}/kernel/boot/vmlinuz-* >/dev/null 2>&1;then - LINUX_VER=$(ls ${DIR}/vmlinuz-*${VER}* | awk -F'vmlinuz-' '{print $2}') - echo "Using mkimage to create uImage" - mkimage -A arm -O linux -T kernel -C none -a ${ZRELADD} -e ${ZRELADD} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net - fi - - if ls ${DIR}/initrd.img-* >/dev/null 2>&1;then - echo "Using mkimagee to create uInitrd" - 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 +echo "uInitrd Installer" +mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net +echo "uImage" +mkimage -A arm -O linux -T kernel -C none -a ${ZRELADD} -e ${ZRELADD} -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net if [ "${USE_UENV}" ] ; then