conf: dtb_file -> conf_fdtfile: unify mk_mmc.sh/setup_sdcard.sh

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

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

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

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

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

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

@ -37,7 +37,7 @@ conf_loadaddr="0x90010000"
conf_initrdaddr="0x92000000" conf_initrdaddr="0x92000000"
conf_zreladdr="0x90008000" conf_zreladdr="0x90008000"
conf_fdtaddr="0x91ff0000" conf_fdtaddr="0x91ff0000"
dtb_file="imx51-babbage.dtb" conf_fdtfile="imx51-babbage.dtb"
need_dtbs=1 need_dtbs=1
SERIAL="ttymxc0" SERIAL="ttymxc0"

@ -37,7 +37,7 @@ conf_loadaddr="0x70010000"
conf_initrdaddr="0x72000000" conf_initrdaddr="0x72000000"
conf_zreladdr="0x70008000" conf_zreladdr="0x70008000"
conf_fdtaddr="0x71ff0000" conf_fdtaddr="0x71ff0000"
dtb_file="imx53-qsb.dtb" conf_fdtfile="imx53-qsb.dtb"
need_dtbs=1 need_dtbs=1
SERIAL="ttymxc0" SERIAL="ttymxc0"

@ -39,7 +39,7 @@ conf_loadaddr="0x10000000"
conf_initrdaddr="0x12000000" conf_initrdaddr="0x12000000"
conf_zreladdr="0x10008000" conf_zreladdr="0x10008000"
conf_fdtaddr="0x11ff0000" conf_fdtaddr="0x11ff0000"
dtb_file="imx6q-sabrelite.dtb" conf_fdtfile="imx6q-sabrelite.dtb"
need_dtbs=1 need_dtbs=1
SERIAL="ttymxc1" SERIAL="ttymxc1"

@ -37,7 +37,7 @@ conf_loadaddr="0x10000000"
conf_initrdaddr="0x12000000" conf_initrdaddr="0x12000000"
conf_zreladdr="0x10008000" conf_zreladdr="0x10008000"
conf_fdtaddr="0x11ff0000" conf_fdtaddr="0x11ff0000"
dtb_file="imx6q-sabresd.dtb" conf_fdtfile="imx6q-sabresd.dtb"
need_dtbs=1 need_dtbs=1
SERIAL="ttymxc0" SERIAL="ttymxc0"

@ -34,7 +34,7 @@ conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000" conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000" conf_zreladdr="0x80008000"
conf_fdtaddr="0x815f0000" conf_fdtaddr="0x815f0000"
dtb_file= conf_fdtfile=
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"

@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000" conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000" conf_zreladdr="0x80008000"
conf_fdtaddr="0x815f0000" conf_fdtaddr="0x815f0000"
dtb_file= conf_fdtfile=
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"

@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
conf_initrdaddr="0x81600000" conf_initrdaddr="0x81600000"
conf_zreladdr="0x80008000" conf_zreladdr="0x80008000"
conf_fdtaddr="0x815f0000" conf_fdtaddr="0x815f0000"
dtb_file= conf_fdtfile=
SERIAL="ttyO2" SERIAL="ttyO2"
SERIAL_CONSOLE="${SERIAL},115200n8" SERIAL_CONSOLE="${SERIAL},115200n8"

@ -360,14 +360,14 @@ function boot_uenv_txt_template {
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
initrd_high=0xffffffff initrd_high=0xffffffff
fdt_high=0xffffffff fdt_high=0xffffffff
dtb_file=${dtb_file} conf_fdtfile=${conf_fdtfile}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
initrd_high=0xffffffff initrd_high=0xffffffff
fdt_high=0xffffffff fdt_high=0xffffffff
dtb_file=${dtb_file} conf_fdtfile=${conf_fdtfile}
__EOF__ __EOF__
fi fi
@ -409,26 +409,26 @@ function boot_uenv_txt_template {
cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} 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_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${dtb_file} xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file} 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_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${dtb_file} xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
__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 ${conf_loadaddr} \${kernel_file} 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_initrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${dtb_file} xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
__EOF__ __EOF__
cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file} 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_initrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${dtb_file} xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
__EOF__ __EOF__
fi fi
@ -1051,7 +1051,7 @@ function initrd_device_settings {
conf_initrdaddr=${conf_initrdaddr} conf_initrdaddr=${conf_initrdaddr}
conf_zreladdr=${conf_zreladdr} conf_zreladdr=${conf_zreladdr}
conf_fdtaddr=${conf_fdtaddr} conf_fdtaddr=${conf_fdtaddr}
dtb_file=${dtb_file} conf_fdtfile=${conf_fdtfile}
usbnet_mem=${usbnet_mem} usbnet_mem=${usbnet_mem}
@ -1342,7 +1342,7 @@ function populate_boot {
conf_initrdaddr=${conf_initrdaddr} conf_initrdaddr=${conf_initrdaddr}
conf_zreladdr=${conf_zreladdr} conf_zreladdr=${conf_zreladdr}
conf_fdtaddr=${conf_fdtaddr} conf_fdtaddr=${conf_fdtaddr}
dtb_file=${dtb_file} conf_fdtfile=${conf_fdtfile}
usbnet_mem=${usbnet_mem} usbnet_mem=${usbnet_mem}
@ -1490,7 +1490,7 @@ function check_uboot_type {
unset IN_VALID_UBOOT unset IN_VALID_UBOOT
unset USE_UIMAGE unset USE_UIMAGE
unset USE_KMS unset USE_KMS
unset dtb_file unset conf_fdtfile
unset need_dtbs unset need_dtbs
kernel_repo="STABLE" kernel_repo="STABLE"
@ -1514,7 +1514,7 @@ function check_uboot_type {
SYSTEM="beagle_bx" SYSTEM="beagle_bx"
board="BEAGLEBOARD_BX" board="BEAGLEBOARD_BX"
is_omap is_omap
#dtb_file="omap3-beagle.dtb" #conf_fdtfile="omap3-beagle.dtb"
usbnet_mem="8192" usbnet_mem="8192"
echo "-----------------------------" echo "-----------------------------"
echo "Warning: Support for the Original BeagleBoard Ax/Bx is broken.. (board locks up during hardware detect)" echo "Warning: Support for the Original BeagleBoard Ax/Bx is broken.. (board locks up during hardware detect)"
@ -1527,7 +1527,7 @@ function check_uboot_type {
SYSTEM="beagle_cx" SYSTEM="beagle_cx"
board="BEAGLEBOARD_CX" board="BEAGLEBOARD_CX"
is_omap is_omap
#dtb_file="omap3-beagle.dtb" #conf_fdtfile="omap3-beagle.dtb"
usbnet_mem="8192" usbnet_mem="8192"
echo "-----------------------------" echo "-----------------------------"
echo "Warning: Support for the BeagleBoard C1/C2 is broken.. (board locks up during hardware detect)" echo "Warning: Support for the BeagleBoard C1/C2 is broken.. (board locks up during hardware detect)"
@ -1588,7 +1588,7 @@ function check_uboot_type {
KMS_VIDEOB="video=HDMI-A-1" KMS_VIDEOB="video=HDMI-A-1"
usbnet_mem="32768" usbnet_mem="32768"
dtb_file="omap4-panda.dtb" conf_fdtfile="omap4-panda.dtb"
EXPERIMENTAL_KERNEL=1 EXPERIMENTAL_KERNEL=1
need_dtbs=1 need_dtbs=1
;; ;;
@ -1598,7 +1598,7 @@ function check_uboot_type {
SYSTEM="panda_es" SYSTEM="panda_es"
board="PANDABOARD_ES" board="PANDABOARD_ES"
is_omap is_omap
#dtb_file="omap4-panda.dtb" #conf_fdtfile="omap4-panda.dtb"
VIDEO_OMAP_RAM="16MB" VIDEO_OMAP_RAM="16MB"
KMS_VIDEOB="video=HDMI-A-1" KMS_VIDEOB="video=HDMI-A-1"
usbnet_mem="32768" usbnet_mem="32768"
@ -1613,7 +1613,7 @@ function check_uboot_type {
KMS_VIDEOB="video=HDMI-A-1" KMS_VIDEOB="video=HDMI-A-1"
usbnet_mem="32768" usbnet_mem="32768"
dtb_file="omap4-pandaES.dtb" conf_fdtfile="omap4-pandaES.dtb"
need_dtbs=1 need_dtbs=1
;; ;;
panda_es_kms) panda_es_kms)
@ -1622,7 +1622,7 @@ function check_uboot_type {
SYSTEM="panda_es" SYSTEM="panda_es"
board="PANDABOARD_ES" board="PANDABOARD_ES"
is_omap is_omap
#dtb_file="omap4-panda.dtb" #conf_fdtfile="omap4-panda.dtb"
USE_KMS=1 USE_KMS=1
unset HAS_OMAPFB_DSS2 unset HAS_OMAPFB_DSS2

Loading…
Cancel
Save