From 7447eeac91d36f2e67e7da55310676ed7fe0a36d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 10 Sep 2024 04:25:59 +0200 Subject: [PATCH 1/3] ipq40xx: define config-names for Aruba boards Aruba boards now ship with multiple DTS and image-configurations per image. Newer apboot revs expect a configuration for their hardware to be present. Signed-off-by: David Bauer (cherry picked from commit c7ba5574f52f25334add66c15190b578ac873739) --- target/linux/ipq40xx/image/generic.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index af50dc5febf03..33141f7949d43 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -179,12 +179,14 @@ endef define Device/aruba_ap-303 $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-303 + DEVICE_DTS_CONFIG := Glenmorangie@1 endef TARGET_DEVICES += aruba_ap-303 define Device/aruba_ap-303h $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-303H + DEVICE_DTS_CONFIG := Aberlour@1 endef TARGET_DEVICES += aruba_ap-303h @@ -192,6 +194,7 @@ define Device/aruba_ap-365 $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-365 DEVICE_PACKAGES := kmod-hwmon-ad7418 + DEVICE_DTS_CONFIG := Bunker@1 endef TARGET_DEVICES += aruba_ap-365 From ee3efefc5e059773e9fea56f1f65bf39f5d75cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 18 Jul 2024 10:37:38 +0200 Subject: [PATCH 2/3] treewide: fixup models names for UniFi U6 series MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubiquiti has a set of UniFi 802.11ax (Wi-Fi 6) AP devices. All models include "U6" in their names and also have code names with no special characters (including spaces). Examples: 1. U6 Lite (codename U6-Lite) 2. U6 Long-Range (codename U6-LR) 3. U6+ (codename U6-PLUS) 4. U6 Pro (codename U6-Pro) 5. U6 Mesh (codename U6-Mesh) 6. U6 Mesh Pro (codename U6-Mesh-Pro) 7. U6 Enterprise (codename U6-Enterprise) Use proper full names for those devices. Names in OpenWrt/DTS code may need updating too but it can be handled later. Cc: Elbert Mai Cc: Daniel Golle Cc: Henrik Riomar Cc: David Bauer Signed-off-by: Rafał Miłecki (cherry picked from commit 74879140a1aa0b8a8c237e0b67e94c3508e2e249) --- target/linux/mediatek/image/filogic.mk | 2 +- target/linux/mediatek/image/mt7622.mk | 12 ++++++------ target/linux/ramips/image/mt7621.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 42185842b83af..88b279140c4b5 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -852,7 +852,7 @@ TARGET_DEVICES += tplink_tl-xdr6088 define Device/ubnt_unifi-6-plus DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 Plus + DEVICE_MODEL := UniFi U6+ DEVICE_DTS := mt7981a-ubnt-unifi-6-plus DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware e2fsprogs f2fsck mkf2fs fdisk partx-utils diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index ce95be1c0c28e..3b31a880b4fcd 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -357,7 +357,7 @@ TARGET_DEVICES += totolink_a8000ru define Device/ubnt_unifi-6-lr-v1 DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v1 DEVICE_DTS_CONFIG := config@1 DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1 @@ -369,7 +369,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v1 define Device/ubnt_unifi-6-lr-v1-ubootmod DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v1 U-Boot mod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1-ubootmod DEVICE_DTS_DIR := ../dts @@ -388,7 +388,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v1-ubootmod define Device/ubnt_unifi-6-lr-v2 DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v2 DEVICE_DTS_CONFIG := config@1 DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v2 @@ -399,7 +399,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v2 define Device/ubnt_unifi-6-lr-v2-ubootmod DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v2 U-Boot mod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v2-ubootmod DEVICE_DTS_DIR := ../dts @@ -417,7 +417,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v2-ubootmod define Device/ubnt_unifi-6-lr-v3 DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v3 DEVICE_DTS_CONFIG := config@1 DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v3 @@ -428,7 +428,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v3 define Device/ubnt_unifi-6-lr-v3-ubootmod DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v3 U-Boot mod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v3-ubootmod DEVICE_DTS_DIR := ../dts diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index c1fbc40b7ec91..504c56e2b875c 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -2454,7 +2454,7 @@ TARGET_DEVICES += ubnt_edgerouter-x-sfp define Device/ubnt_unifi-6-lite $(Device/dsa-migration) DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 Lite + DEVICE_MODEL := UniFi U6 Lite DEVICE_DTS_CONFIG := config@1 DEVICE_DTS_LOADADDR := 0x87000000 DEVICE_PACKAGES += kmod-mt7603 kmod-mt7915-firmware -uboot-envtools From cc938b18a8e3b640376820ffbd6a70713526790e Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 19 Aug 2024 15:25:10 +0200 Subject: [PATCH 3/3] ucode: fix host installation The path for linking libucode.so was not specified for the ucode binary. This breaks execution of ucode in the host context. Signed-off-by: David Bauer (cherry picked from commit ae42ecaad4e7b4878083f08a2cba6ce511ac6c43) --- package/utils/ucode/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile index cb1ac86832c36..b048dcfcec1dc 100644 --- a/package/utils/ucode/Makefile +++ b/package/utils/ucode/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ucode -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/jow-/ucode.git @@ -25,16 +25,17 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION) +CMAKE_OPTIONS += \ + -DSOVERSION=$(PKG_ABI_VERSION) + -DCMAKE_SKIP_RPATH=FALSE \ + -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" ifeq ($(HOST_OS),Darwin) CMAKE_HOST_OPTIONS += \ - -DCMAKE_SKIP_RPATH=FALSE \ - -DCMAKE_MACOSX_RPATH=1 \ - -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" + -DCMAKE_MACOSX_RPATH=1 else CMAKE_HOST_OPTIONS += \ - -DSOVERSION=$(PKG_ABI_VERSION) + -DUSE_RPATH="${STAGING_DIR_HOSTPKG}/lib" endif CMAKE_HOST_OPTIONS += \