X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2Fmikrotik.mk;h=dc0066d6e25698e319f5ffb15e599cb850640dbc;hb=29934e5f0373a7f06c02c3bd6b23fd47cbd48ca2;hp=9b33885e9c15cc94bf88266941f155b7fa99751a;hpb=540edf704501db3ec8dcb278a7f1df52de222ae0;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk
index 9b33885e9c..dc0066d6e2 100644
--- a/target/linux/ar71xx/image/mikrotik.mk
+++ b/target/linux/ar71xx/image/mikrotik.mk
@@ -1,6 +1,6 @@
 define Device/mikrotik
   PROFILES := Default
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport nand-utils
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
   BOARD_NAME := routerboard
   KERNEL_INITRAMFS :=
   KERNEL_NAME := loader-generic.elf
@@ -11,35 +11,45 @@ define Device/mikrotik
 endef
 
 define Device/nand-64m
-  DEVICE_TITLE := MikroTik RouterBoard with 64 MB NAND flash
-$(Device/mikrotik)
+  $(Device/mikrotik)
+  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_TITLE := MikroTik RouterBoard with >= 128 MB NAND flash
-$(Device/mikrotik)
+  $(Device/mikrotik)
+  DEVICE_TITLE := MikroTik RouterBoard (>= 128 MB NAND)
   KERNEL := kernel-bin | kernel2minor -s 2048 -e -c
 endef
+TARGET_DEVICES += nand-large
 
-TARGET_DEVICES += nand-64m nand-large
+define Device/nand-large-ac
+  $(Device/mikrotik)
+  DEVICE_TITLE := MikroTik RouterBoard (>= 128 MB NAND, 802.11ac)
+  DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x
+  KERNEL := kernel-bin | kernel2minor -s 2048 -e -c
+  SUPPORTED_DEVICES := rb-921gs-5hpacd-r2
+endef
+TARGET_DEVICES += nand-large-ac
 
 define Device/rb-nor-flash-16M
-  DEVICE_TITLE := MikroTik RouterBoard with 16 MB SPI NOR flash
-  DEVICE_PACKAGES := rbcfg rssileds
+  DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR)
+  DEVICE_PACKAGES := rbcfg rssileds -nand-utils kmod-ledtrig-gpio
   IMAGE_SIZE := 16000k
   LOADER_TYPE := elf
   KERNEL_INSTALL := 1
   KERNEL := kernel-bin | lzma | loader-kernel
-  SUPPORTED_DEVICES := rb-750-r2 rb-750up-r2 rb-941-2nd rb-951ui-2nd rb-952ui-5ac2nd rb-lhg-5nd rb-mapl-2nd
-  IMAGE/sysupgrade.bin = append-kernel | kernel2minor -s 1024 -e | pad-to $$$$(BLOCKSIZE) | \
+  SUPPORTED_DEVICES := rb-750-r2 rb-750up-r2 rb-750p-pbr2 rb-911-2hn rb-911-5hn rb-941-2nd rb-951ui-2nd rb-952ui-5ac2nd rb-962uigs-5hact2hnt rb-lhg-5nd rb-map-2nd rb-mapl-2nd rb-wap-2nd
+  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 with 16 MB SPI NOR flash and ac
-  DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x ath10k-firmware-qca9887
+  DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR, 802.11ac)
+  DEVICE_PACKAGES += kmod-ath10k ath10k-firmware-qca988x ath10k-firmware-qca9887 kmod-usb-ehci
+  SUPPORTED_DEVICES += rb-wapg-5hact2hnd
 endef
-
-TARGET_DEVICES += rb-nor-flash-16M rb-nor-flash-16M-ac
+TARGET_DEVICES += rb-nor-flash-16M-ac