From: Leo Barsky Date: Sun, 11 Jan 2026 04:55:50 +0000 (-0300) Subject: econet: refresh patches 6.12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cffc2a91023eff4ff41048822083e1bd56795b59;p=thirdparty%2Fopenwrt.git econet: refresh patches 6.12 Manually rebased: econet/patches-6.12/901-nand-enable-en75-bbt.patch Fixes: 5230157a165 ("kernel: QCOM SPI NAND: backport multiple fixes") Signed-off-by: Leo Barsky Link: https://github.com/openwrt/openwrt/pull/21500 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/econet/patches-6.12/010-v6.16-MAINTAINERS-Add-entry-for-newly-added-EcoNet-platfor.patch b/target/linux/econet/patches-6.12/010-v6.16-MAINTAINERS-Add-entry-for-newly-added-EcoNet-platfor.patch index 69621a06b70..e4230573c29 100644 --- a/target/linux/econet/patches-6.12/010-v6.16-MAINTAINERS-Add-entry-for-newly-added-EcoNet-platfor.patch +++ b/target/linux/econet/patches-6.12/010-v6.16-MAINTAINERS-Add-entry-for-newly-added-EcoNet-platfor.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Bogendoerfer --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -8019,6 +8019,18 @@ W: https://linuxtv.org +@@ -8025,6 +8025,18 @@ W: https://linuxtv.org Q: http://patchwork.linuxtv.org/project/linux-media/list/ F: drivers/media/dvb-frontends/ec100* diff --git a/target/linux/econet/patches-6.12/901-nand-enable-en75-bbt.patch b/target/linux/econet/patches-6.12/901-nand-enable-en75-bbt.patch index 67c7c9ba6ae..91e184bd96a 100644 --- a/target/linux/econet/patches-6.12/901-nand-enable-en75-bbt.patch +++ b/target/linux/econet/patches-6.12/901-nand-enable-en75-bbt.patch @@ -14,9 +14,9 @@ Signed-off-by: Caleb James DeLisle obj-$(CONFIG_MTD_NAND_ECC_MEDIATEK) += ecc-mtk.o -obj-$(CONFIG_MTD_NAND_MTK_BMT) += mtk_bmt.o mtk_bmt_v2.o mtk_bmt_bbt.o mtk_bmt_nmbm.o +obj-$(CONFIG_MTD_NAND_MTK_BMT) += mtk_bmt.o mtk_bmt_v2.o mtk_bmt_bbt.o mtk_bmt_nmbm.o en75_bmt.o - ifeq ($(CONFIG_SPI_QPIC_SNAND),y) obj-$(CONFIG_SPI_QPIC_SNAND) += qpic_common.o - else + obj-$(CONFIG_MTD_NAND_QCOM) += qpic_common.o + obj-y += onenand/ --- a/drivers/mtd/nand/mtk_bmt.h +++ b/drivers/mtd/nand/mtk_bmt.h @@ -77,6 +77,7 @@ extern struct bmt_desc bmtd;