From 368cd88c44dbec3783099550cade33d5d36974f1 Mon Sep 17 00:00:00 2001 From: Tim Harvey Date: Mon, 20 May 2024 12:28:52 -0700 Subject: [PATCH] imx: fix cortexa9/cortexa7 image builds due to dts move The IMX device-tree's for arm moved from arch/arm/boot/dts to arch/arm/boot/dts/nxp/imx. Use that if using the 6.6 kernel. Signed-off-by: Tim Harvey --- target/linux/imx/image/cortexa7.mk | 3 +++ target/linux/imx/image/cortexa9.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/target/linux/imx/image/cortexa7.mk b/target/linux/imx/image/cortexa7.mk index d5a23fc6e9..3f89a99a83 100644 --- a/target/linux/imx/image/cortexa7.mk +++ b/target/linux/imx/image/cortexa7.mk @@ -10,6 +10,9 @@ define Device/Default KERNEL_NAME := zImage KERNEL := kernel-bin | uImage none KERNEL_LOADADDR := 0x80008000 +ifdef CONFIG_LINUX_6_6 + DTS_DIR := $(DTS_DIR)/nxp/imx +endif IMAGES := endef diff --git a/target/linux/imx/image/cortexa9.mk b/target/linux/imx/image/cortexa9.mk index 2321469cc8..1ff5bcb8a7 100644 --- a/target/linux/imx/image/cortexa9.mk +++ b/target/linux/imx/image/cortexa9.mk @@ -84,6 +84,9 @@ define Device/Default KERNEL_NAME := zImage KERNEL := kernel-bin | uImage none KERNEL_LOADADDR := 0x10008000 +ifdef CONFIG_LINUX_6_6 + DTS_DIR := $(DTS_DIR)/nxp/imx +endif IMAGES := endef