summaryrefslogtreecommitdiff
path: root/recipes-images/images/tdx-image-fstype.inc
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 /recipes-images/images/tdx-image-fstype.inc
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>
Diffstat (limited to 'recipes-images/images/tdx-image-fstype.inc')
-rw-r--r--recipes-images/images/tdx-image-fstype.inc11
1 files changed, 6 insertions, 5 deletions
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() {