summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-09-03 14:10:07 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2020-09-03 18:15:52 +0200
commitb13bd9288457daeda1efeebb55e7d7d1bb55af5d (patch)
treef95e692eed0b3b966b604a09c515f50581a57a7a /conf
parent57991b4f254fa94373e746bcedb261743b963917 (diff)
machines: includes: assign image_* consistently
Using "+=" overwrites "?=" in some cases which then dropes the creation of wic images for apalis/colibri-imx6. Related-to: ELB-2758 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/apalis-imx6.inc2
-rw-r--r--conf/machine/include/colibri-imx6.inc2
-rw-r--r--conf/machine/include/colibri-imx6ull.inc4
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc4
-rw-r--r--conf/machine/include/colibri-imx7.inc2
5 files changed, 7 insertions, 7 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index ad29d4f..fbf33eb 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -1,5 +1,5 @@
IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES += "teziimg"
+IMAGE_FSTYPES_append = " teziimg"
TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
# The payload offsets are given in number of 512 byte blocks.
OFFSET_BOOTROM_PAYLOAD = "2"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index d58a5ef..d2f33f5 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -1,5 +1,5 @@
IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES += "teziimg"
+IMAGE_FSTYPES_append = " teziimg"
TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
# The payload offsets are given in number of 512 byte blocks.
OFFSET_BOOTROM_PAYLOAD = "2"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 7cf834a..d8e9c43 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES += "image_type_tezi"
-IMAGE_FSTYPES += "teziimg"
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
TORADEX_PRODUCT_IDS = "0036 0040 0044 0045"
TORADEX_PRODUCT_IDS[0036] = "imx6ull-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index d0beb9c..4243c72 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES += "image_type_tezi"
-IMAGE_FSTYPES += "teziimg"
+IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_FSTYPES_append = " teziimg"
# The payload offsets are given in number of 512 byte blocks.
OFFSET_BOOTROM_PAYLOAD = "2"
TORADEX_PRODUCT_IDS = "0039"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 5aedadf..b45f226 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -1,5 +1,5 @@
IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES += "teziimg"
+IMAGE_FSTYPES_append = " teziimg"
TORADEX_PRODUCT_IDS = "0032 0033 0041"
TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"