treewide: update names for OpenWrt 20.xx

Some devices were renamed since the last stable release.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>

bsp/ar71xx-generic.bsp

@@ -1,5 +0,0 @@
-chipset=ar71xx
-subtarget=generic
-images=("openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-*"
-        "openwrt-${chipset}-${subtarget}-cpe510-520-v1-squashfs-*"
-        )

bsp/ar71xx-generic/.config

@@ -1,34 +0,0 @@
-# Generated using "./buildscript config openwrt".
-# Do no edit manually
-#
-CONFIG_TARGET_ar71xx=y
-CONFIG_TARGET_ar71xx_generic=y
-CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220-v1=y
-CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220-v1="-rssileds"
-CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520-v1=y
-CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe510-520-v1="-rssileds"
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_TARGET_PER_DEVICE_ROOTFS=y
-# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
-# CONFIG_BUSYBOX_CONFIG_CROND is not set
-# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_CLEAN_IPKG=y
-# CONFIG_DROPBEAR_CURVE25519 is not set
-# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
-# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
-# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
-# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
-# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
-# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
-# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
-CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
-# CONFIG_PACKAGE_ALFRED_VIS is not set
-CONFIG_PACKAGE_hostapd-mini=y
-CONFIG_PACKAGE_iwinfo=m
-CONFIG_PACKAGE_libiwinfo=m
-CONFIG_PACKAGE_opkg=m
-CONFIG_PACKAGE_wpad-mini=m
-CONFIG_STRIP_KERNEL_EXPORTS=y

bsp/ath79-generic.bsp

@@ -6,8 +6,10 @@ images=("openwrt-${chipset}-${subtarget}-glinet_gl-ar150-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c60-v2-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c7-v2-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_archer-c7-v5-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-tplink_cpe210-v1-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_cpe210-v2-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_cpe210-v3-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-tplink_cpe510-v1-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_tl-wdr3500-v1-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_tl-wdr3600-v1-squashfs-*"
         "openwrt-${chipset}-${subtarget}-tplink_tl-wdr4300-v1-squashfs-*"

bsp/ath79-generic/.config

@@ -16,10 +16,14 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v2=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v2="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v5=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v5="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
+CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v1=y
+CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v1="-rssileds"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v2=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v2="-rssileds"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v3=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v3="-rssileds"
+CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe510-v1=y
+CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe510-v1="-rssileds"
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=y
 CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=""
 CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3600-v1=y

bsp/mpc85xx-generic.bsp

@@ -2,5 +2,5 @@ chipset=mpc85xx
 subtarget=generic
 
 images=(
-        "openwrt-${chipset}-${subtarget}-tl-wdr4900-v1-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-tplink_tl-wdr4900-v1-squashfs-*"
        )

bsp/mpc85xx-generic/.config

@@ -4,8 +4,8 @@
 CONFIG_TARGET_mpc85xx=y
 CONFIG_TARGET_mpc85xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_mpc85xx_generic_DEVICE_tl-wdr4900-v1=y
+CONFIG_TARGET_DEVICE_mpc85xx_generic_DEVICE_tplink_tl-wdr4900-v1=y
-CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_generic_DEVICE_tl-wdr4900-v1=""
+CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_generic_DEVICE_tplink_tl-wdr4900-v1=""
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 # CONFIG_BUSYBOX_CONFIG_BRCTL is not set

bsp/ramips-mt7621.bsp

@@ -2,7 +2,7 @@ chipset=ramips
 subtarget=mt7621
 
 images=(
-        "openwrt-ramips-mt7621-r6220-squashfs-*"
+        "openwrt-ramips-mt7621-netgear_r6220-squashfs-*"
-        "openwrt-ramips-mt7621-ubnt-erx-squashfs-*"
+        "openwrt-ramips-mt7621-ubnt_edgerouter-x-squashfs-*"
-        "openwrt-ramips-mt7621-ubnt-erx-sfp-squashfs-*"
+        "openwrt-ramips-mt7621-ubnt_edgerouter-x-sfp-squashfs-*"
        )

bsp/ramips-mt7621/.config

@@ -4,12 +4,12 @@
 CONFIG_TARGET_ramips=y
 CONFIG_TARGET_ramips_mt7621=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_r6220=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r6220=y
-CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_r6220=""
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_netgear_r6220=""
-CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt_edgerouter-x=y
-CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx=""
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt_edgerouter-x=""
-CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx-sfp=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt_edgerouter-x-sfp=y
-CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx-sfp=""
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt_edgerouter-x-sfp=""
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 # CONFIG_BUSYBOX_CONFIG_BRCTL is not set

bsp/ramips-mt76x8.bsp

@@ -1,6 +1,6 @@
 chipset=ramips
 subtarget=mt76x8
-images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-*"
+images=("openwrt-${chipset}-${subtarget}-tplink_archer-c50-v3-squashfs-*"
-        "openwrt-${chipset}-${subtarget}-tplink_c50-v4-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-tplink_archer-c50-v4-squashfs-*"
-        "openwrt-${chipset}-${subtarget}-tl-wr841n-v13-squashfs-*"
+        "openwrt-${chipset}-${subtarget}-tplink_tl-wr841n-v13-squashfs-*"
         )

bsp/ramips-mt76x8/.config

@@ -4,12 +4,12 @@
 CONFIG_TARGET_ramips=y
 CONFIG_TARGET_ramips_mt76x8=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_c50-v3=y
+CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_archer-c50-v3=y
-CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_c50-v3=""
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_archer-c50-v3=""
-CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_c50-v4=y
+CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_archer-c50-v4=y
-CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_c50-v4=""
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_archer-c50-v4=""
-CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tl-wr841n-v13=y
+CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_tl-wr841n-v13=y
-CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tl-wr841n-v13=""
+CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_tl-wr841n-v13=""
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_TARGET_PER_DEVICE_ROOTFS=y
 # CONFIG_BUSYBOX_CONFIG_BRCTL is not set

src/packages/fff/fff-network/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_RELEASE:=37
+PKG_RELEASE:=38
 
 include $(INCLUDE_DIR)/package.mk
 

src/packages/fff/fff-network/files/lib/functions/fff/cpuport

@@ -7,14 +7,14 @@ get_cpu_port() {
 	local CPUPORT
 
 	case "$BOARD" in
-		tplink,c50-v3|\
+		netgear,r6220|\
-		tplink,c50-v4|\
+		tplink,archer-c50-v3|\
+		tplink,archer-c50-v4|\
 		tplink,tl-wr1043nd-v2|\
 		tplink,tl-wr1043nd-v3|\
-		tl-wr841n-v13|\
+		tplink,tl-wr841n-v13|\
-		r6220|\
+		ubnt,edgerouter-x|\
-		ubnt-erx|\
+		ubnt,edgerouter-x-sfp)
-		ubnt-erx-sfp)
 			CPUPORT="6t"
 			;;
 		tplink,cpe210-v2|\

src/packages/fff/fff-network/files/lib/functions/fff/portorder

@@ -10,7 +10,7 @@ get_port_order() {
 		glinet,gl-ar150)
 			PORTORDER="1"
 			;;
-		r6220)
+		netgear,r6220)
 			PORTORDER="4 3 2 1 0"
 			;;
 		tplink,archer-c25-v1|\
@@ -21,8 +21,8 @@ get_port_order() {
 		tplink,tl-wr841-v12)
 			PORTORDER="4 3 2 1"
 			;;
-		tplink,c50-v4|\
+		tplink,archer-c50-v4|\
-		tl-wr841n-v13)
+		tplink,tl-wr841n-v13)
 			PORTORDER="0 1 2 3 4"
 			;;
 		tplink,archer-c7-v2|\
@@ -35,8 +35,8 @@ get_port_order() {
 		tplink,tl-wr1043n-v5)
 			PORTORDER="5 4 3 2 1"
 			;;
-		cpe210|\
+		tplink,cpe210-v1|\
-		cpe510)
+		tplink,cpe510-v1)
 			PORTORDER="5 4"
 			;;
 		tplink,tl-wr841-v8)

src/packages/fff/fff-support/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-support
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 include $(INCLUDE_DIR)/package.mk