From 177fcd07eb4fb98f3cea004aa204990c251a808e Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 8 Apr 2013 09:05:07 -0500 Subject: [PATCH] conf: load_addr -> conf_zreladdr: unify mk_mmc.sh/setup_sdcard.sh Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 2 +- hwpack/am335x-bone-video.conf | 2 +- hwpack/am335x-boneblack.conf | 2 +- hwpack/am335x-evmsk.conf | 2 +- hwpack/docs.txt | 2 +- hwpack/imx51-babbage.conf | 2 +- hwpack/imx53-qsb.conf | 2 +- hwpack/imx6q-sabrelite.conf | 2 +- hwpack/imx6q-sabresd.conf | 2 +- hwpack/omap3-beagle-xm-v3.9.conf | 2 +- hwpack/omap3-beagle-xm.conf | 2 +- hwpack/omap4-panda.conf | 2 +- lib/debian-finish.sh | 2 +- lib/ubuntu-finish.sh | 2 +- mk_mmc.sh | 8 ++++---- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 4df7d14..a169f24 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -31,7 +31,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" need_dtbs=1 diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 7d5989e..429b26a 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -31,7 +31,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" need_dtbs=1 diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 68b14c6..8597546 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -31,7 +31,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-boneblack.dtb" need_dtbs=1 diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf index 28adb01..6cc9e84 100644 --- a/hwpack/am335x-evmsk.conf +++ b/hwpack/am335x-evmsk.conf @@ -31,7 +31,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-evmsk.dtb" need_dtbs=1 diff --git a/hwpack/docs.txt b/hwpack/docs.txt index b2f5aa5..191c3ed 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -68,7 +68,7 @@ kernel_repo="TESTING" #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" need_dtbs=1 diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 81d0475..5aab42a 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -35,7 +35,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x90010000" conf_initrdaddr="0x92000000" -load_addr="0x90008000" +conf_zreladdr="0x90008000" dtb_addr="0x91ff0000" dtb_file="imx51-babbage.dtb" need_dtbs=1 diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 8a7cd74..b1295b2 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -35,7 +35,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x70010000" conf_initrdaddr="0x72000000" -load_addr="0x70008000" +conf_zreladdr="0x70008000" dtb_addr="0x71ff0000" dtb_file="imx53-qsb.dtb" need_dtbs=1 diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 0e95936..fe2dab8 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -37,7 +37,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x10000000" conf_initrdaddr="0x12000000" -load_addr="0x10008000" +conf_zreladdr="0x10008000" dtb_addr="0x11ff0000" dtb_file="imx6q-sabrelite.dtb" need_dtbs=1 diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index 211d7b3..87a333e 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -35,7 +35,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x10000000" conf_initrdaddr="0x12000000" -load_addr="0x10008000" +conf_zreladdr="0x10008000" dtb_addr="0x11ff0000" dtb_file="imx6q-sabresd.dtb" need_dtbs=1 diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf index 134e52b..b966935 100644 --- a/hwpack/omap3-beagle-xm-v3.9.conf +++ b/hwpack/omap3-beagle-xm-v3.9.conf @@ -32,7 +32,7 @@ usbnet_mem="16384" #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file= diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index be111ed..ba1554a 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -31,7 +31,7 @@ usbnet_mem="16384" conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file= diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 62bf27f..57ee49e 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -31,7 +31,7 @@ usbnet_mem="32768" conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" -load_addr="0x80008000" +conf_zreladdr="0x80008000" dtb_addr="0x815f0000" dtb_file= diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index 695540c..f284ed0 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -127,5 +127,5 @@ rm -f /boot/uboot/*modules.tar.gz || true 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 ${load_addr} -e ${load_addr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage + 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 fi diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh index 70c673f..5701e41 100644 --- a/lib/ubuntu-finish.sh +++ b/lib/ubuntu-finish.sh @@ -147,5 +147,5 @@ rm -f /boot/uboot/*modules.tar.gz || true 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 ${load_addr} -e ${load_addr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage + 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 fi diff --git a/mk_mmc.sh b/mk_mmc.sh index 4550f72..c9a5894 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1049,7 +1049,7 @@ function initrd_device_settings { serial_tty=${SERIAL} conf_loadaddr=${conf_loadaddr} conf_initrdaddr=${conf_initrdaddr} - load_addr=${load_addr} + conf_zreladdr=${conf_zreladdr} dtb_addr=${dtb_addr} dtb_file=${dtb_file} @@ -1259,7 +1259,7 @@ function populate_boot { LINUX_VER=$(ls ${TEMPDIR}/kernel/boot/vmlinuz-* | awk -F'vmlinuz-' '{print $2}') if [ "${USE_UIMAGE}" ] ; then echo "Using mkimage to create 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.net + 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 echo "-----------------------------" else echo "Copying Kernel image:" @@ -1340,7 +1340,7 @@ function populate_boot { serial_tty=${SERIAL} conf_loadaddr=${conf_loadaddr} conf_initrdaddr=${conf_initrdaddr} - load_addr=${load_addr} + conf_zreladdr=${conf_zreladdr} dtb_addr=${dtb_addr} dtb_file=${dtb_file} @@ -1452,7 +1452,7 @@ function is_omap { conf_loadaddr="0x80300000" conf_initrdaddr="0x81600000" - load_addr="0x80008000" + conf_zreladdr="0x80008000" dtb_addr="0x815f0000" boot_script="uEnv.txt"