summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fahlgren2024-12-03 23:17:05 +0000
committerRobert Marko2024-12-22 10:40:58 +0000
commit33e23e8922ce7b7e488c85816c4b1084ae3710b0 (patch)
treeef6a32e017199e14a8c1e007da32e0d4cdf5cf28
parentb651e3223cbbffd86d1b63764032454c571d7c6a (diff)
downloadopenwrt-33e23e8922ce7b7e488c85816c4b1084ae3710b0.tar.gz
build: d1: add SUPPORTED_DEVICES
Include specific SUPPORTED_DEVICES values derived from the .dts file. This makes the generated profiles.json consistent with the 'board_name' from 'ubus call system board'. Specifically, this fixes a bug in the generated profiles.json that breaks the ASU clients when selecting the proper image from a build. See the 'supported_devices' fields here for the incorrect (or incomplete) list: https://downloads.openwrt.org/releases/24.10.0-rc1/targets/d1/generic/profiles.json Links: https://forum.openwrt.org/t/owut-openwrt-upgrade-tool/200035/287 Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com> Link: https://github.com/openwrt/openwrt/pull/17155 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--target/linux/d1/image/Makefile20
1 files changed, 12 insertions, 8 deletions
diff --git a/target/linux/d1/image/Makefile b/target/linux/d1/image/Makefile
index aadf1807e7..8dca2fb1cb 100644
--- a/target/linux/d1/image/Makefile
+++ b/target/linux/d1/image/Makefile
@@ -49,43 +49,47 @@ define Device/FitImage
KERNEL_NAME := Image
endef
-define Device/dongshan_nezha_stu
+define Device/100ask_dongshan-nezha-stu
$(call Device/Default)
DEVICE_VENDOR := Dongshan
DEVICE_MODEL := Nezha STU devkit
DEVICE_DTS := allwinner/sun20i-d1-dongshan-nezha-stu
+ SUPPORTED_DEVICES += dongshan_nezha_stu
UBOOT := dongshan_nezha_stu
endef
-TARGET_DEVICES += dongshan_nezha_stu
+TARGET_DEVICES += 100ask_dongshan-nezha-stu
-define Device/lichee_rv_dock
+define Device/sipeed_lichee-rv-dock
$(call Device/Default)
DEVICE_VENDOR := Sipeed
DEVICE_MODEL := LicheePi RV (dock)
DEVICE_DTS := allwinner/sun20i-d1-lichee-rv-dock
+ SUPPORTED_DEVICES += lichee_rv_dock
DEVICE_PACKAGES += kmod-rtl8723bs
UBOOT := lichee_rv_dock
endef
-TARGET_DEVICES += lichee_rv_dock
+TARGET_DEVICES += sipeed_lichee-rv-dock
-define Device/mangopi_mq_pro
+define Device/widora_mangopi-mq-pro
$(call Device/Default)
DEVICE_VENDOR := MangoPi
DEVICE_MODEL := MQ Pro
DEVICE_DTS := allwinner/sun20i-d1-mangopi-mq-pro
+ SUPPORTED_DEVICES += mangopi_mq_pro
DEVICE_PACKAGES += kmod-rtl8723bs
UBOOT := mangopi_mq_pro
endef
-TARGET_DEVICES += mangopi_mq_pro
+TARGET_DEVICES += widora_mangopi-mq-pro
-define Device/nezha
+define Device/allwinner_d1-nezha
$(call Device/Default)
DEVICE_VENDOR := Nezha
DEVICE_MODEL := D1
DEVICE_DTS := allwinner/sun20i-d1-nezha
+ SUPPORTED_DEVICES += nezha
UBOOT := nezha
endef
-TARGET_DEVICES += nezha
+TARGET_DEVICES += allwinner_d1-nezha
define Image/Build
$(call Image/Build/$(1),$(1))