diff options
| author | Luis Araneda <luaraneda@gmail.com> | 2017-12-10 19:45:20 -0300 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-12-12 18:47:26 +0100 |
| commit | 575178e4628cf32b97feec66c4a9726b4f30fa88 (patch) | |
| tree | a0b4f3d5385222b9ce20ebbda645af3addf01980 /target/linux/ar71xx/image/mikrotik.mk | |
| parent | 72051f70368b53afa3305e1485c62b7e47fc1210 (diff) | |
| download | upstream-575178e4628cf32b97feec66c4a9726b4f30fa88.tar.gz upstream-575178e4628cf32b97feec66c4a9726b4f30fa88.tar.bz2 upstream-575178e4628cf32b97feec66c4a9726b4f30fa88.zip | |
treewide: add only one device when appending to TARGET_DEVICES
This will avoid some conflicts when doing a git rebase or merge,
specially when adding support to a new device.
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
[drop brcm47xx changes which rename the images]
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/ar71xx/image/mikrotik.mk')
| -rw-r--r-- | target/linux/ar71xx/image/mikrotik.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk index 46d2a3e3a6..8f190875c5 100644 --- a/target/linux/ar71xx/image/mikrotik.mk +++ b/target/linux/ar71xx/image/mikrotik.mk @@ -15,13 +15,14 @@ define Device/nand-64m DEVICE_TITLE := MikroTik RouterBoard (64 MB NAND) KERNEL := kernel-bin | kernel2minor -s 512 -e -c endef +TARGET_DEVICES += nand-64m define Device/nand-large $(Device/mikrotik) DEVICE_TITLE := MikroTik RouterBoard (>= 128 MB NAND) KERNEL := kernel-bin | kernel2minor -s 2048 -e -c endef -TARGET_DEVICES += nand-64m nand-large +TARGET_DEVICES += nand-large define Device/rb-nor-flash-16M DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR) @@ -34,10 +35,11 @@ define Device/rb-nor-flash-16M IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef +TARGET_DEVICES += rb-nor-flash-16M define Device/rb-nor-flash-16M-ac $(Device/rb-nor-flash-16M) DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR, 802.11ac) DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x ath10k-firmware-qca9887 endef -TARGET_DEVICES += rb-nor-flash-16M rb-nor-flash-16M-ac +TARGET_DEVICES += rb-nor-flash-16M-ac |