conf: dtb_addr -> conf_fdtaddr: unify mk_mmc.sh/setup_sdcard.sh

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

@ -32,7 +32,7 @@ usbnet_mem=
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file="am335x-bone.dtb"
need_dtbs=1
need_am335x_firmware=1

@ -32,7 +32,7 @@ usbnet_mem=
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file="am335x-bone.dtb"
need_dtbs=1
need_am335x_firmware=1

@ -32,7 +32,7 @@ usbnet_mem=
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file="am335x-boneblack.dtb"
need_dtbs=1
need_am335x_firmware=1

@ -32,7 +32,7 @@ usbnet_mem=
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file="am335x-evmsk.dtb"
need_dtbs=1
need_am335x_firmware=1

@ -69,7 +69,7 @@ kernel_repo="TESTING"
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file="am335x-bone.dtb"
need_dtbs=1
need_am335x_firmware=1

@ -36,7 +36,7 @@ usbnet_mem=
conf_loadaddr="0x90010000"
conf_initrdaddr="0x92000000"
conf_zreladdr="0x90008000"
dtb_addr="0x91ff0000"
conf_fdtaddr="0x91ff0000"
dtb_file="imx51-babbage.dtb"
need_dtbs=1

@ -36,7 +36,7 @@ usbnet_mem=
conf_loadaddr="0x70010000"
conf_initrdaddr="0x72000000"
conf_zreladdr="0x70008000"
dtb_addr="0x71ff0000"
conf_fdtaddr="0x71ff0000"
dtb_file="imx53-qsb.dtb"
need_dtbs=1

@ -38,7 +38,7 @@ usbnet_mem=
conf_loadaddr="0x10000000"
conf_initrdaddr="0x12000000"
conf_zreladdr="0x10008000"
dtb_addr="0x11ff0000"
conf_fdtaddr="0x11ff0000"
dtb_file="imx6q-sabrelite.dtb"
need_dtbs=1

@ -36,7 +36,7 @@ usbnet_mem=
conf_loadaddr="0x10000000"
conf_initrdaddr="0x12000000"
conf_zreladdr="0x10008000"
dtb_addr="0x11ff0000"
conf_fdtaddr="0x11ff0000"
dtb_file="imx6q-sabresd.dtb"
need_dtbs=1

@ -33,7 +33,7 @@ usbnet_mem="16384"
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file=
SERIAL="ttyO2"

@ -32,7 +32,7 @@ usbnet_mem="16384"
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file=
SERIAL="ttyO2"

@ -32,7 +32,7 @@ usbnet_mem="32768"
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
dtb_file=
SERIAL="ttyO2"

@ -409,26 +409,26 @@ function boot_uenv_txt_template {
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
xyz_load_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${dtb_addr} /dtbs/\${dtb_file}
xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${dtb_file}
__EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
xyz_load_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${dtb_addr} /dtbs/\${dtb_file}
xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${dtb_file}
__EOF__
else
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
xyz_load_initrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${dtb_file}
__EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
xyz_load_initrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${dtb_file}
__EOF__
fi
@ -544,12 +544,12 @@ function boot_uenv_txt_template {
__EOF__
else
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${dtb_addr}
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
__EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${dtb_addr}
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
__EOF__
fi
@ -1050,7 +1050,7 @@ function initrd_device_settings {
conf_loadaddr=${conf_loadaddr}
conf_initrdaddr=${conf_initrdaddr}
conf_zreladdr=${conf_zreladdr}
dtb_addr=${dtb_addr}
conf_fdtaddr=${conf_fdtaddr}
dtb_file=${dtb_file}
usbnet_mem=${usbnet_mem}
@ -1341,7 +1341,7 @@ function populate_boot {
conf_loadaddr=${conf_loadaddr}
conf_initrdaddr=${conf_initrdaddr}
conf_zreladdr=${conf_zreladdr}
dtb_addr=${dtb_addr}
conf_fdtaddr=${conf_fdtaddr}
dtb_file=${dtb_file}
usbnet_mem=${usbnet_mem}
@ -1453,7 +1453,7 @@ function is_omap {
conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000"
dtb_addr="0x815f0000"
conf_fdtaddr="0x815f0000"
boot_script="uEnv.txt"
boot_fstype="fat"

Loading…
Cancel
Save