conf: kernel_addr -> conf_loadaddr: unify mk_mmc.sh/setup_sdcard.sh

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

@ -29,7 +29,7 @@ kernel_repo="TESTING"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -29,7 +29,7 @@ kernel_repo="TESTING"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -29,7 +29,7 @@ kernel_repo="TESTING"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -29,7 +29,7 @@ kernel_repo="TESTING"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -66,7 +66,7 @@ kernel_subarch="omap-psp"
kernel_repo="TESTING" kernel_repo="TESTING"
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -33,7 +33,7 @@ kernel_repo="STABLE"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x90010000" conf_loadaddr="0x90010000"
initrd_addr="0x92000000" initrd_addr="0x92000000"
load_addr="0x90008000" load_addr="0x90008000"
dtb_addr="0x91ff0000" dtb_addr="0x91ff0000"

@ -33,7 +33,7 @@ kernel_repo="STABLE"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x70010000" conf_loadaddr="0x70010000"
initrd_addr="0x72000000" initrd_addr="0x72000000"
load_addr="0x70008000" load_addr="0x70008000"
dtb_addr="0x71ff0000" dtb_addr="0x71ff0000"

@ -35,7 +35,7 @@ kernel_repo="STABLE"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x10000000" conf_loadaddr="0x10000000"
initrd_addr="0x12000000" initrd_addr="0x12000000"
load_addr="0x10008000" load_addr="0x10008000"
dtb_addr="0x11ff0000" dtb_addr="0x11ff0000"

@ -33,7 +33,7 @@ kernel_repo="STABLE"
usbnet_mem= usbnet_mem=
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x10000000" conf_loadaddr="0x10000000"
initrd_addr="0x12000000" initrd_addr="0x12000000"
load_addr="0x10008000" load_addr="0x10008000"
dtb_addr="0x11ff0000" dtb_addr="0x11ff0000"

@ -30,7 +30,7 @@ kernel_repo="EXPERIMENTAL"
usbnet_mem="16384" usbnet_mem="16384"
#Kernel: Bootloader Settings: #Kernel: Bootloader Settings:
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -29,7 +29,7 @@ kernel_repo="STABLE"
usbnet_mem="16384" usbnet_mem="16384"
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -29,7 +29,7 @@ kernel_repo="STABLE"
usbnet_mem="32768" usbnet_mem="32768"
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

@ -407,26 +407,26 @@ function boot_uenv_txt_template {
if [ "${uboot_USE_MMC_DEFINES}" ] ; then if [ "${uboot_USE_MMC_DEFINES}" ] ; then
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${kernel_addr} \${kernel_file} 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} ${initrd_addr} \${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} ${dtb_addr} /dtbs/\${dtb_file}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${kernel_addr} \${kernel_file} 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} ${initrd_addr} \${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} ${dtb_addr} /dtbs/\${dtb_file}
__EOF__ __EOF__
else else
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${kernel_addr} \${kernel_file} 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 ${initrd_addr} \${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 ${dtb_addr} /dtbs/\${dtb_file}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${kernel_addr} \${kernel_file} 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 ${initrd_addr} \${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 ${dtb_addr} /dtbs/\${dtb_file}
@ -534,22 +534,22 @@ function boot_uenv_txt_template {
if [ ! "${need_dtbs}" ] ; then if [ ! "${need_dtbs}" ] ; then
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size}
__EOF__ __EOF__
else else
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr} ${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
__EOF__ __EOF__
fi fi
@ -1047,7 +1047,7 @@ function initrd_device_settings {
boot_fstype=${boot_fstype} boot_fstype=${boot_fstype}
serial_tty=${SERIAL} serial_tty=${SERIAL}
kernel_addr=${kernel_addr} conf_loadaddr=${conf_loadaddr}
initrd_addr=${initrd_addr} initrd_addr=${initrd_addr}
load_addr=${load_addr} load_addr=${load_addr}
dtb_addr=${dtb_addr} dtb_addr=${dtb_addr}
@ -1338,7 +1338,7 @@ function populate_boot {
boot_fstype=${boot_fstype} boot_fstype=${boot_fstype}
serial_tty=${SERIAL} serial_tty=${SERIAL}
kernel_addr=${kernel_addr} conf_loadaddr=${conf_loadaddr}
initrd_addr=${initrd_addr} initrd_addr=${initrd_addr}
load_addr=${load_addr} load_addr=${load_addr}
dtb_addr=${dtb_addr} dtb_addr=${dtb_addr}
@ -1450,7 +1450,7 @@ function is_omap {
kernel_subarch="omap" kernel_subarch="omap"
kernel_addr="0x80300000" conf_loadaddr="0x80300000"
initrd_addr="0x81600000" initrd_addr="0x81600000"
load_addr="0x80008000" load_addr="0x80008000"
dtb_addr="0x815f0000" dtb_addr="0x815f0000"

Loading…
Cancel
Save