summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-06-20 15:23:24 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-06-30 17:44:40 +0200
commit543eda26682d795fb0a402d2eb430f16e2ed6e04 (patch)
treeae03ca3b30f1a5024e304d52aabf43573d55e16d
parentf9049cc8b23dfe77785c482eb9e9d0289fd3c06d (diff)
tdx-image-fstype.inc: rename U_BOOT_BINARY to UBOOT_BINARY
As somebody previously decided to rename U_BOOT_BINARY to UBOOT_BINARY unbreak e.g. i.MX 6 Tezi builds by continuing that rename through the various layers: http://git.toradex.com/cgit/meta-toradex-bsp-common.git/commit/?h=morty&id=02f7fdfe5eaca64e0c710cce4d701a609d499e8b Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
-rw-r--r--recipes-images/images/tdx-image-fstype.inc28
1 files changed, 14 insertions, 14 deletions
diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc
index db4e1fb..a52c42d 100644
--- a/recipes-images/images/tdx-image-fstype.inc
+++ b/recipes-images/images/tdx-image-fstype.inc
@@ -6,18 +6,18 @@ BURNFLASH := "${THISDIR}/files/${MACHINE}"
IMAGE_DIR = "${IMAGE_NAME}_${PV}"
IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs"
-U_BOOT_EXT = "bin"
-U_BOOT_EXT_mx6 = "imx"
-U_BOOT_EXT_mx7 = "imx"
-U_BOOT_EXT_vf = "imx"
-U_BOOT_SYMLINK = "u-boot-${MACHINE}.${U_BOOT_EXT}"
-U_BOOT_SYMLINK_tegra = "u-boot-dtb-tegra-${MACHINE}.${U_BOOT_EXT}"
-U_BOOT_SYMLINK_tegra124 = "u-boot-dtb-tegra-${MACHINE}.${U_BOOT_EXT}"
-U_BOOT_SYMLINK_tegra124m = "u-boot-dtb-tegra-${MACHINE}.${U_BOOT_EXT}"
-U_BOOT_BINARY = "u-boot.${U_BOOT_EXT}"
-U_BOOT_BINARY_tegra = "u-boot-dtb-tegra.${U_BOOT_EXT}"
-U_BOOT_BINARY_tegra124 = "u-boot-dtb-tegra.${U_BOOT_EXT}"
-U_BOOT_BINARY_tegra124m = "u-boot-dtb-tegra.${U_BOOT_EXT}"
+UBOOT_EXT = "bin"
+UBOOT_EXT_mx6 = "imx"
+UBOOT_EXT_mx7 = "imx"
+UBOOT_EXT_vf = "imx"
+UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_EXT}"
+UBOOT_SYMLINK_tegra = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}"
+UBOOT_SYMLINK_tegra124 = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}"
+UBOOT_SYMLINK_tegra124m = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_EXT}"
+UBOOT_BINARY = "u-boot.${UBOOT_EXT}"
+UBOOT_BINARY_tegra = "u-boot-dtb-tegra.${UBOOT_EXT}"
+UBOOT_BINARY_tegra124 = "u-boot-dtb-tegra.${UBOOT_EXT}"
+UBOOT_BINARY_tegra124m = "u-boot-dtb-tegra.${UBOOT_EXT}"
#we need some native tools for deployment
DEPENDS_append_mx6 = " imx-loader-native"
@@ -145,8 +145,8 @@ fakeroot imagedeploy_arm() {
then
cp -P ${DEPLOY_DIR_IMAGE}/SPL* ${IMAGE_ROOTFS}/../${MACHINE}_bin/
fi
- rm -f ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot-hsmmc-${MACHINE}.${U_BOOT_EXT}
- mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${U_BOOT_SYMLINK} ${IMAGE_ROOTFS}/../${MACHINE}_bin/${U_BOOT_BINARY}
+ rm -f ${IMAGE_ROOTFS}/../${MACHINE}_bin/u-boot-hsmmc-${MACHINE}.${UBOOT_EXT}
+ mv ${IMAGE_ROOTFS}/../${MACHINE}_bin/${UBOOT_SYMLINK} ${IMAGE_ROOTFS}/../${MACHINE}_bin/${UBOOT_BINARY}
# add the rootfs version to the welcome banner
echo -n "${IMAGE_NAME} ${PV}" >> ${IMAGE_ROOTFS}/etc/issue