X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2Fmikrotik.mk;h=8f7d7cce988964d8bea7a632f9cc4f27f6d02f81;hb=8c5702f2a07cebfbee6f9e628b63d88b8806ca1b;hp=bcfa768dd797beb359379c4e78c08177ab397874;hpb=c59fa94eeecf16c79254ab4bc78f5b31c7387039;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk
index bcfa768dd7..8f7d7cce98 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,36 +11,33 @@ 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
 
 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-64m nand-large
 
 define Device/rb-nor-flash-16M
-  DEVICE_TITLE := MikroTik RouterBoard with 16 MB SPI NOR flash
-  DEVICE_PACKAGES := rbcfg
-  BLOCKSIZE := 64k
+  DEVICE_TITLE := MikroTik RouterBoard (16 MB SPI NOR)
+  DEVICE_PACKAGES := rbcfg rssileds -nand-utils
   IMAGE_SIZE := 16000k
   LOADER_TYPE := elf
   KERNEL_INSTALL := 1
-  KERNEL := kernel-bin | lzma | loader-kernel | kernel2minor -s 1024 -e
-  KERNEL_INITRAMFS := kernel-bin | lzma | loader-kernel
-  IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin = append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE)
+  KERNEL := kernel-bin | lzma | loader-kernel
+  SUPPORTED_DEVICES := rb-750-r2 rb-750up-r2 rb-750p-pbr2 rb-941-2nd rb-951ui-2nd rb-952ui-5ac2nd rb-962uigs-5hact2hnt rb-lhg-5nd rb-mapl-2nd
+  IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | pad-to $$$$(BLOCKSIZE) | \
+	append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
 
-define Device/rb-941-2nd
-$(Device/rb-nor-flash-16M)
-  DEVICE_TITLE := hAP lite
-  BOARDNAME:= rb-941-2nd
+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-941-2nd
+TARGET_DEVICES += rb-nor-flash-16M rb-nor-flash-16M-ac