regression: its zreladdr in SOC.sh

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
12 years ago · b30745d81c
parent ed13f6909a
commit b30745d81c
2 changed files with 2 additions and 2 deletions
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@ -148,7 +148,7 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then

 	if [ "x${boot_image}" == "xbootm" ] ; 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
-		mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
+		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
 else
 	echo "ERROR: [/boot/uboot/linux-image-*.deb] missing" >> /var/log/netinstall.log
--- a/lib/ubuntu-finish.sh
+++ b/lib/ubuntu-finish.sh
@ -169,7 +169,7 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then

 	if [ "x${boot_image}" == "xbootm" ] ; 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
-		mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
+		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
 else
 	echo "ERROR: [/boot/uboot/linux-image-*.deb] missing" >> /var/log/netinstall.log