diff --git a/config/sources/families/filogic.conf b/config/sources/families/filogic.conf
index b9635d271a..ca49691162 100644
--- a/config/sources/families/filogic.conf
+++ b/config/sources/families/filogic.conf
@@ -41,35 +41,33 @@ function uboot_custom_postprocess() {
 
 case $BRANCH in
 	legacy)
-                KERNELSOURCE='https://github.com/chainsx/linux-filogic.git'
-                KERNELBRANCH="branch:linux-6.12.35"
+		KERNELSOURCE='https://github.com/chainsx/linux-filogic.git'
+		KERNELBRANCH="branch:linux-6.12.35"
 		declare -g KERNEL_MAJOR_MINOR="6.12"
 		KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
 		LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 
-                ;;
+		;;
 
 	current)
 		KERNELSOURCE='https://github.com/frank-w/BPI-Router-Linux.git'
 		KERNELBRANCH="branch:6.12-main"
 		declare -g KERNEL_MAJOR_MINOR="6.12"
-		KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
+		KERNELPATCHDIR="archive/${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}"
 		LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 
-                ;;
+		;;
 
 	edge)
 		KERNELSOURCE='https://github.com/frank-w/BPI-Router-Linux.git'
 		KERNELBRANCH="branch:6.16-rsslro"
 		declare -g KERNEL_MAJOR_MINOR="6.16"
-		KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
+		KERNELPATCHDIR="archive/${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}"
 		LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 
 		;;
 esac
 
-#KERNELPATCHDIR="archive/filogic-${KERNEL_MAJOR_MINOR}"
-
 write_uboot_platform() {
 	dd if=$1/bl2.img of=$2 bs=512 seek=34 status=noxfer > /dev/null 2>&1
 	dd if=$1/u-boot_sdmmc.fip of=$2 bs=512 seek=13312 status=noxfer >/dev/null 2>&1
diff --git a/patch/kernel/archive/filogic-6.12/0000.patching_config.yaml b/patch/kernel/archive/filogic-6.12/0000.patching_config.yaml
new file mode 100644
index 0000000000..3f1c3d6e0f
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.12/0000.patching_config.yaml
@@ -0,0 +1,36 @@
+config: # This is file 'patch/kernel/archive/filogic-6.12/0000.patching_config.yaml'
+
+  # Just some info stuff; not used by the patching scripts
+  name: filogic-6.12
+  kind: kernel
+  type: mainline # or: vendor
+  branch: 6.12-main
+  #last-known-good-tag: v6.12.51
+  maintainers:
+    - { github: chainsx, name: chainsx, email: i@chainsx.cn armbian-forum: chainsx }
+    - { github: tabrisnet, name: tabrisnet, email: tabris@tabris.net, armbian-forum: tabrisnet }
+
+  # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
+  # This is meant to provide a way to "add a board DTS" without having to null-patch them in.
+  dts-directories:
+    - { source: "dt", target: "arch/arm64/boot/dts/mediatek" }
+
+  # every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones
+  # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in.
+  # @TODO need a solution to auto-Makefile the overlays as well
+  overlay-directories:
+    - { source: "overlay", target: "arch/arm64/boot/dts/mediatek/overlay" }
+
+  # the Makefile in each of these directories will be magically patched to include the dts files copied
+  #  or patched-in; overlay subdir will be included "-y" if it exists.
+  # No more Makefile patching needed, yay!
+  #auto-patch-dt-makefile:
+  #  - { directory: "arch/arm64/boot/dts/mediatek", config-var: "CONFIG_ARCH_MEDIATEK" }
+
+  # configuration for when applying patches to git / auto-rewriting patches (development cycle helpers)
+  patches-to-git:
+    do-not-commit-files:
+      - "MAINTAINERS" # constant churn, drop them. sorry.
+    do-not-commit-regexes: # Python-style regexes
+      - "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now
+
diff --git a/patch/kernel/archive/filogic-6.12/patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch b/patch/kernel/archive/filogic-6.12/patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
new file mode 100644
index 0000000000..7692079d40
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.12/patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: tabrisnet <tabris@tabris.net>
+Date: Sun, 12 Oct 2025 15:21:20 +0000
+Subject: mt7988a bpi-r4 mt7988a-bananapi-bpi-r4-sd.dtb
+
+OpenWRT uses some extra machinery for producing flattened DTBs that
+aren't in the kernel. We don't support that, so instead this patches
+the kernel tree.
+
+Signed-off-by: tabrisnet <tabris@tabris.net>
+---
+ arch/arm64/boot/dts/mediatek/Makefile | 11 +++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
+index a22d15dfd975..14e5b0b2505f 100644
+--- a/arch/arm64/boot/dts/mediatek/Makefile
++++ b/arch/arm64/boot/dts/mediatek/Makefile
+@@ -44,12 +44,21 @@ mt7986a-bananapi-bpi-r3-sd-nor-dtbs := \
+ 	mt7986a-bananapi-bpi-r3-sata.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd-nor.dtb
+ 
++mt7988a-bananapi-bpi-r4-sd-dtbs := \
++	mt7988a-bananapi-bpi-r4.dtb \
++	mt7988a-bananapi-bpi-r4-sd.dtbo
++mt7988a-bananapi-bpi-r4-emmc-dtbs := \
++	mt7988a-bananapi-bpi-r4.dtb \
++	mt7988a-bananapi-bpi-r4-emmc.dtbo
++
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-2g5.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-sd.dtbo
++dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtb
++dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-sd.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-wifi-mt7996a.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-rfb.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-rfb-emmc.dtbo
+@@ -134,4 +143,6 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb
+ DTC_FLAGS_mt7986a-bananapi-bpi-r3 := -@
+ DTC_FLAGS_mt7986a-bananapi-bpi-r3-mini := -@
+ DTC_FLAGS_mt7988a-bananapi-bpi-r4 := -@
++DTC_FLAGS_mt7988a-bananapi-bpi-r4-emmc := -@
++DTC_FLAGS_mt7988a-bananapi-bpi-r4-sd := -@
+ DTC_FLAGS_mt7988a-bananapi-bpi-r4-2g5 := -@
diff --git a/patch/kernel/archive/filogic-6.12/series.armbian b/patch/kernel/archive/filogic-6.12/series.armbian
new file mode 100644
index 0000000000..e883a827b9
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.12/series.armbian
@@ -0,0 +1 @@
+	patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
diff --git a/patch/kernel/archive/filogic-6.12/series.conf b/patch/kernel/archive/filogic-6.12/series.conf
new file mode 100644
index 0000000000..e883a827b9
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.12/series.conf
@@ -0,0 +1 @@
+	patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
diff --git a/patch/kernel/archive/filogic-6.16/patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch b/patch/kernel/archive/filogic-6.16/patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
new file mode 100644
index 0000000000..7e22fa54d1
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.16/patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: tabrisnet <tabris@tabris.net>
+Date: Sun, 12 Oct 2025 15:21:20 +0000
+Subject: mt7988a bpi-r4 mt7988a-bananapi-bpi-r4-sd.dtb
+
+OpenWRT uses some extra machinery for producing flattened DTBs that
+aren't in the kernel. We don't support that, so instead this patches
+the kernel tree.
+
+Signed-off-by: tabrisnet <tabris@tabris.net>
+---
+ arch/arm64/boot/dts/mediatek/Makefile | 12 ++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
+index d728953c10ad..15041f497529 100644
+--- a/arch/arm64/boot/dts/mediatek/Makefile
++++ b/arch/arm64/boot/dts/mediatek/Makefile
+@@ -19,14 +19,24 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sata.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtbo
+ #dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
+ #dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
++
++mt7988a-bananapi-bpi-r4-sd-dtbs := \
++	mt7988a-bananapi-bpi-r4.dtb \
++	mt7988a-bananapi-bpi-r4-sd.dtbo
++mt7988a-bananapi-bpi-r4-emmc-dtbs := \
++	mt7988a-bananapi-bpi-r4.dtb \
++	mt7988a-bananapi-bpi-r4-emmc.dtbo
++
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-2g5.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtbo
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-sd.dtbo
++dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtb
++dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-sd.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
+ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
+ #dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
+ #dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana-rev7.dtb
+ #dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb
+@@ -108,7 +118,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-evb.dtb
+ 
+ # Device tree overlays support
+ DTC_FLAGS_mt7986a-bananapi-bpi-r3 := -@
+ DTC_FLAGS_mt7986a-bananapi-bpi-r3-mini := -@
+ DTC_FLAGS_mt7988a-bananapi-bpi-r4 := -@
++DTC_FLAGS_mt7988a-bananapi-bpi-r4-emmc := -@
++DTC_FLAGS_mt7988a-bananapi-bpi-r4-sd := -@
+ DTC_FLAGS_mt7988a-bananapi-bpi-r4-2g5 := -@
+ DTC_FLAGS_mt8395-radxa-nio-12l := -@
+-- 
+Created with Armbian build tools https://github.com/armbian/build
diff --git a/patch/kernel/archive/filogic-6.16/series.armbian b/patch/kernel/archive/filogic-6.16/series.armbian
new file mode 100644
index 0000000000..757c5f0a00
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.16/series.armbian
@@ -0,0 +1,7 @@
+#
+#       This file is made manually by simply copying text
+#       from the target series.* files.
+#       Add (-) at the beginning of the line if the patch should not be applied.
+#       At the same time, the patch does not need to be deleted.
+#
+	patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch
diff --git a/patch/kernel/archive/filogic-6.16/series.conf b/patch/kernel/archive/filogic-6.16/series.conf
new file mode 100644
index 0000000000..757c5f0a00
--- /dev/null
+++ b/patch/kernel/archive/filogic-6.16/series.conf
@@ -0,0 +1,7 @@
+#
+#       This file is made manually by simply copying text
+#       from the target series.* files.
+#       Add (-) at the beginning of the line if the patch should not be applied.
+#       At the same time, the patch does not need to be deleted.
+#
+	patches.armbian/mt7988a-bananapi-bpi-r4-sd.patch