From 718e9b380f06d7bd76a3d0087909693db4f421c7 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 1 May 2023 16:06:57 +0200 Subject: linux-imx-headers: provide 5.15 version meta-freescale master moved to the 6.1 downstream fork which no longer provides all headers needed with our 5.15 fork. Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 1 + conf/machine/colibri-imx8x.conf | 1 + conf/machine/verdin-imx8mm.conf | 2 ++ conf/machine/verdin-imx8mp.conf | 1 + 4 files changed, 5 insertions(+) (limited to 'conf') diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 4d494ea..031442a 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -59,6 +59,7 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" +PREFERRED_VERSION_linux-imx-headers = "5.15" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" PREFERRED_PROVIDER_u-boot = "u-boot-toradex" # Currently we use the nxp 2022.04 downstream for mx8 diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 01e0b78..212a5e0 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -61,6 +61,7 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" +PREFERRED_VERSION_linux-imx-headers = "5.15" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" PREFERRED_PROVIDER_u-boot = "u-boot-toradex" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index b2a48dd..2ee78c2 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -78,6 +78,8 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" +PREFERRED_VERSION_linux-imx-headers = "5.15" +MACHINE_EXTRA_RRECOMMENDS:append:use-mainline-bsp = " modprobe-conf" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" # Currently we use the nxp 2022.04 downstream for mx8 diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index 25e09f6..2f8adb7 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -80,6 +80,7 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline-rt" PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" +PREFERRED_VERSION_linux-imx-headers = "5.15" IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" # Currently we use the nxp 2022.04 downstream for mx8 -- cgit v1.2.3