mk_mmc.sh: setup u-boot: trampoline

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 10 years ago
parent d3db9db84e
commit 0f241c3ab6

@ -166,10 +166,8 @@ if [ "x${conf_smart_uboot}" = "xenable" ] ; then
if [ "x${bootdrive}" = "x${rootdrive}" ] ; then if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
rm -f /boot/uboot/boot/uEnv.txt || true rm -f /boot/uboot/boot/uEnv.txt || true
else else
touch /boot/uboot/boot/trampoline.uboot
wfile="/boot/uboot/boot/uEnv.txt" wfile="/boot/uboot/boot/uEnv.txt"
cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current
cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current
fi fi
fi fi
@ -185,4 +183,13 @@ if [ ! "x${optargs}" = "x" ] ; then
fi fi
fi fi
if [ -f /boot/uboot/boot/trampoline.uboot ] ; then
cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current
cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current
if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
cp /boot/uboot/uImage /boot/uboot/boot/uImage
cp /boot/uboot/uInitrd /boot/uboot/boot/uInitrd
fi
fi
# #

@ -136,10 +136,8 @@ if [ "x${conf_smart_uboot}" = "xenable" ] ; then
if [ "x${bootdrive}" = "x${rootdrive}" ] ; then if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
rm -f /boot/uboot/boot/uEnv.txt || true rm -f /boot/uboot/boot/uEnv.txt || true
else else
touch /boot/uboot/boot/trampoline.uboot
wfile="/boot/uboot/boot/uEnv.txt" wfile="/boot/uboot/boot/uEnv.txt"
cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current
cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current
fi fi
fi fi
@ -155,4 +153,13 @@ if [ ! "x${optargs}" = "x" ] ; then
fi fi
fi fi
if [ -f /boot/uboot/boot/trampoline.uboot ] ; then
cp /boot/vmlinuz-`uname -r` /boot/uboot/boot/vmlinuz-current
cp /boot/initrd.img-`uname -r` /boot/uboot/boot/initrd.img-current
if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
cp /boot/uboot/uImage /boot/uboot/boot/uImage
cp /boot/uboot/uInitrd /boot/uboot/boot/uInitrd
fi
fi
# #

@ -980,6 +980,7 @@ populate_boot () {
cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/boot/vmlinuz-current cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/boot/vmlinuz-current
if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
touch ${TEMPDIR}/disk/boot/trampoline.uboot
if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then
cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net
else else

Loading…
Cancel
Save