aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2021-01-20 18:36:51 +0100
committerPetr Štetiar <ynezz@true.cz>2021-01-22 21:03:11 +0100
commitff7709d223e15cfc496abf09acae12826d9216e6 (patch)
treef154e1438e4762a86360261acb42a788365b1ded /target/linux/ath79
parentde64d4b9586c86018097fc33ce3210128da11287 (diff)
downloadupstream-ff7709d223e15cfc496abf09acae12826d9216e6.tar.gz
upstream-ff7709d223e15cfc496abf09acae12826d9216e6.tar.bz2
upstream-ff7709d223e15cfc496abf09acae12826d9216e6.zip
kernel: mtdsplit_uimage: replace "netgear, uimage" parser
The "netgear,uimage" parser can be replaced by the generic parser using device specific openwrt,ih-magic and openwrt,ih-type properties. Device tree properties for the following devices have not been set, as they have been dropped from OpenWrt with the removal of the ar71xx target: FW_MAGIC_WNR2000V1 0x32303031 FW_MAGIC_WNR2000V4 0x32303034 FW_MAGIC_WNR1000V2_VC 0x31303030 FW_MAGIC_WPN824N 0x31313030 Tested-by: Sander Vanheule <sander@svanheule.net> # WNDR3700v2 Tested-by: Stijn Segers <foss@volatilesystems.org> # WNDR3700v1 Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndr.dtsi1
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts4
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndr3700.dts4
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndr3800.dts4
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts4
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts4
-rw-r--r--target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts4
-rw-r--r--target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts5
-rw-r--r--target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi5
-rw-r--r--target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts5
-rw-r--r--target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts4
-rw-r--r--target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts4
-rw-r--r--target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi1
-rw-r--r--target/linux/ath79/dts/ar9344_netgear_wndr.dtsi5
14 files changed, 42 insertions, 12 deletions
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index 61097f9679..217128546f 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
aliases {
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
index 0543c47113..6d78c019da 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700-v2.dts
@@ -22,7 +22,9 @@
partition@70000 {
label = "firmware";
reg = <0x070000 0xf80000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373031>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@ff0000 {
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
index 955dd2edf0..ad29d256f6 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dts
@@ -22,7 +22,9 @@
partition@70000 {
label = "firmware";
reg = <0x070000 0x780000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373030>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@7f0000 {
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
index 41fe401ddb..80b25492b1 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
@@ -23,7 +23,9 @@
partition@70000 {
label = "firmware";
reg = <0x070000 0xf80000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373031>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@ff0000 {
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
index 79569adba8..cc51aca8b6 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800ch.dts
@@ -23,7 +23,9 @@
partition@70000 {
label = "firmware";
reg = <0x070000 0xf80000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373031>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@ff0000 {
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts b/target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts
index 65d2393c67..8604414d19 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndrmac-v1.dts
@@ -22,7 +22,9 @@
partition@70000 {
label = "firmware";
reg = <0x070000 0xf80000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373031>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@ff0000 {
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts b/target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts
index f7641203cf..bebd96c72f 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndrmac-v2.dts
@@ -23,7 +23,9 @@
partition@70000 {
label = "firmware";
reg = <0x070000 0xf80000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373031>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@ff0000 {
diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index d700ea73fa..0c94c90284 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
compatible = "netgear,wnr1000-v2", "qca,ar7240";
@@ -158,7 +159,9 @@
partition@50000 {
label = "firmware";
reg = <0x50000 0x3a0000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x31303031>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@3f0000 {
diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 382529b32d..0360412598 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
aliases {
@@ -89,7 +90,9 @@
};
partition@50000 {
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x32303631>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
reg = <0x50000 0x3a0000>;
label = "firmware";
};
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index 2e7ea746df..831f3e9c25 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
compatible = "netgear,wnr2000-v3", "qca,ar7241";
@@ -161,7 +162,9 @@
partition@50000 {
label = "firmware";
reg = <0x50000 0x3a0000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x32303033>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@3f0000 {
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
index 2c74436547..3842238e54 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200-16m.dts
@@ -22,7 +22,9 @@
partition@50000 {
label = "firmware";
reg = <0x50000 0xfa0000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x32323030>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@ff0000 {
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
index c23cb6e002..4eb15e2313 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200-8m.dts
@@ -22,7 +22,9 @@
partition@50000 {
label = "firmware";
reg = <0x50000 0x7a0000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x32323030>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
art: partition@7f0000 {
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
index c61e188e32..625f4b0684 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
chosen {
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 26f9db5924..ac012eafb4 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
/ {
chosen {
@@ -161,7 +162,9 @@
partition@6c0000 {
label = "firmware";
reg = <0x6c0000 0x1900000>;
- compatible = "netgear,uimage";
+ compatible = "openwrt,uimage", "denx,uimage";
+ openwrt,ih-magic = <0x33373033>;
+ openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
};
partition@1fc0000 {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:56:45 +0000