From 40c6c595f4d01d365bba4c200e53af1c7adfa3f4 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 19 Jun 2012 13:14:45 -0500
Subject: [PATCH] script: rename ZRELADD to load_addr

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh                | 26 +++++++++++---------------
 scripts/debian-finish.sh |  2 +-
 scripts/ubuntu-finish.sh |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index dbe1bff..8e4d6a6 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -720,11 +720,9 @@ function setup_bootscripts {
  sed -i -e 's:SERIAL:'$SERIAL':g' "${DIR}/scripts/ubuntu-tweaks.diff"
  sed -i -e 's:SERIAL:'$SERIAL':g' "${DIR}/scripts/debian-tweaks.diff"
 
- #Setup Kernel Boot Address
- sed -i -e 's:ZRELADD:'$ZRELADD':g' "${DIR}/scripts/ubuntu-tweaks.diff"
- sed -i -e 's:ZRELADD:'$ZRELADD':g' "${DIR}/scripts/debian-tweaks.diff"
- sed -i -e 's:ZRELADD:'$ZRELADD':g' "${DIR}/scripts/ubuntu-finish.sh"
- sed -i -e 's:ZRELADD:'$ZRELADD':g' "${DIR}/scripts/debian-finish.sh"
+	#Setup Kernel Boot Address
+	sed -i -e 's:load_addr:'$load_addr':g' "${DIR}/scripts/ubuntu-finish.sh"
+	sed -i -e 's:load_addr:'$load_addr':g' "${DIR}/scripts/debian-finish.sh"
 
  if [ "$SMSC95XX_MOREMEM" ];then
   sed -i 's/8192/16384/g' "${DIR}/scripts/ubuntu-tweaks.diff"
@@ -1100,7 +1098,7 @@ function populate_boot {
 			LINUX_VER=$(ls ${TEMPDIR}/kernel/boot/${VMLINUZ} | awk -F'vmlinuz-' '{print $2}')
 			if [ ! "${USE_ZIMAGE}" ] ; then
 				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}
+				mkimage -A arm -O linux -T kernel -C none -a ${load_addr} -e ${load_addr} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/${VMLINUZ} ${TEMPDIR}/disk/${UIMAGE}
 				echo "-----------------------------"
 			else
 				echo "Copying Kernel image:"
@@ -1144,6 +1142,7 @@ cp -v "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/disk/
 			board=${BOOTLOADER}
 			kernel_addr=${kernel_addr}
 			initrd_addr=${initrd_addr}
+			load_addr=${load_addr}
 
 		__EOF__
 
@@ -1375,11 +1374,9 @@ function reset_scripts {
  sed -i -e 's:'$SERIAL':SERIAL:g' "${DIR}/scripts/ubuntu-tweaks.diff"
  sed -i -e 's:'$SERIAL':SERIAL:g' "${DIR}/scripts/debian-tweaks.diff"
 
- #Setup Kernel Boot Address
- sed -i -e 's:'$ZRELADD':ZRELADD:g' "${DIR}/scripts/ubuntu-tweaks.diff"
- sed -i -e 's:'$ZRELADD':ZRELADD:g' "${DIR}/scripts/debian-tweaks.diff"
- sed -i -e 's:'$ZRELADD':ZRELADD:g' "${DIR}/scripts/ubuntu-finish.sh"
- sed -i -e 's:'$ZRELADD':ZRELADD:g' "${DIR}/scripts/debian-finish.sh"
+	#Setup Kernel Boot Address
+	sed -i -e 's:'$load_addr':load_addr:g' "${DIR}/scripts/ubuntu-finish.sh"
+	sed -i -e 's:'$load_addr':load_addr:g' "${DIR}/scripts/debian-finish.sh"
 
  if [ "$SMSC95XX_MOREMEM" ];then
   sed -i 's/16384/8192/g' "${DIR}/scripts/ubuntu-tweaks.diff"
@@ -1424,8 +1421,7 @@ function is_omap {
 
 	kernel_addr="0x80300000"
 	initrd_addr="0x81600000"
-
-	ZRELADD="0x80008000"
+	load_addr="0x80008000"
 
 	SERIAL_CONSOLE="${SERIAL},115200n8"
 
@@ -1609,9 +1605,9 @@ function check_uboot_type {
 		SERIAL="ttymxc0"
 		is_imx
 		USE_ZIMAGE=1
-		ZRELADD="0x90008000"
 		kernel_addr="0x90800000"
 		initrd_addr="0x92100000"
+		load_addr="0x90008000"
 		BETA_KERNEL=1
 		SERIAL_MODE=1
 		;;
@@ -1623,9 +1619,9 @@ function check_uboot_type {
 		SERIAL="ttymxc0"
 		is_imx
 		USE_ZIMAGE=1
-		ZRELADD="0x70008000"
 		kernel_addr="0x70800000"
 		initrd_addr="0x72100000"
+		load_addr="0x70008000"
 		BETA_KERNEL=1
 		SERIAL_MODE=1
 		;;
diff --git a/scripts/debian-finish.sh b/scripts/debian-finish.sh
index a732dd2..69c5fa6 100644
--- a/scripts/debian-finish.sh
+++ b/scripts/debian-finish.sh
@@ -31,7 +31,7 @@ fi
 dpkg -x /boot/uboot/linux-image-*_1.0*_arm*.deb /
 update-initramfs -c -k `uname -r`
 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 ZRELADD -e ZRELADD -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
+mkimage -A arm -O linux -T kernel -C none -a load_addr -e load_addr -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
 
 cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage
 cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img
diff --git a/scripts/ubuntu-finish.sh b/scripts/ubuntu-finish.sh
index a844186..f2195c7 100644
--- a/scripts/ubuntu-finish.sh
+++ b/scripts/ubuntu-finish.sh
@@ -69,7 +69,7 @@ apt-get -y autoremove || true
 dpkg -x /boot/uboot/linux-image-*_1.0*_arm*.deb /
 update-initramfs -c -k `uname -r`
 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 ZRELADD -e ZRELADD -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
+mkimage -A arm -O linux -T kernel -C none -a load_addr -e load_addr -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
 
 cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage
 cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img