diff options
| author | Mario Andrés Pérez | 2025-12-06 01:44:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-12-06 17:55:49 +0000 |
| commit | ff63c5cd82a555df553bdfa42f1630399fb5e019 (patch) | |
| tree | 11f6b6b789165c48aeaf5e3eb1bbb7fbb7b09ee9 | |
| parent | 6c0ef7d4c813842d40dc95ac5606c38c75151684 (diff) | |
| download | openwrt-ff63c5cd82a555df553bdfa42f1630399fb5e019.tar.gz | |
bcm53xx: image: sync targets names with DT compatible
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]: https://github.com/openwrt/openwrt/blob/09e7b24ceb5d9310334c4f88327dc6d58052e7fd/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
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | target/linux/bcm53xx/image/Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 08ed88382d..17ccdeb275 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -345,39 +345,41 @@ define Device/luxul IMAGE/lxl := append-ubi | trx-nand | luxul-lxl endef -define Device/luxul_abr-4500 +define Device/luxul_abr-4500-v1 $(Device/luxul) DEVICE_MODEL := ABR-4500 DEVICE_PACKAGES := $(USB3_PACKAGES) + DEVICE_DTS := bcm47094-luxul-abr-4500 LUXUL_BOARD := ABR-4500 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_MODEL := XAP-1610 DEVICE_PACKAGES := $(BRCMFMAC_4366C0) + DEVICE_DTS := bcm47094-luxul-xap-1610 IMAGE/lxl := append-rootfs | trx-serial | luxul-lxl LUXUL_BOARD := XAP-1610 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_MODEL := XBR-4500 DEVICE_PACKAGES := $(USB3_PACKAGES) + DEVICE_DTS := bcm47094-luxul-xbr-4500 LUXUL_BOARD := XBR-4500 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_MODEL := XWR-3150 DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) - DEVICE_DTS := bcm47094-luxul-xwr-3150-v1 LUXUL_BOARD := XWR-3150 endef -TARGET_DEVICES += luxul_xwr-3150 +TARGET_DEVICES += luxul_xwr-3150-v1 define Device/meraki_mr26 DEVICE_VENDOR := Meraki @@ -464,13 +466,14 @@ define Device/netgear NETGEAR_REGION := 1 endef -define Device/netgear_r6250 +define Device/netgear_r6250-v1 DEVICE_MODEL := R6250 DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES) + DEVICE_DTS := bcm4708-netgear-r6250 $(Device/netgear) NETGEAR_BOARD_ID := U12H245T00_NETGEAR endef -TARGET_DEVICES += netgear_r6250 +TARGET_DEVICES += netgear_r6250-v1 define Device/netgear_r6300-v2 DEVICE_MODEL := R6300 |