conf: load_addr -> conf_zreladdr: unify mk_mmc.sh/setup_sdcard.sh

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent 293246a1c9
commit 177fcd07eb

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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=

@ -31,7 +31,7 @@ usbnet_mem="16384"
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
load_addr="0x80008000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
dtb_file=

@ -31,7 +31,7 @@ usbnet_mem="32768"
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
load_addr="0x80008000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
dtb_file=

@ -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

@ -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

@ -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"

Loading…
Cancel
Save