KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: sync image filename with boardname

Browse source 
Use <manufacturer>_<modelname> as image name for board using the
devicetree compat string as boardname.

Replace the underline of the device define, to keep the SUPPORTED_DEVICES
in sync with a devicetree compat string based boardname.

Override the default SUPPORTED_DEVICES for board which are having an
userspace boardname with an underline.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2017-12-17 00:30:21 +01:00
parent 7d3ec5f833
commit 6545c71d2c
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ramips/image/Makefile
View file

@ -39,7 +39,7 @@ define Device/Default
DEVICE_DTS_DIR := ../dts DEVICE_DTS_DIR := ../dts
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
IMAGE_SIZE := $(ralink_default_fw_size_8M) IMAGE_SIZE := $(ralink_default_fw_size_8M)
SUPPORTED_DEVICES = $(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs sysupgrade_bin := append-kernel | append-rootfs | pad-rootfs
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
endef endef

6
target/linux/ramips/image/mt7620.mk
View file

@ -252,6 +252,7 @@ define Device/kng_rc
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
zyimage -d 8997 -v "ZyXEL Keenetic Viva" zyimage -d 8997 -v "ZyXEL Keenetic Viva"
SUPPORTED_DEVICES := kng_rc
endef endef
TARGET_DEVICES += kng_rc TARGET_DEVICES += kng_rc
@ -262,6 +263,7 @@ define Device/kn_rc
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
zyimage -d 4882 -v "ZyXEL Keenetic Omni" zyimage -d 4882 -v "ZyXEL Keenetic Omni"
SUPPORTED_DEVICES := kn_rc
endef endef
TARGET_DEVICES += kn_rc TARGET_DEVICES += kn_rc
@ -272,6 +274,7 @@ define Device/kn_rf
IMAGES += factory.bin IMAGES += factory.bin
IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \ IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
zyimage -d 2102034 -v "ZyXEL Keenetic Omni II" zyimage -d 2102034 -v "ZyXEL Keenetic Omni II"
SUPPORTED_DEVICES := kn_rf
endef endef
TARGET_DEVICES += kn_rf TARGET_DEVICES += kn_rf
@ -313,18 +316,21 @@ TARGET_DEVICES += mt7620a
define Device/mt7620a_mt7530 define Device/mt7620a_mt7530
DTS := MT7620a_MT7530 DTS := MT7620a_MT7530
DEVICE_TITLE := MediaTek MT7620a + MT7530 EVB DEVICE_TITLE := MediaTek MT7620a + MT7530 EVB
SUPPORTED_DEVICES := mt7620a_mt7530
endef endef
TARGET_DEVICES += mt7620a_mt7530 TARGET_DEVICES += mt7620a_mt7530
define Device/mt7620a_mt7610e define Device/mt7620a_mt7610e
DTS := MT7620a_MT7610e DTS := MT7620a_MT7610e
DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
SUPPORTED_DEVICES := mt7620a_mt7610e
endef endef
TARGET_DEVICES += mt7620a_mt7610e TARGET_DEVICES += mt7620a_mt7610e
define Device/mt7620a_v22sg define Device/mt7620a_v22sg
DTS := MT7620a_V22SG DTS := MT7620a_V22SG
DEVICE_TITLE := MediaTek MT7620a V22SG DEVICE_TITLE := MediaTek MT7620a V22SG
SUPPORTED_DEVICES := mt7620a_v22sg
endef endef
TARGET_DEVICES += mt7620a_v22sg TARGET_DEVICES += mt7620a_v22sg

5
target/linux/ramips/image/mt7621.mk
View file

@ -329,16 +329,15 @@ define Device/zbt-we1326
endef endef
TARGET_DEVICES += zbt-we1326 TARGET_DEVICES += zbt-we1326
define Device/zbt-we3526 define Device/zbtlink_zbt-we3526
DTS := ZBT-WE3526 DTS := ZBT-WE3526
IMAGE_SIZE := $(ralink_default_fw_size_16M) IMAGE_SIZE := $(ralink_default_fw_size_16M)
SUPPORTED_DEVICES := zbtlink,zbt-we3526
DEVICE_TITLE := ZBT WE3526 DEVICE_TITLE := ZBT WE3526
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \ kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini kmod-usb3 kmod-usb-ledtrig-usbport wpad-mini
endef endef
TARGET_DEVICES += zbt-we3526 TARGET_DEVICES += zbtlink_zbt-we3526
define Device/zbt-wg2626 define Device/zbt-wg2626
DTS := ZBT-WG2626 DTS := ZBT-WG2626