From d1032a63e40296d81e60e503c6584e7ccc0b96a5 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 10 Jun 2018 15:09:14 +0200 Subject: tdx-image-fstype: configure update.sh from KERNEL_DEVICE_TREE The machine configurations provide a list of built device tree files. Use said variable to modify update.sh rather than maintaining the same list in the machine configuartion and update.sh. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- recipes-images/images/files/colibri-imx6ull/update.sh | 2 +- recipes-images/images/files/colibri-imx7/update.sh | 2 +- recipes-images/images/files/colibri-vf/update.sh | 2 +- recipes-images/images/files/library/imx6/update.sh | 6 ++---- recipes-images/images/files/library/tegra/update.sh | 8 ++++---- recipes-images/images/tdx-image-fstype.inc | 2 ++ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/recipes-images/images/files/colibri-imx6ull/update.sh b/recipes-images/images/files/colibri-imx6ull/update.sh index 266a718..8933c89 100755 --- a/recipes-images/images/files/colibri-imx6ull/update.sh +++ b/recipes-images/images/files/colibri-imx6ull/update.sh @@ -67,7 +67,7 @@ Usage() } # initialise options -KERNEL_DEVICETREE="imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" +KERNEL_DEVICETREE="%kernel_device_trees%" KERNEL_IMAGETYPE="zImage" MODTYPE_DETECT=0 diff --git a/recipes-images/images/files/colibri-imx7/update.sh b/recipes-images/images/files/colibri-imx7/update.sh index 0b8cd2b..74ef753 100755 --- a/recipes-images/images/files/colibri-imx7/update.sh +++ b/recipes-images/images/files/colibri-imx7/update.sh @@ -67,7 +67,7 @@ Usage() } # initialise options -KERNEL_DEVICETREE="imx7s-colibri-eval-v3.dtb imx7d-colibri-eval-v3.dtb imx7s-colibri-aster.dtb imx7d-colibri-aster.dtb" +KERNEL_DEVICETREE="%kernel_device_trees%" KERNEL_IMAGETYPE="zImage" MODTYPE_DETECT=0 diff --git a/recipes-images/images/files/colibri-vf/update.sh b/recipes-images/images/files/colibri-vf/update.sh index bd4679b..aa4e437 100755 --- a/recipes-images/images/files/colibri-vf/update.sh +++ b/recipes-images/images/files/colibri-vf/update.sh @@ -71,7 +71,7 @@ Usage() } # initialise options -KERNEL_DEVICETREE="vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb vf500-colibri-aster.dtb vf610-colibri-aster.dtb" +KERNEL_DEVICETREE="%kernel_device_trees%" KERNEL_IMAGETYPE="zImage" MODTYPE_DETECT=0 NORTSCTS=0 diff --git a/recipes-images/images/files/library/imx6/update.sh b/recipes-images/images/files/library/imx6/update.sh index b624ba6..8c29e47 100755 --- a/recipes-images/images/files/library/imx6/update.sh +++ b/recipes-images/images/files/library/imx6/update.sh @@ -131,9 +131,7 @@ case "$MODTYPE" in # assumed minimal eMMC size [in sectors of 512] EMMC_SIZE=$(expr 1024 \* 3500 \* 2) IMAGEFILE=root.ext4 - 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" + KERNEL_DEVICETREE="%kernel_device_trees%" LOCPATH="`pwd`/imx_flash" OUT_DIR="$OUT_DIR/apalis_imx6" ;; @@ -141,7 +139,7 @@ case "$MODTYPE" in # assumed minimal eMMC size [in sectors of 512] 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" + KERNEL_DEVICETREE="%kernel_device_trees%" LOCPATH="`pwd`/imx_flash" OUT_DIR="$OUT_DIR/colibri_imx6" ;; diff --git a/recipes-images/images/files/library/tegra/update.sh b/recipes-images/images/files/library/tegra/update.sh index f54a56b..caa6228 100755 --- a/recipes-images/images/files/library/tegra/update.sh +++ b/recipes-images/images/files/library/tegra/update.sh @@ -200,7 +200,7 @@ case "$MODTYPE" in # assumed minimal eMMC size [in sectors of 512] EMMC_SIZE=$(expr 1024 \* 7450 \* 2) IMAGEFILE=root.ext3 - KERNEL_DEVICETREE="tegra30-apalis-eval.dtb" + KERNEL_DEVICETREE="%kernel_device_trees%" LOCPATH="tegra-uboot-flasher" OUT_DIR="$OUT_DIR/apalis_t30" U_BOOT_BINARY=u-boot-dtb-tegra.bin @@ -212,7 +212,7 @@ case "$MODTYPE" in # assumed minimal eMMC size [in sectors of 512] EMMC_SIZE=$(expr 1024 \* 15020 \* 2) IMAGEFILE=root.ext4 - KERNEL_DEVICETREE="tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" + KERNEL_DEVICETREE="%kernel_device_trees%" LOCPATH="tegra-uboot-flasher" OUT_DIR="$OUT_DIR/apalis-tk1" U_BOOT_BINARY=u-boot-dtb-tegra.bin @@ -223,7 +223,7 @@ case "$MODTYPE" in CBOOT_IMAGE_TARGET=tegra20 EMMC_PARTS="" IMAGEFILE=ubifs - KERNEL_DEVICETREE="tegra20-colibri-eval-v3.dtb" + KERNEL_DEVICETREE="%kernel_device_trees%" KERNEL_IMAGETYPE="zImage" LOCPATH="tegra-uboot-flasher" OUT_DIR="$OUT_DIR/colibri_t20" @@ -238,7 +238,7 @@ case "$MODTYPE" in CBOOT_IMAGE_TARGET=tegra30 EMMC_SIZE=$(expr 1024 \* 3640 \* 2) IMAGEFILE=root.ext3 - KERNEL_DEVICETREE="tegra30-colibri-eval-v3.dtb" + KERNEL_DEVICETREE="%kernel_device_trees%" LOCPATH="tegra-uboot-flasher" OUT_DIR="$OUT_DIR/colibri_t30" U_BOOT_BINARY=u-boot-dtb-tegra.bin diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc index f727845..c6e909b 100644 --- a/recipes-images/images/tdx-image-fstype.inc +++ b/recipes-images/images/tdx-image-fstype.inc @@ -159,6 +159,8 @@ fakeroot imagedeploy_arm() { cd ${WORKDIR} cp -Lr ${BURNFLASH}/* ${IMAGE_DIR}/ + sed -i 's/%kernel_device_trees%/${KERNEL_DEVICETREE}/' ${IMAGE_DIR}/update.sh + cd ${IMAGE_DIR}/${MACHINE}_bin ./mk-u-boot-scripts.sh cd ${WORKDIR} -- cgit v1.2.3