ramips: mt7621: switch trx parser to parser_trx from mtdsplit

Switch trx parser to parser_trx of Linux Kernel from mtdsplit_trx to
split firmware partition using model-specific trx magic number on
some Buffalo devices.
This change is tested on Buffalo WSR-2533DHPL.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
index 7b1cc64b5094bc934242e36368735be307751cb5..4346e4b9d2273d1b894b097e50fd0968f47e2a8f 100644 (file)
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
@@ -155,7 +155,7 @@
                        };
 
                        partition@50000 {
-                               compatible = "openwrt,trx";
+                               compatible = "brcm,trx";
                                label = "firmware";
                                reg = <0x50000 0xf90000>;
                        };

diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
index fa90fba3d55759923750f9ce199afa5ec4fac3c8..fe6fc6aab5c778a0f41c324d188270f6e954f331 100644 (file)
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
@@ -159,7 +159,7 @@
                        };
 
                        partition@50000 {
-                               compatible = "openwrt,trx";
+                               compatible = "brcm,trx";
                                label = "firmware";
                                reg = <0x50000 0x7c0000>;
                        };

diff --git a/target/linux/ramips/mt7621/config-6.6 b/target/linux/ramips/mt7621/config-6.6
index a77d8686245c0d593c4752083666dc385da59861..e77ea238e7f23a75af8daf819c8d240441bde199 100644 (file)
--- a/target/linux/ramips/mt7621/config-6.6
+++ b/target/linux/ramips/mt7621/config-6.6
@@ -161,6 +161,7 @@ CONFIG_MTD_NAND_ECC_SW_HAMMING=y
 CONFIG_MTD_NAND_MT7621=y
 CONFIG_MTD_NAND_MTK_BMT=y
 # CONFIG_MTD_PARSER_TPLINK_SAFELOADER is not set
+CONFIG_MTD_PARSER_TRX=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_ROUTERBOOT_PARTS=y
@@ -171,7 +172,6 @@ CONFIG_MTD_SPLIT_FIT_FW=y
 CONFIG_MTD_SPLIT_MINOR_FW=y
 CONFIG_MTD_SPLIT_SEAMA_FW=y
 CONFIG_MTD_SPLIT_TPLINK_FW=y
-CONFIG_MTD_SPLIT_TRX_FW=y
 CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20