From 7d1145ecb97b9c7f852714c7938771d80b2df4e8 Mon Sep 17 00:00:00 2001 From: Weijie Gao Date: Fri, 15 Mar 2024 23:13:55 +0800 Subject: [PATCH] mediatek: fix build failure of mt7623/mt7629 using kernel 6.6 In kernel 6.6, dts files for mediatek arm target are moved into arch/arm/boot/dts/mediatek instead of legacy path arch/arm/boot/dts. To avoid dts compile failure, change DTS_DIR to the mediatek subfolder for kernel 6.6. Signed-off-by: Weijie Gao --- target/linux/mediatek/image/mt7623.mk | 4 ++++ target/linux/mediatek/image/mt7629.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 24663551e0f..93625c405b9 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -1,3 +1,7 @@ +ifneq ($(KERNEL),6.1) +DTS_DIR := $(DTS_DIR)/mediatek +endif + DEVICE_VARS += UBOOT_TARGET UBOOT_OFFSET UBOOT_IMAGE # The bootrom of MT7623 expects legacy MediaTek headers present in diff --git a/target/linux/mediatek/image/mt7629.mk b/target/linux/mediatek/image/mt7629.mk index 9374228808c..9f0ea98950f 100644 --- a/target/linux/mediatek/image/mt7629.mk +++ b/target/linux/mediatek/image/mt7629.mk @@ -1,3 +1,7 @@ +ifneq ($(KERNEL),6.1) +DTS_DIR := $(DTS_DIR)/mediatek +endif + define Device/mediatek_mt7629-rfb DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7629 rfb AP -- 2.30.2