VGV952CJW33-E-IR: Define model without wildcards in scripts.

Also rename lantiq,vgv952cjw33-e-ir* --> arcadyan,vgv952cjw33-e-ir-vpe|arcadyan,vgv952cjw33-e-ir-smp
Quallenauge · Aug 6, 2020 · 2994543 · 2994543
1 parent e959def
commit 2994543
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/package/boot/uboot-envtools/files/lantiq b/package/boot/uboot-envtools/files/lantiq
@@ -30,7 +30,7 @@ buffalo,wbmr-300hpd)
 	[ -n "$idx" ] && \
 		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x2000" "0x1000" "2"
 	;;
-lantiq,vgv952cjw33-e-ir*)
+arcadyan,vgv952cjw33-e-ir-vpe|arcadyan,vgv952cjw33-e-ir-smp)
 	ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x40000" "0x100000" "1"
 	;;
 

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/80_wifi_setup b/target/linux/lantiq/base-files/etc/uci-defaults/80_wifi_setup
@@ -7,7 +7,7 @@
 board=$(board_name)
 
 case "$board" in
-lantiq,vgv952cjw33-e-ir*)
+arcadyan,vgv952cjw33-e-ir-vpe|arcadyan,vgv952cjw33-e-ir-smp)
         wlan_dev=$(uci get network.wlan_dev.name)
         if [ "$wlan_dev" = "eth0.66" ]; then
            echo "wlan seems to intially setup - don't touch config"

diff --git a/target/linux/lantiq/base-files/lib/preinit/06_init_network_lantiq b/target/linux/lantiq/base-files/lib/preinit/06_init_network_lantiq
@@ -6,7 +6,7 @@ set_preinit_misc_lantiq() {
 board=$(board_name)
 
 case "$board" in
-lantiq,vgv952cjw33-e-ir*)
+arcadyan,vgv952cjw33-e-ir-vpe|arcadyan,vgv952cjw33-e-ir-smp)
         # Enable VLAN on lantiq switch
         swconfig dev switch0 vlan 1 set ports "0 1 2 3 4 5 6"
 

diff --git a/target/linux/lantiq/base-files/lib/preinit/85_reset_watchdog_timer_lantiq b/target/linux/lantiq/base-files/lib/preinit/85_reset_watchdog_timer_lantiq
@@ -6,7 +6,7 @@ reset_watchdog_timer_lantiq() {
 board=$(board_name)
 
 case "$board" in
-lantiq,vgv952cjw33-e-ir*)
+arcadyan,vgv952cjw33-e-ir-vpe|arcadyan,vgv952cjw33-e-ir-smp)
         # Add envtools configuration
         if [ -e /etc/uci-defaults/30_uboot-envtools ]; then
                 echo "fw_config is generated now"

diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
@@ -29,7 +29,7 @@ lantiq_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0"
 		;;
-	lantiq,vgv952cjw33-e-ir*)
+	arcadyan,vgv952cjw33-e-ir-vpe|arcadyan,vgv952cjw33-e-ir-smp)
 		lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		ucidef_add_switch "switch0" \

diff --git a/target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh
@@ -9,6 +9,8 @@ platform_do_upgrade() {
 	local board=$(board_name)
 
 	case "$board" in
+	arcadyan,vgv952cjw33-e-ir-vpe|\
+	arcadyan,vgv952cjw33-e-ir-smp|\
 	avm,fritz3370-rev2-hynix|\
 	avm,fritz3370-rev2-micron|\
 	avm,fritz7362sl|\