From 2839d30c0335f0215405644aaa35bbfd16f062e9 Mon Sep 17 00:00:00 2001
From: James <>
Date: Sat, 20 Feb 2021 18:33:43 +0000
Subject: everything happy

---
 master/jffs2 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 master/jffs2

(limited to 'master/jffs2')

diff --git a/master/jffs2 b/master/jffs2
new file mode 100644
index 0000000..46a42b2
--- /dev/null
+++ b/master/jffs2
@@ -0,0 +1,46 @@
+diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
+index 98d83f9..20dff49 100644
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -499,6 +499,7 @@ TARGET_DEVICES += mikrotik_rb750gr3
+ define Device/mikrotik_rbm11g
+   $(Device/MikroTik)
+   DEVICE_MODEL := RouterBOARD M11G
++  BLOCKSIZE := 64k
+ endef
+ TARGET_DEVICES += mikrotik_rbm11g
+ 
+diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk
+index c2eba1d..91fc4f1 100644
+--- a/target/linux/ramips/mt7621/target.mk
++++ b/target/linux/ramips/mt7621/target.mk
+@@ -4,7 +4,7 @@
+ 
+ SUBTARGET:=mt7621
+ BOARDNAME:=MT7621 based boards
+-FEATURES+=nand ramdisk rtc usb minor
++FEATURES+=nand ramdisk rtc usb minor jffs2
+ CPU_TYPE:=24kc
+ 
+ define Target/Description
+diff --git a/target/linux/ramips/patches-4.14/9999-fix-jffs2.patch b/target/linux/ramips/patches-4.14/9999-fix-jffs2.patch
+new file mode 100644
+index 0000000..5c8a254
+--- /dev/null
++++ b/target/linux/ramips/patches-4.14/9999-fix-jffs2.patch
+@@ -0,0 +1,15 @@
++Index: linux-4.14.172/drivers/mtd/mtdsplit/mtdsplit.c
++===================================================================
++--- linux-4.14.172.orig/drivers/mtd/mtdsplit/mtdsplit.c
+++++ linux-4.14.172/drivers/mtd/mtdsplit/mtdsplit.c
++@@ -95,6 +95,10 @@ int mtd_check_rootfs_magic(struct mtd_in
++ 		if (type)
++ 			*type = MTDSPLIT_PART_TYPE_JFFS2;
++ 		return 0;
+++	} else if (magic == 0x20031985) {
+++		if (type)
+++			*type = MTDSPLIT_PART_TYPE_JFFS2;
+++		return 0;
++ 	} else if (be32_to_cpu(magic) == UBI_EC_MAGIC) {
++ 		if (type)
++ 			*type = MTDSPLIT_PART_TYPE_UBI;
-- 
cgit v1.2.3