[openwrt/openwrt] mediatek: fix build failure of mt7623/mt7629 using kernel 6.6

LEDE Commits lede-commits at lists.infradead.org
Sat Mar 16 00:25:34 PDT 2024


981213 pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/7d1145ecb97b9c7f852714c7938771d80b2df4e8

commit 7d1145ecb97b9c7f852714c7938771d80b2df4e8
Author: Weijie Gao <hackpascal at gmail.com>
AuthorDate: Fri Mar 15 23:13:55 2024 +0800

    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 <hackpascal at gmail.com>
---
 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 24663551e0..93625c405b 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 9374228808..9f0ea98950 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




More information about the lede-commits mailing list