diff

diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 20cb2f60fa..038cfb3bad 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -258,3 +258,27 @@ define Device/zyxel_nbg6716
   DEFAULT := n
 endef
 TARGET_DEVICES += zyxel_nbg6716
+
+define Device/asus_rt_ac55u
+  SOC := qca9557
+  DEVICE_VENDOR := ASUS
+  DEVICE_MODEL := RT-AC55U
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb3 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+        ath10k-firmware-qca988x-ct
+  RAS_BOARD := RT-AC55U
+  RAS_ROOTFS_SIZE := 29696k
+  RAS_VERSION := "OpenWrt Linux-$(LINUX_VERSION)"
+  KERNEL := kernel-bin | append-dtb | uImage none | zyxel-buildkerneljffs | \
+        check-size 4096k
+  IMAGES := sysupgrade.tar sysupgrade-4M-Kernel.bin factory.bin
+  IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | \
+        sysupgrade-tar rootfs=$$$$@ | append-metadata
+  IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | \
+        pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
+        zyxel-factory
+  UBINIZE_OPTS := -E 5

   DEFAULT := n
 endef
 TARGET_DEVICES += zyxel_nbg6716
+
+define Device/asus_rt_ac55u
+  SOC := qca9557
+  DEVICE_VENDOR := ASUS
+  DEVICE_MODEL := RT-AC55U
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb3 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+        ath10k-firmware-qca988x-ct
+  RAS_BOARD := RT-AC55U
+  RAS_ROOTFS_SIZE := 29696k
+  RAS_VERSION := "OpenWrt Linux-$(LINUX_VERSION)"
+  KERNEL := kernel-bin | append-dtb | uImage none | zyxel-buildkerneljffs | \
+        check-size 4096k
+  IMAGES := sysupgrade.tar sysupgrade-4M-Kernel.bin factory.bin
+  IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | \
+        sysupgrade-tar rootfs=$$$$@ | append-metadata
+  IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | \
+        pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
+        zyxel-factory
+  UBINIZE_OPTS := -E 5
+  DEFAULT := n
+endef
+TARGET_DEVICES += asus_rt_ac55u
+
diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network
index 7402fc067a..95468661cf 100644
--- a/target/linux/ath79/nand/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network
@@ -54,8 +54,10 @@ ath79_setup_macs()
        netgear,wndr4500-v3)
                wan_mac=$(mtd_get_mac_binary caldata 0x6)
                ;;
+         asus,rt-ac55u)
+                wan_mac=$(mtd_get_mac_binary_ubi "factory" 0x1002)
+               ;;
        esac
-
        [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
        [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
        [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index f8cc8f1a2b..def0c55b30 100644
--- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -9,6 +9,10 @@ board=$(board_name)
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:00:00.0.bin")
        case $board in
+       asus,rt-ac55u)
+               caldata_extract "caldata" 0x5000 0x844
+               ath10k_patch_mac $(mtf_get_mac_binary_ubi factory 0x1002)
+               ;;
        domywifi,dw33d)
                caldata_extract "art" 0x5000 0x844
                ath10k_patch_mac $(mtd_get_mac_binary art 0x12)