From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Tue, 18 Feb 2025 17:57:53 +0000 (+0100)
Subject: sunxi: add support for Merrii Hummingbird A31
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1152af3490cacbc05df2d862030e00ff2eeb3b36;p=openwrt%2Fopenwrt.git

sunxi: add support for Merrii Hummingbird A31

Specifications:
 - SoC: Allwinner A31 @ 1GHz
 - DRAM: 1/2Gb DDR3
 - SD-card slot
 - NAND: 8/16Gb MLC
 - Ethernet: 1x 10/100/1000Mbps (RTL8211E)
 - Wireless: Ampak AP6210 (BCM43362)
 - 2x USB2.0
 - 1x mPCIe slot for 4G cards
 - 1x SIM slot
 - HDMI/VGA via simplefb
 - RTC with battery
 - Power via DC12V / 3A

Installation:
Use the standard sunxi installation to an SD-card. NAND is
not supported.

This is to re-add proper support for an older device.

Link: https://openwrt.org/toh/merrii/hummingbird
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---

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