From 970c11bb0050e91262cf227ad7ef49fe01c1553f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 21 Feb 2022 19:55:41 -0300 Subject: [PATCH] Rework machine definitions to reduce duplication Signed-off-by: Otavio Salvador --- conf/machine/imx6qdlsabreauto.conf | 2 +- conf/machine/imx6qdlsabresd.conf | 2 +- conf/machine/imx6slevk.conf | 2 +- conf/machine/imx6sllevk.conf | 2 +- conf/machine/imx6sxsabreauto.conf | 2 +- conf/machine/imx6sxsabresd.conf | 2 +- conf/machine/imx6ulevk.conf | 2 +- conf/machine/imx6ullevk.conf | 2 +- conf/machine/imx6ulz-14x14-evk.conf | 2 +- conf/machine/imx8mq-evk.conf | 2 +- conf/machine/include/imx8mm-evk.inc | 2 +- conf/machine/include/imx8mn-evk.inc | 2 +- conf/machine/include/imx8mp-evk.inc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 171b9f00..a5ec1249 100644 --- 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 a5133625..81d1c962 100644 --- 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 b25182ba..a0048974 100644 --- 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 -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 ea525845..19df28a4 100644 --- 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 9e83c458..18f490f4 100644 --- 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 -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 d0a89596..9f939ca7 100644 --- 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 -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 09d64b4e..70cb68e6 100644 --- 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 -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 e71e34e4..722e0757 100644 --- 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 -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 a47c08f8..7775fde3 100644 --- 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 -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 cb63dceb..e20d3f2a 100644 --- 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 -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 85419a45..d6778caa 100644 --- 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 4f897349..0f886c00 100644 --- 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 7635d08c..fccfe0aa 100644 --- 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 -- 2.40.1