From 8e9bcd1a1ed4094877423dd4cbe967bea5b898fb Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 6 Sep 2021 13:12:20 +0200 Subject: machines: Adjust for new location of tune files in core Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 2 +- conf/machine/apalis-imx8x.conf | 2 +- conf/machine/colibri-imx6ull-emmc.conf | 4 ++-- conf/machine/colibri-imx8x.conf | 2 +- conf/machine/verdin-imx8mm.conf | 2 +- conf/machine/verdin-imx8mp.conf | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index ec7e8ce..dc98c9b 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -14,7 +14,7 @@ IMX_DEFAULT_BSP = "nxp" require conf/machine/include/imx-base.inc # override imx-base.inc which sets this to cortexa72-cortexa53-crypto DEFAULTTUNE:mx8qm = "aarch64" -require conf/machine/include/tune-cortexa72-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc # Don't include kernels in standard images RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index df84fd6..0ae847e 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -12,7 +12,7 @@ IMX_DEFAULT_BSP = "nxp" require conf/machine/include/imx-base.inc # if one wants cortexa35-crypto, set DEFAULTTUNE accordingly DEFAULTTUNE:mx8qxp = "aarch64" -require conf/machine/include/tune-cortexa35.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc # Don't include kernels in standard images RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf index 73286dc..796df7c 100644 --- a/conf/machine/colibri-imx6ull-emmc.conf +++ b/conf/machine/colibri-imx6ull-emmc.conf @@ -6,8 +6,8 @@ MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:" -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc +require conf/machine/include/imx-base.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index f4e29ec..7fccc7a 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -12,7 +12,7 @@ IMX_DEFAULT_BSP = "nxp" require conf/machine/include/imx-base.inc # if one wants cortexa35-crypto, set DEFAULTTUNE accordingly DEFAULTTUNE:mx8qxp = "aarch64" -require conf/machine/include/tune-cortexa35.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc # Don't include kernels in standard images RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 214e06c..68d01b8 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -13,7 +13,7 @@ IMX_DEFAULT_BSP = "nxp" require conf/machine/include/imx-base.inc # override imx-base.inc which sets this to cortexa53-crypto DEFAULTTUNE:mx8mm = "aarch64" -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Don't include kernels in standard images RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index d85c28c..51d8584 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -13,7 +13,7 @@ IMX_DEFAULT_BSP = "nxp" require conf/machine/include/imx-base.inc # override imx-base.inc which sets this to cortexa53-crypto DEFAULTTUNE:mx8mp = "aarch64" -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Don't include kernels in standard images RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" -- cgit v1.2.3