From 6e9aa70dfcb16c3a7598d147ce6003d981057f51 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 7 Feb 2024 19:21:20 +0100 Subject: mx8: machines: fix kernel imagetype meta-freescale commit 1652e927 ("imx-base.inc: fix KERNEL_IMAGETYPE's override") changed to set KERNEL_IMAGETYPE with an override of higher priority than aarch64. Follow that so that we get Image.gz kernel images again. Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 2 +- conf/machine/colibri-imx8x.conf | 2 +- conf/machine/verdin-imx8mm.conf | 2 +- conf/machine/verdin-imx8mp.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 96eec6f..0b92a3f 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -39,7 +39,7 @@ KERNEL_DEVICETREE = " \ ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-ixora-v1.2.dtb \ " -KERNEL_IMAGETYPE:aarch64 = "Image.gz" +KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz" UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index ccd6da4..236c1d4 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -38,7 +38,7 @@ KERNEL_DEVICETREE = " \ " KERNEL_DEVICETREE:use-mainline-bsp = "${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb" -KERNEL_IMAGETYPE:aarch64 = "Image.gz" +KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz" UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index f1799b3..6ebf520 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -40,7 +40,7 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dev.dtb \ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-yavia.dtb \ " -KERNEL_IMAGETYPE:aarch64 = "Image.gz" +KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "verdin-imx8mm_defconfig,sdcard" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index 92cd300..387af29 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -40,7 +40,7 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dev.dtb \ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-yavia.dtb \ " -KERNEL_IMAGETYPE:aarch64 = "Image.gz" +KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "verdin-imx8mp_defconfig,sdcard" -- cgit v1.2.3