summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2018-01-17 19:24:44 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-03-22 09:18:57 +0100
commit4aa93076a9afc193b7ede41e3e088c0355856d04 (patch)
tree86ce24f24fcbcdb70319865291ac7e096a336723
parent574e010729134e1f502c4f8d2fc0209e9ecd22bd (diff)
tdx-image-fstype: move to a spl/u-boot recovery download chain
Move from a recovery u-boot.imx to download first the SPL which immediately goes into SDP download mode again and then download u-boot.img. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-images/images/files/library/imx6/flash_blk.scr2
-rw-r--r--recipes-images/images/files/library/imx6/flash_eth.scr2
-rwxr-xr-xrecipes-images/images/files/library/imx6/update.sh13
-rw-r--r--recipes-images/images/tdx-image-fstype.inc11
4 files changed, 14 insertions, 14 deletions
diff --git a/recipes-images/images/files/library/imx6/flash_blk.scr b/recipes-images/images/files/library/imx6/flash_blk.scr
index 5c75100..fb73fb6 100644
--- a/recipes-images/images/files/library/imx6/flash_blk.scr
+++ b/recipes-images/images/files/library/imx6/flash_blk.scr
@@ -17,7 +17,7 @@ setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2
setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}'
setenv update_spl 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}'
-setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
+setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}'
diff --git a/recipes-images/images/files/library/imx6/flash_eth.scr b/recipes-images/images/files/library/imx6/flash_eth.scr
index 16f91e8..f14fd23 100644
--- a/recipes-images/images/files/library/imx6/flash_eth.scr
+++ b/recipes-images/images/files/library/imx6/flash_eth.scr
@@ -15,7 +15,7 @@ setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2
setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}'
setenv update_spl 'tftpboot ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}'
-setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.imx-spl && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
+setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/uImage && fatwrite mmc 0:1 ${fdt_addr_r} uImage ${filesize}'
diff --git a/recipes-images/images/files/library/imx6/update.sh b/recipes-images/images/files/library/imx6/update.sh
index 27dda07..ddfcc2c 100755
--- a/recipes-images/images/files/library/imx6/update.sh
+++ b/recipes-images/images/files/library/imx6/update.sh
@@ -61,8 +61,7 @@ OUT_DIR=""
ROOTFSPATH=rootfs
SPLIT=1
UBOOT_RECOVERY=0
-U_BOOT_BINARY=u-boot.imx-spl
-U_BOOT_RECOVER_BINARY=u-boot.imx-recover
+U_BOOT_BINARY=u-boot.img
SPL_BINARY=SPL
while getopts "dfhm:o:" Option ; do
@@ -135,7 +134,7 @@ case "$MODTYPE" in
KERNEL_DEVICETREE="imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb \
imx6q-apalis-ixora-v1.1.dtb"
- LOCPATH="imx_flash"
+ LOCPATH="`pwd`/imx_flash"
OUT_DIR="$OUT_DIR/apalis_imx6"
;;
"colibri-imx6")
@@ -143,7 +142,7 @@ case "$MODTYPE" in
EMMC_SIZE=$(expr 1024 \* 3500 \* 2)
IMAGEFILE=root.ext4
KERNEL_DEVICETREE="imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb imx6dl-colibri-aster.dtb"
- LOCPATH="imx_flash"
+ LOCPATH="`pwd`/imx_flash"
OUT_DIR="$OUT_DIR/colibri_imx6"
;;
*) echo "script internal error, unknown module type set"
@@ -155,9 +154,9 @@ BINARIES=${MODTYPE}_bin
#is only U-Boot to be copied to RAM?
if [ "$UBOOT_RECOVERY" -ge 1 ] ; then
- cd ${LOCPATH}
- #the IT timings work for all modules, so use it during recovery
- sudo ./imx_usb ../${BINARIES}/${U_BOOT_RECOVER_BINARY}
+ cd ${BINARIES}
+ # do a load chain of first loading SPL then u-boot.img
+ sudo ${LOCPATH}/imx_usb
exit
fi
diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc
index 8286a88..f727845 100644
--- a/recipes-images/images/tdx-image-fstype.inc
+++ b/recipes-images/images/tdx-image-fstype.inc
@@ -8,7 +8,8 @@ IMAGE_DIR = "${IMAGE_NAME}_${TDX_VER_ITEM}"
IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs"
UBOOT_EXT = "bin"
-UBOOT_EXT_mx6 = "imx"
+UBOOT_EXT_mx6 = "img"
+UBOOT_EXT_colibri-imx6ull = "imx"
UBOOT_EXT_mx7 = "imx"
UBOOT_EXT_vf = "imx"
UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_EXT}"
@@ -50,7 +51,7 @@ imagedeploytools_append_mx6() {
cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
- cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_work.conf ${IMAGE_ROOT}/
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx6_usb_*.conf ${IMAGE_ROOT}/
}
imagedeploytools_append_mx6ull() {
@@ -68,7 +69,7 @@ imagedeploytools_append_mx6ull() {
# FIXME
cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
- cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx7_usb_work.conf ${IMAGE_ROOT}/
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx7_usb_*.conf ${IMAGE_ROOT}/
}
imagedeploytools_append_mx7() {
@@ -84,7 +85,7 @@ imagedeploytools_append_mx7() {
cp ${STAGING_BINDIR_NATIVE}/imx_usb ${IMAGE_ROOT}/
${BUILD_STRIP} ${IMAGE_ROOT}/imx_usb
cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/imx_usb.conf ${IMAGE_ROOT}/
- cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx7_usb_work.conf ${IMAGE_ROOT}/
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/mx7_usb_*.conf ${IMAGE_ROOT}/
cp ${IMAGE_ROOTFS}/../${MACHINE}_bin/${UBOOT_BINARY} ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot.imx
}
@@ -140,7 +141,7 @@ imagedeploytools_append_vf() {
# add imx-loader and its configuration files
cp ${STAGING_BINDIR_NATIVE}/imx_uart ${IMAGE_ROOT}/
${BUILD_STRIP} ${IMAGE_ROOT}/imx_uart*
- cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/vybrid_usb_work.conf ${IMAGE_ROOT}/
+ cp ${STAGING_ETCDIR_NATIVE}/imx-loader.d/vybrid_usb_*.conf ${IMAGE_ROOT}/
}
imagedeploy_kernel() {