Skip to content

Commit 83a1bb7

Browse files
committed
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: openwrt/asu#560 Fixes: openwrt/asu#560 (comment) Fixes: openwrt/asu#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: openwrt#21056 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit ff63c5c)
1 parent a64f028 commit 83a1bb7

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

target/linux/bcm53xx/image/Makefile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -345,39 +345,41 @@ define Device/luxul
345345
IMAGE/lxl := append-ubi | trx-nand | luxul-lxl
346346
endef
347347

348-
define Device/luxul_abr-4500
348+
define Device/luxul_abr-4500-v1
349349
$(Device/luxul)
350350
DEVICE_MODEL := ABR-4500
351351
DEVICE_PACKAGES := $(USB3_PACKAGES)
352+
DEVICE_DTS := bcm47094-luxul-abr-4500
352353
LUXUL_BOARD := ABR-4500
353354
endef
354-
TARGET_DEVICES += luxul_abr-4500
355+
TARGET_DEVICES += luxul_abr-4500-v1
355356

356-
define Device/luxul_xap-1610
357+
define Device/luxul_xap-1610-v1
357358
$(Device/luxul)
358359
DEVICE_MODEL := XAP-1610
359360
DEVICE_PACKAGES := $(BRCMFMAC_4366C0)
361+
DEVICE_DTS := bcm47094-luxul-xap-1610
360362
IMAGE/lxl := append-rootfs | trx-serial | luxul-lxl
361363
LUXUL_BOARD := XAP-1610
362364
endef
363-
TARGET_DEVICES += luxul_xap-1610
365+
TARGET_DEVICES += luxul_xap-1610-v1
364366

365-
define Device/luxul_xbr-4500
367+
define Device/luxul_xbr-4500-v1
366368
$(Device/luxul)
367369
DEVICE_MODEL := XBR-4500
368370
DEVICE_PACKAGES := $(USB3_PACKAGES)
371+
DEVICE_DTS := bcm47094-luxul-xbr-4500
369372
LUXUL_BOARD := XBR-4500
370373
endef
371-
TARGET_DEVICES += luxul_xbr-4500
374+
TARGET_DEVICES += luxul_xbr-4500-v1
372375

373-
define Device/luxul_xwr-3150
376+
define Device/luxul_xwr-3150-v1
374377
$(Device/luxul)
375378
DEVICE_MODEL := XWR-3150
376379
DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
377-
DEVICE_DTS := bcm47094-luxul-xwr-3150-v1
378380
LUXUL_BOARD := XWR-3150
379381
endef
380-
TARGET_DEVICES += luxul_xwr-3150
382+
TARGET_DEVICES += luxul_xwr-3150-v1
381383

382384
define Device/meraki_mr26
383385
DEVICE_VENDOR := Meraki
@@ -464,13 +466,14 @@ define Device/netgear
464466
NETGEAR_REGION := 1
465467
endef
466468

467-
define Device/netgear_r6250
469+
define Device/netgear_r6250-v1
468470
DEVICE_MODEL := R6250
469471
DEVICE_PACKAGES := $(B43) $(USB3_PACKAGES)
472+
DEVICE_DTS := bcm4708-netgear-r6250
470473
$(Device/netgear)
471474
NETGEAR_BOARD_ID := U12H245T00_NETGEAR
472475
endef
473-
TARGET_DEVICES += netgear_r6250
476+
TARGET_DEVICES += netgear_r6250-v1
474477

475478
define Device/netgear_r6300-v2
476479
DEVICE_MODEL := R6300

0 commit comments

Comments
 (0)