Rework machine definitions to reduce duplication

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 171b9f00d1c8f154fdc3b83489a93a50732304ec..a5ec1249a2ff74bd7ddd517efb96e90c6426a428 100644 (file)
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -11,7 +11,7 @@
 #    * imx6solosabreauto
 # and is able to work for all the machines.
 
-MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
+MACHINEOVERRIDES =. "mx6q:mx6dl:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index a5133625999e83e4088f422d65f2035985de0dc7..81d1c962055f2dbebcbe9d8cdb2456a7f7ae41e9 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -11,7 +11,7 @@
 #    * imx6solosabresd
 # and is able to work for all the machines.
 
-MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
+MACHINEOVERRIDES =. "mx6q:mx6dl:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index b25182ba9dbcd014d6880f9a652c1c0680bc7ba7..a0048974843bb02aa1133c809b48c8dd6cd3cfa0 100644 (file)
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6SL Evaluation Kit
 #@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
 
-MACHINEOVERRIDES =. "mx6:mx6sl:"
+MACHINEOVERRIDES =. "mx6sl:"
 
 include conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index ea5258454f60c610e7f0ccf9fb02ed553a8ff399..19df28a4982ca24c23a2990c7f8f69768d84c556 100644 (file)
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6SLL EVK
 #@MAINTAINER: Alexandru Palalau ioan-alexandru.palalau@nxp.com
 
-MACHINEOVERRIDES =. "mx6:mx6sll:"
+MACHINEOVERRIDES =. "mx6sll:"
 
 include conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 9e83c45808ca7135ac915f1fd139212ab1fc3da6..18f490f4406a5e15cd6702965cd8901590652906 100644 (file)
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre Automotive
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
-MACHINEOVERRIDES =. "mx6:mx6sx:"
+MACHINEOVERRIDES =. "mx6sx:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index d0a89596c2b2920e522a61af3c076f273477b6b4..9f939ca79d8a93c15ef25b54c744ac0e32cc60e7 100644 (file)
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6SoloX Sabre SD
 #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com>
 
-MACHINEOVERRIDES =. "mx6:mx6sx:"
+MACHINEOVERRIDES =. "mx6sx:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 09d64b4ef16cf111563f3a8e1e4d8a9afba505a7..70cb68e6f22bdb91475a922f69d035ea3ebfc0b9 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6UL EVK
 #@MAINTAINER: Alexandru Palalau <ioan-alexandru.palalau@nxp.com>
 
-MACHINEOVERRIDES =. "mx6:mx6ul:"
+MACHINEOVERRIDES =. "mx6ul:"
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc

diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index e71e34e4902446d90e8f7777c45129547dc555ab..722e07573ca72c68592157ce3a93fe6d99c4100e 100644 (file)
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6ULL EVK
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
-MACHINEOVERRIDES =. "mx6:mx6ull:"
+MACHINEOVERRIDES =. "mx6ull:"
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc

diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index a47c08f88a2d254595d84344d9154edc7084b2d9..7775fde31a75addff8b46c95d3c28ead01584f10 100644 (file)
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX6ULZ 14x14 EVK
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:"
+MACHINEOVERRIDES =. "mx6ulz:"
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc

diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index cb63dcebdcc664d80ef35e87251f62d4cdb03b90..e20d3f2a5090c00287fa2201289861743769dcf0 100644 (file)
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mq:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8mq:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc

diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 85419a454b455d9ff335047bfc65c4c4bff9f956..d6778caaa703449536f3f9a255387610167e5562 100644 (file)
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -1,4 +1,4 @@
-MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8mm:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc

diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 4f8973491301df30cd1a877b6b2a275b2e330e50..0f886c007ea5a3dcb8433b477c8d47a530d19fbc 100644 (file)
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -1,4 +1,4 @@
-MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8mn:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc

diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 7635d08ce4c02b4cefafa7e3c0bcee8c34788dce..fccfe0aa44eeeb80056208cfda05c2152b85c26f 100644 (file)
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -1,4 +1,4 @@
-MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
+MACHINEOVERRIDES =. "imx-boot-container:mx8mp:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc