From 03dbe8e585596ca55d2d87f762885d0949153635 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 8 Apr 2013 09:10:35 -0500 Subject: [PATCH] conf: dtb_addr -> conf_fdtaddr: 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 +- mk_mmc.sh | 18 +++++++++--------- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index a169f24..0664c1a 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -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 diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 429b26a..da0ff43 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -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 diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 8597546..a798c2c 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -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 diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf index 6cc9e84..6b21acb 100644 --- a/hwpack/am335x-evmsk.conf +++ b/hwpack/am335x-evmsk.conf @@ -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 diff --git a/hwpack/docs.txt b/hwpack/docs.txt index 191c3ed..97d2c9a 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -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 diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 5aab42a..d88698c 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -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 diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index b1295b2..20bdf10 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -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 diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index fe2dab8..823fcac 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -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 diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index 87a333e..6063409 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -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 diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf index b966935..7b8ccb0 100644 --- a/hwpack/omap3-beagle-xm-v3.9.conf +++ b/hwpack/omap3-beagle-xm-v3.9.conf @@ -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" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index ba1554a..1e26f3e 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -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" diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 57ee49e..8c05e37 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -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" diff --git a/mk_mmc.sh b/mk_mmc.sh index c9a5894..73f827a 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -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"