ramips: Netgear R6220 fix flash layout

it look there are three different flash layouts add model r6220b r6220a to met layout of his device
x-wrt · May 31, 2019 · 595d96c · 595d96c
1 parent d81b8cc
commit 595d96c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -289,7 +289,7 @@ px-4885-4M|\
 px-4885-8M)
 	set_wifi_led "px-4885:orange:wifi"
 	;;
-r6220|\
+netgear,r6220|\
 netgear,r6350|\
 wndr3700v5)
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10"

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -116,7 +116,7 @@ ramips_setup_interfaces()
 	psg1208|\
 	psg1218a|\
 	puppies|\
-	r6220|\
+	netgear,r6220|\
 	netgear,r6350|\
 	rt-n12p|\
 	sap-g3200u3|\
@@ -623,7 +623,7 @@ ramips_setup_macs()
 		lan_mac=$(mtd_get_mac_binary factory 40)
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
-	r6220|\
+	netgear,r6220|\
 	netgear,r6350|\
 	wndr3700v5)
 		wan_mac=$(mtd_get_mac_binary factory 4)

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
@@ -415,9 +415,6 @@ ramips_board_detect() {
 	*"Q7")
 		name="zte-q7"
 		;;
-	*"R6220")
-		name="r6220"
-		;;
 	*"RE350 v1")
 		name="re350-v1"
 		;;

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -37,7 +37,7 @@ platform_do_upgrade() {
 
 	case "$board" in
 	hc5962|\
-	r6220|\
+	netgear,r6220|\
 	netgear,r6350|\
 	ubnt-erx|\
 	ubnt-erx-sfp|\

diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
@@ -72,5 +72,11 @@
 			reg = <0x4200000 0x3c00000>;
 			read-only;
 		};
+
+		partition@2d00000 {
+			label = "factory_debug";
+			reg = <0x2d00000 0x200000>;
+			read-only;
+		};
 	};
 };
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
@@ -323,7 +323,7 @@ define Device/puppies
 endef
 TARGET_DEVICES += puppies
 
-define Device/r6220
+define Device/netgear_r6220
   DTS := R6220
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -337,8 +337,9 @@ define Device/r6220
   DEVICE_TITLE := Netgear R6220
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
+  SUPPORTED_DEVICES += r6220 netgear,r6220a netgear,r6220b netgear,r6220c netgear,r6220
 endef
-TARGET_DEVICES += r6220
+TARGET_DEVICES += netgear_r6220
 
 define Device/netgear_ex6150
   DTS := EX6150