cleanup: conf_fdtfile -> dtb

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 10 years ago
parent 68144ad5bd
commit 7e70bba8ec

@ -47,7 +47,7 @@ conf_loadaddr="0x12000000"
conf_fdtaddr="0x11000000" conf_fdtaddr="0x11000000"
#initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB) #initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
conf_initrdaddr="0x12A00000" conf_initrdaddr="0x12A00000"
conf_fdtfile="imx6q-sabrelite.dtb" dtb="imx6q-sabrelite.dtb"
SERIAL="ttymxc1" SERIAL="ttymxc1"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"

@ -45,7 +45,7 @@ conf_zreladdr="0x81000000"
conf_loadaddr="0x80408000" conf_loadaddr="0x80408000"
conf_fdtaddr="0x82000000" conf_fdtaddr="0x82000000"
conf_initrdaddr="0x82100000" conf_initrdaddr="0x82100000"
conf_fdtfile="tegra124-jetson-tk1.dtb" dtb="tegra124-jetson-tk1.dtb"
SERIAL="ttyS0" SERIAL="ttyS0"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"

@ -274,12 +274,12 @@ boot_uenv_txt_template () {
if [ ! "${uboot_fdt_auto_detection}" ] ; then if [ ! "${uboot_fdt_auto_detection}" ] ; then
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
fdtfile=${conf_fdtfile} fdtfile=${dtb}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
fdtfile=${conf_fdtfile} fdtfile=${dtb}
__EOF__ __EOF__
fi fi
@ -1067,7 +1067,7 @@ populate_boot () {
fi fi
if [ "${conf_uboot_bootscript}" ] ; then if [ "${conf_uboot_bootscript}" ] ; then
case "${conf_fdtfile}" in case "${dtb}" in
imx6q-sabrelite.dtb) imx6q-sabrelite.dtb)
cat > ${TEMPDIR}/bootscripts/loader.cmd <<-__EOF__ cat > ${TEMPDIR}/bootscripts/loader.cmd <<-__EOF__
echo "${conf_uboot_bootscript} -> uEnv.txt wrapper..." echo "${conf_uboot_bootscript} -> uEnv.txt wrapper..."
@ -1098,7 +1098,7 @@ populate_boot () {
mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/${conf_uboot_bootscript} mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/${conf_uboot_bootscript}
cp -v ${TEMPDIR}/disk/${conf_uboot_bootscript} ${TEMPDIR}/disk/backup/${conf_uboot_bootscript} cp -v ${TEMPDIR}/disk/${conf_uboot_bootscript} ${TEMPDIR}/disk/backup/${conf_uboot_bootscript}
else else
echo "Error: conf_fdtfile not defined with conf_uboot_bootscript" echo "Error: dtb not defined with conf_uboot_bootscript"
exit 1 exit 1
fi fi
fi fi

Loading…
Cancel
Save