conf: initrd_addr -> conf_initrdaddr: unify mk_mmc.sh/setup_sdcard.sh

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent f50ce9cdad
commit 293246a1c9

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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=

@ -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=

@ -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=

@ -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"

Loading…
Cancel
Save