summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-01-25 10:20:12 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2021-01-27 14:21:00 +0100
commiteedaf5b0c1d4b2d73d10560dd251b48d80bb5d49 (patch)
tree233adf132bd9f7d6b891269228e0924ab4b35a1a
parentcac63cea585418fd9fbfb4aeb8835d6c44e0e280 (diff)
machines: i.mx 8x: follow changed soc revision selection
meta-freescale changed the way the SoC revision is selected. It used to default to rev B0 with the override imx8qxpc0 selecteing rev C0. Now it defaults to rev C0 with the MACHINE_FEATURE soc-revb0 selecting rev B0. https://github.com/Freescale/meta-freescale/commit/80345fbe89c5ac96975f9c7ef38e8dc8d2a36346 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/machine/apalis-imx8x-v11a.conf5
-rw-r--r--conf/machine/apalis-imx8x.conf4
-rw-r--r--conf/machine/colibri-imx8x-v10b.conf5
-rw-r--r--conf/machine/colibri-imx8x.conf4
4 files changed, 6 insertions, 12 deletions
diff --git a/conf/machine/apalis-imx8x-v11a.conf b/conf/machine/apalis-imx8x-v11a.conf
index 28aed93..faa8fff 100644
--- a/conf/machine/apalis-imx8x-v11a.conf
+++ b/conf/machine/apalis-imx8x-v11a.conf
@@ -3,9 +3,8 @@
#@DESCRIPTION: Toradex Apalis iMX8X powered by a i.MX 8X SoC (B0 silicon) as found on all V1.0 and V1.1A versions
#@MAINTAINER: Philippe Schenker <philippe.schenker@toradex.com>
-# for C0 silicon add mx8qxpc0:,
-# for B0 silicon use empty string
-SILICON-OVERRIDES = ""
+# Set SoC revision to B0
+MACHINE_FEATURES_append = " soc-revb0"
# keep the original machine as an override with high prio
MACHINEOVERRIDES =. "apalis-imx8x:"
diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf
index 81c227c..ae85f37 100644
--- a/conf/machine/apalis-imx8x.conf
+++ b/conf/machine/apalis-imx8x.conf
@@ -5,9 +5,7 @@
MACHINE_NAME = "Apalis-iMX8X"
-# for C0 silicon add mx8qxpc0 to the right of mx8qxp
-SILICON-OVERRIDES ?= "mx8qxpc0:"
-MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:${SILICON-OVERRIDES}"
+MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
IMX_DEFAULT_BSP = "nxp"
diff --git a/conf/machine/colibri-imx8x-v10b.conf b/conf/machine/colibri-imx8x-v10b.conf
index 2049335..18d4d15 100644
--- a/conf/machine/colibri-imx8x-v10b.conf
+++ b/conf/machine/colibri-imx8x-v10b.conf
@@ -3,9 +3,8 @@
#@DESCRIPTION: Toradex Colibri iMX8X powered by a i.MX 8X SoC (B0 silicon) as found on older SoM Versions V1.0B
#@MAINTAINER: Max Krummenacher <max.krummenacherr@toradex.com>
-# for C0 silicon add mx8qxpc0:,
-# for B0 silicon use empty string
-SILICON-OVERRIDES = ""
+# Set SoC revision to B0
+MACHINE_FEATURES_append = " soc-revb0"
# keep the original machine as an override with high prio
MACHINEOVERRIDES =. "colibri-imx8x:"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index ab1aab0..c6d3962 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -5,9 +5,7 @@
MACHINE_NAME = "Colibri-iMX8X"
-# for C0 silicon add mx8qxpc0 to the right of mx8qxp
-SILICON-OVERRIDES ?= "mx8qxpc0:"
-MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:${SILICON-OVERRIDES}"
+MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
IMX_DEFAULT_BSP = "nxp"