From 293246a1c964643ff0ecebcac9548a252a53bf11 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 8 Apr 2013 08:52:51 -0500 Subject: [PATCH] conf: initrd_addr -> conf_initrdaddr: 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 | 22 +++++++++++----------- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 0007389..4df7d14 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -30,7 +30,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index b1201b2..7d5989e 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -30,7 +30,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index ec15f0a..68b14c6 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -30,7 +30,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-boneblack.dtb" diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf index 346345d..28adb01 100644 --- a/hwpack/am335x-evmsk.conf +++ b/hwpack/am335x-evmsk.conf @@ -30,7 +30,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-evmsk.dtb" diff --git a/hwpack/docs.txt b/hwpack/docs.txt index f4430c7..b2f5aa5 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -67,7 +67,7 @@ kernel_repo="TESTING" #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file="am335x-bone.dtb" diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 8f9496c..81d0475 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -34,7 +34,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x90010000" -initrd_addr="0x92000000" +conf_initrdaddr="0x92000000" load_addr="0x90008000" dtb_addr="0x91ff0000" dtb_file="imx51-babbage.dtb" diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 8cc4d81..8a7cd74 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -34,7 +34,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x70010000" -initrd_addr="0x72000000" +conf_initrdaddr="0x72000000" load_addr="0x70008000" dtb_addr="0x71ff0000" dtb_file="imx53-qsb.dtb" diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 2586fb1..0e95936 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -36,7 +36,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x10000000" -initrd_addr="0x12000000" +conf_initrdaddr="0x12000000" load_addr="0x10008000" dtb_addr="0x11ff0000" dtb_file="imx6q-sabrelite.dtb" diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index eaf591b..211d7b3 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -34,7 +34,7 @@ usbnet_mem= #Kernel: Bootloader Settings: conf_loadaddr="0x10000000" -initrd_addr="0x12000000" +conf_initrdaddr="0x12000000" load_addr="0x10008000" dtb_addr="0x11ff0000" dtb_file="imx6q-sabresd.dtb" diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf index 82e3171..134e52b 100644 --- a/hwpack/omap3-beagle-xm-v3.9.conf +++ b/hwpack/omap3-beagle-xm-v3.9.conf @@ -31,7 +31,7 @@ usbnet_mem="16384" #Kernel: Bootloader Settings: conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file= diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index f2492e9..be111ed 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -30,7 +30,7 @@ kernel_repo="STABLE" usbnet_mem="16384" conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file= diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index a7292c6..62bf27f 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -30,7 +30,7 @@ kernel_repo="STABLE" usbnet_mem="32768" conf_loadaddr="0x80300000" -initrd_addr="0x81600000" +conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" dtb_file= diff --git a/mk_mmc.sh b/mk_mmc.sh index 4706812..4550f72 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -408,26 +408,26 @@ function boot_uenv_txt_template { if [ "${uboot_USE_MMC_DEFINES}" ] ; then 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} ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize} + 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} __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} ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize} + 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} __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 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize} + 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} __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 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize} + 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} __EOF__ @@ -534,22 +534,22 @@ function boot_uenv_txt_template { if [ ! "${need_dtbs}" ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${dtb_addr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} ${dtb_addr} + ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${dtb_addr} __EOF__ fi @@ -1048,7 +1048,7 @@ function initrd_device_settings { serial_tty=${SERIAL} conf_loadaddr=${conf_loadaddr} - initrd_addr=${initrd_addr} + conf_initrdaddr=${conf_initrdaddr} load_addr=${load_addr} dtb_addr=${dtb_addr} dtb_file=${dtb_file} @@ -1339,7 +1339,7 @@ function populate_boot { serial_tty=${SERIAL} conf_loadaddr=${conf_loadaddr} - initrd_addr=${initrd_addr} + conf_initrdaddr=${conf_initrdaddr} load_addr=${load_addr} dtb_addr=${dtb_addr} dtb_file=${dtb_file} @@ -1451,7 +1451,7 @@ function is_omap { kernel_subarch="omap" conf_loadaddr="0x80300000" - initrd_addr="0x81600000" + conf_initrdaddr="0x81600000" load_addr="0x80008000" dtb_addr="0x815f0000" boot_script="uEnv.txt"