[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: rockchip: switch to use armbian fw for Armsom Sige1 armbian-firmware: add new package rockchip: add Radxa ROCK 5C / 5C Lite support rockchip: add FriendlyARM NanoPC T6 support rockchip: add FriendlyARM NanoPi R6C support rockchip: add FriendlyARM NanoPi R6S support
YWBG-SYL · Aug 14, 2024 · 7e1469f · 7e1469f
2 parents a6d1a32 + 2995b92
commit 7e1469f
Show file tree

Hide file tree

Showing 2 changed files with 167 additions and 0 deletions.
diff --git a/package/firmware/armbian-firmware/Makefile b/package/firmware/armbian-firmware/Makefile
@@ -0,0 +1,134 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=armbian-firmware
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2024-06-26
+PKG_SOURCE_URL:=https://github.com/armbian/firmware.git
+PKG_SOURCE_VERSION:=7f2e18ecac75d50acb843395ad07a0f2b9a12a50
+PKG_MIRROR_HASH:=9967883add1587fb178e3b1a9aecec8e03b67f3554af63b294b771f67b88c934
+
+include $(INCLUDE_DIR)/package.mk
+
+RSTRIP:=:
+STRIP:=:
+
+define Package/armbian-firmware-default
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  URL:=https://github.com/armbian/firmware
+  TITLE:=$(1)
+  DEPENDS:=$(2)
+endef
+
+define Build/Compile
+endef
+
+Package/brcmfmac-firmware-4356-sdio = $(call Package/armbian-firmware-default,Broadcom BCM4356 FullMac SDIO firmware)
+define Package/brcmfmac-firmware-4356-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/BCM4356A2.hcd \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac4356-sdio.bin \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac4356-sdio.clm_blob \
+		$(1)/lib/firmware/brcm/
+endef
+$(eval $(call BuildPackage,brcmfmac-firmware-4356-sdio))
+
+Package/brcmfmac-firmware-43456-sdio = $(call Package/armbian-firmware-default,Broadcom BCM43456 FullMac SDIO firmware)
+define Package/brcmfmac-firmware-43456-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43456-sdio.bin \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43456-sdio.clm_blob \
+		$(1)/lib/firmware/brcm/
+endef
+$(eval $(call BuildPackage,brcmfmac-firmware-43456-sdio))
+
+Package/brcmfmac-firmware-43752-pcie = $(call Package/armbian-firmware-default,Broadcom BCM43752 FullMac PCIe firmware)
+define Package/brcmfmac-firmware-43752-pcie/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/BCM4362A2.hcd \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43752-pcie.bin \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43752-pcie.clm_blob \
+		$(1)/lib/firmware/brcm/
+endef
+$(eval $(call BuildPackage,brcmfmac-firmware-43752-pcie))
+
+Package/brcmfmac-firmware-43752-sdio = $(call Package/armbian-firmware-default,Broadcom BCM43752 FullMac SDIO firmware)
+define Package/brcmfmac-firmware-43752-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/BCM4362A2.hcd \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43752-sdio.bin \
+		$(1)/lib/firmware/brcm/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43752-sdio.clm_blob \
+		$(1)/lib/firmware/brcm/
+endef
+$(eval $(call BuildPackage,brcmfmac-firmware-43752-sdio))
+
+Package/brcmfmac-nvram-4356-sdio = $(call Package/armbian-firmware-default,Broadcom BCM4356 SDIO NVRAM firmware)
+define Package/brcmfmac-nvram-4356-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac4356-sdio.txt \
+		$(1)/lib/firmware/brcm/
+	$(LN) \
+		brcmfmac4356-sdio.txt \
+		$(1)/lib/firmware/brcm/brcmfmac4356-sdio.friendlyarm,nanopc-t4.txt
+endef
+$(eval $(call BuildPackage,brcmfmac-nvram-4356-sdio))
+
+Package/brcmfmac-nvram-43456-sdio = $(call Package/armbian-firmware-default,Broadcom BCM43456 SDIO NVRAM firmware)
+define Package/brcmfmac-nvram-43456-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43456-sdio.txt \
+		$(1)/lib/firmware/brcm/
+	$(LN) \
+		brcmfmac43456-sdio.txt \
+		$(1)/lib/firmware/brcm/brcmfmac43456-sdio.radxa,rockpi4a.txt
+endef
+$(eval $(call BuildPackage,brcmfmac-nvram-43456-sdio))
+
+Package/brcmfmac-nvram-43752-pcie = $(call Package/armbian-firmware-default,Broadcom BCM43752 PCIe NVRAM firmware)
+define Package/brcmfmac-nvram-43752-pcie/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43752-pcie.txt \
+		$(1)/lib/firmware/brcm/
+	$(LN) \
+		brcmfmac43752-pcie.txt \
+		$(1)/lib/firmware/brcm/brcmfmac43752-pcie.armsom,sige7.txt
+endef
+$(eval $(call BuildPackage,brcmfmac-nvram-43752-pcie))
+
+Package/brcmfmac-nvram-43752-sdio = $(call Package/armbian-firmware-default,Broadcom BCM43752 SDIO NVRAM firmware)
+define Package/brcmfmac-nvram-43752-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43752-sdio.txt \
+		$(1)/lib/firmware/brcm/
+	$(LN) \
+		brcmfmac43752-sdio.txt \
+		$(1)/lib/firmware/brcm/brcmfmac43752-sdio.armsom,sige1-v1.txt
+	$(LN) \
+		brcmfmac43752-sdio.txt \
+		$(1)/lib/firmware/brcm/brcmfmac43752-sdio.firefly,rk3568-roc-pc.txt
+endef
+$(eval $(call BuildPackage,brcmfmac-nvram-43752-sdio))
diff --git a/target/linux/rockchip/image/rk35xx.mk b/target/linux/rockchip/image/rk35xx.mk
@@ -35,6 +35,30 @@ $(call Device/rk3588)
 endef
 TARGET_DEVICES += armsom_sige7
 
+define Device/friendlyarm_nanopi-r6c
+$(call Device/rk3588)
+  DEVICE_VENDOR := FriendlyARM
+  DEVICE_MODEL := NanoPi R6C
+  DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-thermal 
+endef
+TARGET_DEVICES += friendlyarm_nanopi-r6c
+
+define Device/friendlyarm_nanopi-r6s
+$(call Device/rk3588)
+  DEVICE_VENDOR := FriendlyARM
+  DEVICE_MODEL := NanoPi R6S
+  DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-thermal 
+endef
+TARGET_DEVICES += friendlyarm_nanopi-r6s
+
+define Device/friendlyarm_nanopi-r6t
+$(call Device/rk3588)
+  DEVICE_VENDOR := FriendlyARM
+  DEVICE_MODEL := NanoPC T6
+  DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-thermal 
+endef
+TARGET_DEVICES += friendlyarm_nanopi-r6t
+
 define Device/mangopi_m28k
 $(call Device/rk3528)
   DEVICE_VENDOR := MangoPi
@@ -53,3 +77,12 @@ $(call Device/rk3528)
   DEVICE_PACKAGES := kmod-r8168 kmod-r8125 kmod-thermal
 endef
 TARGET_DEVICES += radxa_e20c
+
+define Device/radxa_rock-5c
+$(call Device/rk3588)
+  DEVICE_VENDOR := Radxa
+  DEVICE_MODEL := ROCK 5C / 5C Lite
+  DEVICE_DTS := rk3588-rock-5c
+  DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-thermal
+endef
+TARGET_DEVICES += radxa_rock-5c