From f05f0284e8e02837865eda1978cac3ede52552ec Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 2 Nov 2023 14:00:36 +0200 Subject: [PATCH] linux: fix building linux 6.1 for 32-bit arm machines Only kernels >= 6.6 have dts files for 32-bit ARM devices reorganized by placing them in vendor+family subdirectories. Previous kernels keep all arm arch dts files in a single default directory. Correctly reassign KERNEL_DEVICETREE for 32-bit ARM devices for all supported kernels 6.1 to fix building. Fixes: 0d838c68 ("ARM 32-bit device-tree reorganization") Signed-off-by: Oleksandr Suvorov --- recipes-kernel/linux/linux-fslc-imx_6.1.bb | 2 ++ recipes-kernel/linux/linux-fslc-lts_6.1.bb | 2 ++ recipes-kernel/linux/linux-imx_6.1.bb | 2 ++ recipes-kernel/linux/linux-legacy-arm-dts.inc | 7 +++++++ 4 files changed, 13 insertions(+) create mode 100644 recipes-kernel/linux/linux-legacy-arm-dts.inc diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb index 38bc0b976..5d31244e4 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb @@ -52,6 +52,8 @@ Latest stable Kernel patchlevel is applied and maintained by Community." require linux-imx.inc +include linux-legacy-arm-dts.inc + KBRANCH = "6.1-2.1.x-imx" SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" SRCREV = "3f41fbe42851375d3d5996e4bf9e9809e6c79517" diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb index 51202796b..7931d2e79 100644 --- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb +++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb @@ -12,6 +12,8 @@ upstreaming in any form." require linux-imx.inc +include linux-legacy-arm-dts.inc + SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb index f8a9ce1d4..53cabb598 100644 --- a/recipes-kernel/linux/linux-imx_6.1.bb +++ b/recipes-kernel/linux/linux-imx_6.1.bb @@ -12,6 +12,8 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU require recipes-kernel/linux/linux-imx.inc +include linux-legacy-arm-dts.inc + SRCBRANCH = "lf-6.1.y" LOCALVERSION = "-6.1.36-2.1.0" SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" diff --git a/recipes-kernel/linux/linux-legacy-arm-dts.inc b/recipes-kernel/linux/linux-legacy-arm-dts.inc new file mode 100644 index 000000000..d2c20b131 --- /dev/null +++ b/recipes-kernel/linux/linux-legacy-arm-dts.inc @@ -0,0 +1,7 @@ +# In linux kernels < 6.6 dts files for arm arch are collected in the +# common dts directory arch/arm/boot/dts + +KERNEL_DEVICETREE:imx23evk = "imx23-evk.dtb" +KERNEL_DEVICETREE:imx28evk = "imx28-evk.dtb" +KERNEL_DEVICETREE:imx51evk = "imx51-babbage.dtb" +KERNEL_DEVICETREE:imx53qsb = "imx53-qsb.dtb imx53-qsrb.dtb"