mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ramips: fix image validation errors

Browse Source 
The name from the Device define will be used in the metadata. Due to
typos/different spelling, this name might not match the one exported in
/lib/ramips.sh.

Fix all name mismatches which were found by checking if the name used
in the metadata exists in /lib/ramips.sh.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-12-01 07:37:03 +01:00
parent ae3ac76e56
commit d2b6bf1416
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ramips/base-files/lib/ramips.sh
View File

@ -260,7 +260,7 @@ ramips_board_detect() {
name="m2m" name="m2m"
;; ;;
*"Mercury MAC1200R v2") *"Mercury MAC1200R v2")
name="mac1200rv2" name="mac1200r-v2"
;; ;;
*"MicroWRT") *"MicroWRT")
name="microwrt" name="microwrt"

2
target/linux/ramips/image/mt7620.mk
View File

@ -43,6 +43,7 @@ endef
define Device/ArcherC20i define Device/ArcherC20i
DTS := ArcherC20i DTS := ArcherC20i
SUPPORTED_DEVICES := c20i
KERNEL := $(KERNEL_DTB) KERNEL := $(KERNEL_DTB)
KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC20i -c KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC20i -c
IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC20i -j | append-metadata IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC20i -j | append-metadata
@ -52,6 +53,7 @@ TARGET_DEVICES += ArcherC20i
define Device/ArcherC50 define Device/ArcherC50
DTS := ArcherC50 DTS := ArcherC50
SUPPORTED_DEVICES := c50
KERNEL := $(KERNEL_DTB) KERNEL := $(KERNEL_DTB)
KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC50 -c KERNEL_INITRAMFS := $(KERNEL_DTB) | tplink-header ArcherC50 -c
IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC50 -j | append-metadata IMAGE/sysupgrade.bin := append-kernel | tplink-header ArcherC50 -j | append-metadata

4
target/linux/ramips/image/rt288x.mk
View File

@ -27,14 +27,14 @@ define Device/ar725w
endef endef
TARGET_DEVICES += ar725w TARGET_DEVICES += ar725w
define Device/f5d8235v1 define Device/f5d8235-v1
DTS := F5D8235_V1 DTS := F5D8235_V1
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
DEVICE_TITLE := Belkin F5D8235 V1 DEVICE_TITLE := Belkin F5D8235 V1
DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-core kmod-usb-ohci \ DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-core kmod-usb-ohci \
kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport
endef endef
TARGET_DEVICES += f5d8235v1 TARGET_DEVICES += f5d8235-v1
define Device/rt-n15 define Device/rt-n15
DTS := RT-N15 DTS := RT-N15

20
target/linux/ramips/image/rt305x.mk
View File

@ -94,12 +94,12 @@ endef
TARGET_DEVICES += atp-52b TARGET_DEVICES += atp-52b
define Device/f5d8235v2 define Device/f5d8235-v2
DTS := F5D8235_V2 DTS := F5D8235_V2
IMAGE_SIZE := 7744k IMAGE_SIZE := 7744k
DEVICE_TITLE := Belkin F5D8235 v2 DEVICE_TITLE := Belkin F5D8235 v2
endef endef
TARGET_DEVICES += f5d8235v2 TARGET_DEVICES += f5d8235-v2
define Device/f7c027 define Device/f7c027
@ -127,13 +127,13 @@ endef
TARGET_DEVICES += awm003-evb TARGET_DEVICES += awm003-evb
define Device/awmapn2403 define Device/awapn2403
DTS := AWAPN2403 DTS := AWAPN2403
BLOCKSIZE := 4k BLOCKSIZE := 4k
IMAGE_SIZE := $(ralink_default_fw_size_4M) IMAGE_SIZE := $(ralink_default_fw_size_4M)
DEVICE_TITLE := AsiaRF AWAPN2403 DEVICE_TITLE := AsiaRF AWAPN2403
endef endef
TARGET_DEVICES += awmapn2403 TARGET_DEVICES += awapn2403
define Device/bc2 define Device/bc2
@ -316,13 +316,13 @@ endef
TARGET_DEVICES += mzk-wdpr TARGET_DEVICES += mzk-wdpr
define Device/ncs601W define Device/ncs601w
DTS := NCS601W DTS := NCS601W
DEVICE_TITLE := Wansview NCS601W DEVICE_TITLE := Wansview NCS601W
DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \ DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
kmod-usb-core kmod-usb-ohci kmod-usb-core kmod-usb-ohci
endef endef
TARGET_DEVICES += ncs601W TARGET_DEVICES += ncs601w
define Device/m2m define Device/m2m
@ -444,13 +444,13 @@ endef
TARGET_DEVICES += w502u TARGET_DEVICES += w502u
define Device/wcr150gn define Device/wcr-150gn
DTS := WCR150GN DTS := WCR150GN
BLOCKSIZE := 64k BLOCKSIZE := 64k
IMAGE_SIZE := $(ralink_default_fw_size_4M) IMAGE_SIZE := $(ralink_default_fw_size_4M)
DEVICE_TITLE := Sparklan WCR-150GN DEVICE_TITLE := Sparklan WCR-150GN
endef endef
TARGET_DEVICES += wcr150gn TARGET_DEVICES += wcr-150gn
define Device/mzk-dp150n define Device/mzk-dp150n
@ -463,12 +463,12 @@ endef
TARGET_DEVICES += mzk-dp150n TARGET_DEVICES += mzk-dp150n
define Device/wizard-8800 define Device/wizard8800
DTS := WIZARD8800 DTS := WIZARD8800
UIMAGE_NAME:= Linux Kernel Image UIMAGE_NAME:= Linux Kernel Image
DEVICE_TITLE := EasyAcc WIZARD 8800 DEVICE_TITLE := EasyAcc WIZARD 8800
endef endef
TARGET_DEVICES += wizard-8800 TARGET_DEVICES += wizard8800
define Device/wizfi630a define Device/wizfi630a