Merge branch 'pedro0311:arm-master' into improve-igd-pcp

pedro0311 · Jun 18, 2024 · 01a4c3e · 01a4c3e
2 parents 7faae56 + 31e715b
commit 01a4c3e
Show file tree

Hide file tree

Showing 3 changed files with 572 additions and 505 deletions.
diff --git a/release/src-rt-6.x.4708/router/www/Makefile b/release/src-rt-6.x.4708/router/www/Makefile
@@ -274,8 +274,16 @@ ifneq ($(TCONFIG_BCMARM),y)
  endif
 endif
 
-# Only for BCMWL6 SDK / RT-AC branch
-ifneq ($(CONFIG_BCMWL6),y)
+# Only for RT-N+ (enable SDK6 country code + rev selection also for newer SDK5 wl driver 5.100.x and up)
+ifneq ($(TCONFIG_BLINK),y)
+	sed -i $(INSTALLDIR)/www/advanced-wireless.asp -e "/BCMWL6-BEGIN/,/BCMWL6-END/d"
+endif
+
+# Remove for BCMWL6 SDK and up
+ifeq ($(CONFIG_BCMWL6),y)
+	sed -i $(INSTALLDIR)/www/advanced-wireless.asp -e "/BCMWL6-NO-BEGIN/,/BCMWL6-NO-END/d"
+else
+# Remove for RT and RT-N
 	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/BCMWL6-BEGIN/,/BCMWL6-END/d"
 	sed -i $(INSTALLDIR)/www/advanced-wlanvifs.asp -e "/BCMWL6-BEGIN/,/BCMWL6-END/d"
 	sed -i $(INSTALLDIR)/www/status-overview.asp -e "/BCMWL6-BEGIN/,/BCMWL6-END/d"
@@ -547,14 +555,22 @@ endif
 # Wireless Ethernet Bridge - doesn't work on ARM7
 ifeq ($(TCONFIG_BCM7),y)
  ifneq ($(TCONFIG_BCM714),y)
-	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/BCMWL7-NO-BEGIN/,/BCMWL7-NO-END/d"
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/BCMWL7-NO-BEGIN/,/BCMWL7-NO-END/d"	# remove on SDK7
+ else
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/BCMWL7-BEGIN/,/BCMWL7-END/d"		# remove on SDK714
  endif
+else
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/BCMWL7-BEGIN/,/BCMWL7-END/d"		# remove on RT, RT-N, RT-AC, SDK6
 endif
-# Wireless Client and Wireless Ethernet Bridge - doesn't work on MIPS RT-AC
+# Wireless Client / Wireless Ethernet Bridge - doesn't work on MIPS RT-AC
 ifeq ($(CONFIG_BCMWL6),y)
  ifneq ($(CONFIG_BCMWL6A),y)
-	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/RTAC-NO-BEGIN/,/RTAC-NO-END/d"
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/RTAC-NO-BEGIN/,/RTAC-NO-END/d"		# remove on RT-AC
+ else
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/RTAC-BEGIN/,/RTAC-END/d"		# remove on SDK6, SDK7, SDK714
  endif
+else
+	sed -i $(INSTALLDIR)/www/basic-network.asp -e "/RTAC-BEGIN/,/RTAC-END/d"		# remove on RT, RT-N
 endif
 
 # clean up
@@ -625,6 +641,7 @@ endif
 		-e "/BCMARM-NO-BEGIN/d"	-e "/BCMARM-NO-END/d" \
 		-e "/RTNPLUS-BEGIN/d"	-e "/RTNPLUS-END/d" \
 		-e "/RTNPLUS-NO-BEGIN/d" -e "/RTNPLUS-NO-END/d" \
+		-e "/RTAC-BEGIN/d"	-e "/RTAC-END/d" \
 		-e "/RTAC-NO-BEGIN/d"	-e "/RTAC-NO-END/d" \
 		-e "/PROXY-BEGIN/d"	-e "/PROXY-END/d" \
 		-e "/TFTP-BEGIN/d"	-e "/TFTP-END/d" \