maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm53xx: image: sync targets names with DT compatible

Browse Source 
Some devices profile names and *.dts files are named without suffix
"-v1" but the DT compatible has the suffix. (xwr-3150 exception)

This breaks ASU sysupgrades since the default SUPPORTED_DEVICES is the
makefile image profile target and it does not match the actual DT
compatible sent by the ASU client.

This is not breaking sysupgrade because the platform implementation
does not depends on DEVICE_NAME(not use sysupgrade-TAR). And the
board_name() checks are done against the correct DT compatible.[1]

[1]: 09e7b24ceb/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh (L36-L62)
Fixes: https://github.com/openwrt/asu/issues/560
Fixes: https://github.com/openwrt/asu/issues/560#issuecomment-2083236275
Fixes: https://github.com/openwrt/asu/issues/1108
Fixes: https://forum.openwrt.org/t/luci-attended-sysupgrade-support-thread/230552/243
Fixes: c459a6b "bcm53xx: add support for Luxul FullMAC WiFi devices"
Fixes: 1d47f81 "bcm53xx: build images for Luxul ABR-4500 and XBR-4500 routers"
Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/21056
(cherry picked from commit ff63c5cd82a555df553bdfa42f1630399fb5e019)
Link: https://github.com/openwrt/openwrt/pull/22829
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit c77f9c834d10703b5a84d30aadc14c69a8dc4cfc)
This commit is contained in:
Mario Andrés Pérez 2025-12-06 02:44:18 +01:00 committed by ahmed sassi
parent 1a0453e795
commit fdc998ee43
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,39 +345,41 @@ define Device/luxul
IMAGE/lxl := append-ubi | trx-nand | luxul-lxl IMAGE/lxl := append-ubi | trx-nand | luxul-lxl
endef endef
define Device/luxul_abr-4500 define Device/luxul_abr-4500-v1
$(Device/luxul) $(Device/luxul)
DEVICE_MODEL := ABR-4500 DEVICE_MODEL := ABR-4500
DEVICE_PACKAGES := $(USB3_PACKAGES) DEVICE_PACKAGES := $(USB3_PACKAGES)
DEVICE_DTS := bcm47094-luxul-abr-4500
LUXUL_BOARD := ABR-4500 LUXUL_BOARD := ABR-4500
endef endef
TARGET_DEVICES += luxul_abr-4500 TARGET_DEVICES += luxul_abr-4500-v1
define Device/luxul_xap-1610 define Device/luxul_xap-1610-v1
$(Device/luxul) $(Device/luxul)
DEVICE_MODEL := XAP-1610 DEVICE_MODEL := XAP-1610
DEVICE_PACKAGES := $(BRCMFMAC_4366C0) DEVICE_PACKAGES := $(BRCMFMAC_4366C0)
DEVICE_DTS := bcm47094-luxul-xap-1610
IMAGE/lxl := append-rootfs | trx-serial | luxul-lxl IMAGE/lxl := append-rootfs | trx-serial | luxul-lxl
LUXUL_BOARD := XAP-1610 LUXUL_BOARD := XAP-1610
endef endef
TARGET_DEVICES += luxul_xap-1610 TARGET_DEVICES += luxul_xap-1610-v1
define Device/luxul_xbr-4500 define Device/luxul_xbr-4500-v1
$(Device/luxul) $(Device/luxul)
DEVICE_MODEL := XBR-4500 DEVICE_MODEL := XBR-4500
DEVICE_PACKAGES := $(USB3_PACKAGES) DEVICE_PACKAGES := $(USB3_PACKAGES)
DEVICE_DTS := bcm47094-luxul-xbr-4500
LUXUL_BOARD := XBR-4500 LUXUL_BOARD := XBR-4500
endef endef
TARGET_DEVICES += luxul_xbr-4500 TARGET_DEVICES += luxul_xbr-4500-v1
define Device/luxul_xwr-3150 define Device/luxul_xwr-3150-v1
$(Device/luxul) $(Device/luxul)
DEVICE_MODEL := XWR-3150 DEVICE_MODEL := XWR-3150
DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
DEVICE_DTS := bcm47094-luxul-xwr-3150-v1
LUXUL_BOARD := XWR-3150 LUXUL_BOARD := XWR-3150
endef endef
TARGET_DEVICES += luxul_xwr-3150 TARGET_DEVICES += luxul_xwr-3150-v1
define Device/meraki_mr26 define Device/meraki_mr26
DEVICE_VENDOR := Meraki DEVICE_VENDOR := Meraki
@ -464,13 +466,14 @@ define Device/netgear
NETGEAR_REGION := 1 NETGEAR_REGION := 1
endef endef
define Device/netgear_r6250 define Device/netgear_r6250-v1
DEVICE_MODEL := R6250 DEVICE_MODEL := R6250
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
DEVICE_DTS := bcm4708-netgear-r6250
$(Device/netgear) $(Device/netgear)
NETGEAR_BOARD_ID := U12H245T00_NETGEAR NETGEAR_BOARD_ID := U12H245T00_NETGEAR
endef endef
TARGET_DEVICES += netgear_r6250 TARGET_DEVICES += netgear_r6250-v1
define Device/netgear_r6300-v2 define Device/netgear_r6300-v2
DEVICE_MODEL := R6300 DEVICE_MODEL := R6300