diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index e32718a5d3..5531de2794 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -113,6 +113,7 @@ endef
 define U-Boot/Hummingbird_A31
   BUILD_SUBTARGET:=cortexa7
   NAME:=Hummingbird A31 board
+  BUILD_DEVICES:=merrii_hummingbird
 endef
 
 define U-Boot/Marsboard_A10
diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk
index e2d83fa94f..1637cd5d20 100644
--- a/target/linux/sunxi/image/cortexa7.mk
+++ b/target/linux/sunxi/image/cortexa7.mk
@@ -145,6 +145,14 @@ define Device/mele_m9
 endef
 TARGET_DEVICES += mele_m9
 
+define Device/merrii_hummingbird
+  DEVICE_VENDOR := Merrii
+  DEVICE_MODEL := Hummingbird
+  DEVICE_PACKAGES:=kmod-brcmfmac cypress-firmware-43362-sdio wpad-basic-mbedtls
+  SOC := sun6i-a31
+endef
+TARGET_DEVICES += merrii_hummingbird
+
 define Device/olimex_a20-olinuxino-lime
   DEVICE_VENDOR := Olimex
   DEVICE_MODEL := A20-OLinuXino-LIME