Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-09 02:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bcm53xx: add compat version for dsa migration

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-01-03 10:20:30 +08:00
parent bf48cbd045
commit 93970d10d9
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target/linux/bcm53xx/base-files/etc/uci-defaults/03_dsa_migrate
View File

@ -1,23 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
# Exit if network doesn't contain any swconfig section
uci -q get network.@switch[0] > /dev/null || exit 0
lan_proto="$(uci -q get network.lan.proto)"
lan_ipaddr="$(uci -q get network.lan.ipaddr)"
lan_netmask="$(uci -q get network.lan.netmask)"
wan_proto="$(uci -q get network.wan.proto)"
wan_ipaddr="$(uci -q get network.wan.ipaddr)"
wan_netmask="$(uci -q get network.wan.netmask)"
rm /etc/config/network
config_generate
uci -q batch <<-EOF
set network.lan.proto="$lan_proto"
set network.lan.ipaddr="$lan_ipaddr"
set network.lan.netmask="$lan_netmask"
set network.wan.proto="$wan_proto"
set network.wan.ipaddr="$wan_ipaddr"
set network.wan.netmask="$wan_netmask"
EOF

20
target/linux/bcm53xx/image/Makefile
View File

@ -5,6 +5,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
define Device/dsa-migration
DEVICE_COMPAT_VERSION := 1.1
DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
endef
define Image/Prepare define Image/Prepare
rm -f $(KDIR)/fs_mark rm -f $(KDIR)/fs_mark
echo -ne '\xde\xad\xc0\xde' > $(KDIR)/fs_mark echo -ne '\xde\xad\xc0\xde' > $(KDIR)/fs_mark
@ -138,6 +143,7 @@ define Device/Default
endef endef
define Device/asus define Device/asus
$(Device/dsa-migration)
DEVICE_VENDOR := ASUS DEVICE_VENDOR := ASUS
IMAGES := trx IMAGES := trx
IMAGE/trx := append-ubi | trx-nand | asus-trx IMAGE/trx := append-ubi | trx-nand | asus-trx
@ -189,6 +195,7 @@ TARGET_DEVICES += asus_rt-n18u
# TRX with initramfs kernel. It's not possible right now so let's just build # TRX with initramfs kernel. It's not possible right now so let's just build
# plain initramfs kernel as it may be more useful. # plain initramfs kernel as it may be more useful.
define Device/buffalo/Default define Device/buffalo/Default
$(Device/dsa-migration)
DEVICE_VENDOR := Buffalo DEVICE_VENDOR := Buffalo
KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX) KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
KERNEL_INITRAMFS = $$(KERNEL) KERNEL_INITRAMFS = $$(KERNEL)
@ -237,6 +244,7 @@ endef
TARGET_DEVICES += buffalo_wzr-1750dhp TARGET_DEVICES += buffalo_wzr-1750dhp
define Device/dlink define Device/dlink
$(Device/dsa-migration)
DEVICE_VENDOR := D-Link DEVICE_VENDOR := D-Link
IMAGES := bin IMAGES := bin
IMAGE/bin := append-ubi | seama-nand IMAGE/bin := append-ubi | seama-nand
@ -251,6 +259,7 @@ endef
TARGET_DEVICES += dlink_dir-885l TARGET_DEVICES += dlink_dir-885l
define Device/linksys_ea6300-v1 define Device/linksys_ea6300-v1
$(Device/dsa-migration)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA6300 DEVICE_MODEL := EA6300
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
@ -259,6 +268,7 @@ endef
TARGET_DEVICES += linksys_ea6300-v1 TARGET_DEVICES += linksys_ea6300-v1
define Device/linksys_ea6500-v2 define Device/linksys_ea6500-v2
$(Device/dsa-migration)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA6500 DEVICE_MODEL := EA6500
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
@ -267,6 +277,7 @@ endef
TARGET_DEVICES += linksys_ea6500-v2 TARGET_DEVICES += linksys_ea6500-v2
define Device/linksys_ea9200 define Device/linksys_ea9200
$(Device/dsa-migration)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA9200 DEVICE_MODEL := EA9200
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
@ -275,6 +286,7 @@ endef
TARGET_DEVICES += linksys_ea9200 TARGET_DEVICES += linksys_ea9200
define Device/linksys_ea9500 define Device/linksys_ea9500
$(Device/dsa-migration)
DEVICE_VENDOR := Linksys DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA9500 DEVICE_MODEL := EA9500
DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
@ -283,6 +295,7 @@ endef
TARGET_DEVICES += linksys_ea9500 TARGET_DEVICES += linksys_ea9500
define Device/luxul define Device/luxul
$(Device/dsa-migration)
DEVICE_VENDOR := Luxul DEVICE_VENDOR := Luxul
IMAGES := lxl IMAGES := lxl
IMAGE/lxl := append-ubi | trx-nand | luxul-lxl IMAGE/lxl := append-ubi | trx-nand | luxul-lxl
@ -323,6 +336,7 @@ endef
TARGET_DEVICES += luxul_xwr-3150 TARGET_DEVICES += luxul_xwr-3150
define Device/meraki_mr32 define Device/meraki_mr32
$(Device/dsa-migration)
DEVICE_VENDOR := Meraki DEVICE_VENDOR := Meraki
DEVICE_MODEL := MR32 DEVICE_MODEL := MR32
DEVICE_PACKAGES := $(B43) kmod-i2c-bcm-iproc kmod-i2c-gpio kmod-eeprom-at24 \ DEVICE_PACKAGES := $(B43) kmod-i2c-bcm-iproc kmod-i2c-gpio kmod-eeprom-at24 \
@ -348,6 +362,7 @@ endef
TARGET_DEVICES += meraki_mr32 TARGET_DEVICES += meraki_mr32
define Device/netgear define Device/netgear
$(Device/dsa-migration)
DEVICE_VENDOR := NETGEAR DEVICE_VENDOR := NETGEAR
IMAGES := chk IMAGES := chk
IMAGE/chk := append-ubi | trx-nand | netgear-chk IMAGE/chk := append-ubi | trx-nand | netgear-chk
@ -405,6 +420,7 @@ endef
TARGET_DEVICES += netgear_r8500 TARGET_DEVICES += netgear_r8500
define Device/smartrg_sr400ac define Device/smartrg_sr400ac
$(Device/dsa-migration)
DEVICE_VENDOR := SmartRG DEVICE_VENDOR := SmartRG
DEVICE_MODEL := SR400ac DEVICE_MODEL := SR400ac
DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES) DEVICE_PACKAGES := $(BRCMFMAC_43602A1) $(USB3_PACKAGES)
@ -416,6 +432,7 @@ endef
TARGET_DEVICES += smartrg_sr400ac TARGET_DEVICES += smartrg_sr400ac
define Device/phicomm_k3 define Device/phicomm_k3
$(Device/dsa-migration)
DEVICE_VENDOR := PHICOMM DEVICE_VENDOR := PHICOMM
DEVICE_MODEL := K3 DEVICE_MODEL := K3
DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) luci-app-k3screenctrl DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) luci-app-k3screenctrl
@ -424,6 +441,7 @@ endef
TARGET_DEVICES += phicomm_k3 TARGET_DEVICES += phicomm_k3
define Device/tenda_ac9 define Device/tenda_ac9
$(Device/dsa-migration)
DEVICE_VENDOR := Tenda DEVICE_VENDOR := Tenda
DEVICE_MODEL := AC9 DEVICE_MODEL := AC9
DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES) DEVICE_PACKAGES := $(B43) $(USB2_PACKAGES)
@ -433,6 +451,7 @@ endef
TARGET_DEVICES += tenda_ac9 TARGET_DEVICES += tenda_ac9
define Device/tplink_archer-c5-v2 define Device/tplink_archer-c5-v2
$(Device/dsa-migration)
DEVICE_VENDOR := TP-Link DEVICE_VENDOR := TP-Link
DEVICE_MODEL := Archer C5 DEVICE_MODEL := Archer C5
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
@ -445,6 +464,7 @@ endef
TARGET_DEVICES += tplink_archer-c5-v2 TARGET_DEVICES += tplink_archer-c5-v2
define Device/tplink_archer-c9-v1 define Device/tplink_archer-c9-v1
$(Device/dsa-migration)
DEVICE_VENDOR := TP-Link DEVICE_VENDOR := TP-Link
DEVICE_MODEL := Archer C9 DEVICE_MODEL := Archer C9
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1