script: rename IMAGE_ADDR to kernel_addr

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/8/head
Robert Nelson 13 years ago
parent e5fb692b66
commit ac81d899b8

@ -434,7 +434,7 @@ function boot_uenv_txt_template {
fi fi
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
address_image=IMAGE_ADDR address_image=kernel_addr
address_initrd=INITRD_ADDR address_initrd=INITRD_ADDR
console=DICONSOLE console=DICONSOLE
@ -451,7 +451,7 @@ function boot_uenv_txt_template {
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
address_image=IMAGE_ADDR address_image=kernel_addr
address_initrd=INITRD_ADDR address_initrd=INITRD_ADDR
console=SERIAL_CONSOLE console=SERIAL_CONSOLE
@ -576,7 +576,7 @@ function tweak_boot_scripts {
NET="netinstall.cmd" NET="netinstall.cmd"
FINAL="normal.cmd" FINAL="normal.cmd"
#Set kernel boot address #Set kernel boot address
sed -i -e 's:IMAGE_ADDR:'$IMAGE_ADDR':g' ${TEMPDIR}/bootscripts/${ALL} sed -i -e 's:kernel_addr:'$kernel_addr':g' ${TEMPDIR}/bootscripts/${ALL}
#Set initrd boot address #Set initrd boot address
sed -i -e 's:INITRD_ADDR:'$INITRD_ADDR':g' ${TEMPDIR}/bootscripts/${ALL} sed -i -e 's:INITRD_ADDR:'$INITRD_ADDR':g' ${TEMPDIR}/bootscripts/${ALL}
@ -1143,6 +1143,18 @@ function populate_boot {
cp -v "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/disk/ cp -v "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/disk/
cat > ${TEMPDIR}/disk/SOC.sh <<-__EOF__
#!/bin/sh
[socpack]
format=1.0
board=${BOOTLOADER}
kernel_addr=${kernel_addr}
__EOF__
echo "Debug:"
cat ${TEMPDIR}/disk/SOC.sh
cat > ${TEMPDIR}/readme.txt <<script_readme cat > ${TEMPDIR}/readme.txt <<script_readme
These can be run from anywhere, but just in case change to "cd /boot/uboot" These can be run from anywhere, but just in case change to "cd /boot/uboot"
@ -1415,7 +1427,7 @@ function is_omap {
SPL_BOOT=1 SPL_BOOT=1
SUBARCH="omap" SUBARCH="omap"
IMAGE_ADDR="0x80300000" kernel_addr="0x80300000"
INITRD_ADDR="0x81600000" INITRD_ADDR="0x81600000"
ZRELADD="0x80008000" ZRELADD="0x80008000"
@ -1603,7 +1615,7 @@ function check_uboot_type {
is_imx is_imx
USE_ZIMAGE=1 USE_ZIMAGE=1
ZRELADD="0x90008000" ZRELADD="0x90008000"
IMAGE_ADDR="0x90800000" kernel_addr="0x90800000"
INITRD_ADDR="0x92100000" INITRD_ADDR="0x92100000"
BETA_KERNEL=1 BETA_KERNEL=1
SERIAL_MODE=1 SERIAL_MODE=1
@ -1617,7 +1629,7 @@ function check_uboot_type {
is_imx is_imx
USE_ZIMAGE=1 USE_ZIMAGE=1
ZRELADD="0x70008000" ZRELADD="0x70008000"
IMAGE_ADDR="0x70800000" kernel_addr="0x70800000"
INITRD_ADDR="0x72100000" INITRD_ADDR="0x72100000"
BETA_KERNEL=1 BETA_KERNEL=1
SERIAL_MODE=1 SERIAL_MODE=1

Loading…
Cancel
Save