From: Piotr Dymacz <pepe2k@gmail.com>
Date: Fri, 7 Jul 2017 16:51:26 +0000 (+0200)
Subject: ar71xx: image: simplify Meraki MR16 device definition
X-Git-Tag: v18.06.0-rc1~2539
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9d07d2dc56a45ac0deb02a3b6ec7cceaaec89091;p=openwrt%2Fstaging%2Fxback.git

ar71xx: image: simplify Meraki MR16 device definition

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
---

diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 5a7a509fbd..3f1486ed63 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -286,21 +286,13 @@ define Device/mr12
   IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE)
   IMAGES := kernel.bin rootfs.bin sysupgrade.bin
 endef
-TARGET_DEVICES += mr12
 
 define Device/mr16
+  $(Device/mr12)
   DEVICE_TITLE := Meraki MR16
-  DEVICE_PACKAGES := kmod-spi-gpio
   BOARDNAME := MR16
-  ROOTFS_SIZE := 13440k
-  IMAGE_SIZE := 15680k
-  MTDPARTS := spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2240k(kernel),64k(mac),128k(art)ro,15680k@0x80000(firmware)
-  IMAGE/kernel.bin := append-kernel
-  IMAGE/rootfs.bin := append-rootfs | pad-rootfs
-  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE)
-  IMAGES := kernel.bin rootfs.bin sysupgrade.bin
 endef
-TARGET_DEVICES += mr16
+TARGET_DEVICES += mr12 mr16
 
 define Device/dr344
   DEVICE_TITLE := Wallys DR344