apm821xx: Merge the Cisco Meraki MX60 & MX60W

Both of these boards share the same DTS, and hardware. The only
difference would be the PCI-E slot, and ath9k card found on the MX60W.
Due to the similarities, it would be more efficient to merge these
profiles.

Signed-off-by: Chris Blake <chrisrblake93@gmail.com>
This commit is contained in:
Chris Blake 2017-03-31 04:32:55 -05:00 committed by Felix Fietkau
parent d1c3a9485a
commit 8f43ba8c48

View file

@ -88,7 +88,7 @@ endef
TARGET_DEVICES += mr24
define Device/mx60
DEVICE_TITLE := Cisco Meraki MX60
DEVICE_TITLE := Cisco Meraki MX60/MX60W
DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
kmod-usb-storage block-mount
DEVICE_PROFILE := MX60
@ -112,12 +112,6 @@ define Device/mx60
endef
TARGET_DEVICES += mx60
define Device/mx60w
$(Device/mx60)
DEVICE_TITLE := Cisco Meraki MX60W
endef
TARGET_DEVICES += mx60w
define Build/create-uImage-dtb
# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \