Merge branch 'bananapi4' of github.com:rmandrad/openwrt into bananapi…

…4-nvme-wip
N-Storm · Dec 23, 2024 · a5a7e86 · a5a7e86
2 parents 9b0d105 + 53f2300
commit a5a7e86
Show file tree

Hide file tree

Showing 64 changed files with 2,474 additions and 516 deletions.
diff --git a/include/trusted-firmware-a.mk b/include/trusted-firmware-a.mk
@@ -83,7 +83,6 @@ define Build/Compile/Trusted-Firmware-A
 		$(if $(DTC),DTC="$(DTC)") \
 		PLAT=$(PLAT) \
 		BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
-		$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 		$(TFA_MAKE_FLAGS)
 endef
 

diff --git a/package/boot/arm-trusted-firmware-bcm63xx/Makefile b/package/boot/arm-trusted-firmware-bcm63xx/Makefile
@@ -33,6 +33,7 @@ TFA_TARGETS:= \
 	bcm4908
 
 TFA_MAKE_FLAGS += \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 	BRCM_CHIP=$(BRCM_CHIP)
 
 define Package/trusted-firmware-a/install

diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile
@@ -569,6 +569,7 @@ TFA_TARGETS:= \
 	mt7988-spim-nand-ubi-comb
 
 TFA_MAKE_FLAGS += \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 	BOOT_DEVICE=$(BOOT_DEVICE) \
 	USE_MKIMAGE=1 MKIMAGE=$(STAGING_DIR_HOST)/bin/mkimage \
 	$(if $(findstring ddr4,$(DDR_TYPE)),DRAM_USE_DDR4=1) \

diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile
@@ -119,6 +119,7 @@ TFA_TARGETS:= \
 	edpu
 
 TFA_MAKE_FLAGS += \
+		$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 		CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
 		BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
 		MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \

diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile
@@ -37,6 +37,9 @@ TFA_TARGETS:= \
 	rk3328 \
 	rk3399
 
+TFA_MAKE_FLAGS+= \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
+
 ifeq ($(BUILD_VARIANT),rk3399)
   M0_GCC_NAME:=gcc-arm
   M0_GCC_RELEASE:=11.2-2022.02

diff --git a/package/boot/arm-trusted-firmware-stm32/Makefile b/package/boot/arm-trusted-firmware-stm32/Makefile
@@ -7,10 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2.10
+PKG_VERSION:=2.12
 PKG_RELEASE:=1
 
-PKG_HASH:=88215a62291b9ba87da8e50b077741103cdc08fb6c9e1ebd34dfaace746d3201
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/ARM-software/arm-trusted-firmware.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=51b2022baa25df7fd8f2e6d2709c9351c14b17447cda64759a8a1d432f9d1c11
 PKG_MAINTAINER:=Thomas Richard <[email protected]>
 
 include $(INCLUDE_DIR)/kernel.mk

diff --git a/...ed-firmware-stm32/patches/0001-Revert-feat-stm32mp1-fdts-remove-RTC-clock-configura.patch b/...ed-firmware-stm32/patches/0001-Revert-feat-stm32mp1-fdts-remove-RTC-clock-configura.patch
@@ -0,0 +1,66 @@
+From 0e1a71d84585ec33b479c2cb8c8d65a4f6734dbe Mon Sep 17 00:00:00 2001
+From: Thomas Richard <[email protected]>
+Date: Wed, 4 Dec 2024 14:26:52 +0100
+Subject: [PATCH] Revert "feat(stm32mp1-fdts): remove RTC clock configuration"
+
+This reverts commit 703a581e2522bffe21b421c98994dc02aed2934c.
+---
+ fdts/stm32mp135f-dk.dts   | 2 ++
+ fdts/stm32mp157c-ed1.dts  | 2 ++
+ fdts/stm32mp15xx-dkx.dtsi | 2 ++
+ 3 files changed, 6 insertions(+)
+
+--- a/fdts/stm32mp135f-dk.dts
++++ b/fdts/stm32mp135f-dk.dts
+@@ -190,6 +190,7 @@
+ 		CLK_AXI_PLL2P
+ 		CLK_MLAHBS_PLL3
+ 		CLK_CKPER_HSE
++		CLK_RTC_LSE
+ 		CLK_SDMMC1_PLL4P
+ 		CLK_SDMMC2_PLL4P
+ 		CLK_STGEN_HSE
+@@ -211,6 +212,7 @@
+ 		DIV(DIV_APB4, 1)
+ 		DIV(DIV_APB5, 2)
+ 		DIV(DIV_APB6, 1)
++		DIV(DIV_RTC, 0)
+ 	>;
+
+ 	st,pll_vco {
+--- a/fdts/stm32mp157c-ed1.dts
++++ b/fdts/stm32mp157c-ed1.dts
+@@ -194,6 +194,7 @@
+ 		CLK_MPU_PLL1P
+ 		CLK_AXI_PLL2P
+ 		CLK_MCU_PLL3P
++		CLK_RTC_LSE
+ 		CLK_MCO1_DISABLED
+ 		CLK_MCO2_DISABLED
+ 		CLK_CKPER_HSE
+@@ -242,6 +243,7 @@
+ 		DIV(DIV_APB3, 1)
+ 		DIV(DIV_APB4, 1)
+ 		DIV(DIV_APB5, 2)
++		DIV(DIV_RTC, 23)
+ 		DIV(DIV_MCO1, 0)
+ 		DIV(DIV_MCO2, 0)
+ 	>;
+--- a/fdts/stm32mp15xx-dkx.dtsi
++++ b/fdts/stm32mp15xx-dkx.dtsi
+@@ -198,6 +198,7 @@
+ 		CLK_MPU_PLL1P
+ 		CLK_AXI_PLL2P
+ 		CLK_MCU_PLL3P
++		CLK_RTC_LSE
+ 		CLK_MCO1_DISABLED
+ 		CLK_MCO2_DISABLED
+ 		CLK_CKPER_HSE
+@@ -246,6 +247,7 @@
+ 		DIV(DIV_APB3, 1)
+ 		DIV(DIV_APB4, 1)
+ 		DIV(DIV_APB5, 2)
++		DIV(DIV_RTC, 23)
+ 		DIV(DIV_MCO1, 0)
+ 		DIV(DIV_MCO2, 0)
+ 	>;
diff --git a/package/boot/arm-trusted-firmware-sunxi/Makefile b/package/boot/arm-trusted-firmware-sunxi/Makefile
@@ -46,6 +46,9 @@ TFA_TARGETS:= \
 	sunxi-h6 \
 	sunxi-h616
 
+TFA_MAKE_FLAGS+= \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
+
 define Package/trusted-firmware-a/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_$(BUILD_VARIANT).bin

diff --git a/package/boot/optee-os-stm32/Makefile b/package/boot/optee-os-stm32/Makefile
@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=4.3.0
+PKG_VERSION:=4.4.0
 PKG_RELEASE:=1
 
-PKG_HASH:=390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096
+PKG_HASH:=b13c65ff2abcd21a9200cb0131f34d61bde7c31eb0427fa761d27c3b87c7fec8
 PKG_MAINTAINER:=Thomas Richard <[email protected]>
 
 OPTEE_USE_INTREE_DTC:=1

diff --git a/package/boot/rkbin/Makefile b/package/boot/rkbin/Makefile
@@ -71,6 +71,9 @@ TFA_TARGETS:= \
 	rk3568-e25 \
 	rk3588
 
+TFA_MAKE_FLAGS+= \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
+
 ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s)
   TPL_FILE:=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
   define Download/rk3308-tpl-rock-pi-s

diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
@@ -161,6 +161,7 @@ TFA_TARGETS := \
   lx2160a-rdb-sdboot
 
 TFA_MAKE_FLAGS += \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 	fip pbl \
 	BOOT_MODE=$(BOOT_MODE) \
 	RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \

diff --git a/package/boot/uboot-d1/Makefile b/package/boot/uboot-d1/Makefile
@@ -30,31 +30,31 @@ define U-Boot/dongshan_nezha_stu
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-dongshan-nezha-stu.dtb
-  BUILD_DEVICES:=dongshan_nezha_stu
+  BUILD_DEVICES:=100ask_dongshan-nezha-stu
 endef
 
 define U-Boot/lichee_rv_dock
   NAME:=LicheePi RV (dock)
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-lichee-rv-dock.dtb
-  BUILD_DEVICES:=lichee_rv_dock
+  BUILD_DEVICES:=sipeed_lichee-rv-dock
 endef
 
 define U-Boot/mangopi_mq_pro
   NAME:=MangoPi MQ Pro
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-mangopi-mq-pro.dtb
-  BUILD_DEVICES:=mangopi_mq_pro
+  BUILD_DEVICES:=widora_mangopi-mq-pro
 endef
 
 define U-Boot/nezha
   NAME:=Nezha D1
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-nezha.dtb
-  BUILD_DEVICES:=nezha
+  BUILD_DEVICES:=allwinner_d1-nezha
 endef
 
 UBOOT_TARGETS := \
@@ -74,7 +74,7 @@ endef
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(DTS_DIR)/$(UBOOT_DTS) $(STAGING_DIR_IMAGE)/$(UBOOT_DTS)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-$(UBOOT_IMAGE)
 	mkimage -C none -A riscv -T script -d uEnv-$(UENV).txt \
 		$(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-boot.scr
 endef

diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -107,6 +107,7 @@ glinet,gl-mt3000)
 	;;
 mercusys,mr90x-v1|\
 routerich,ax3000|\
+tenbay,wr3000k|\
 tplink,re6000xd)
 	local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
 	ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"

diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq807x b/package/boot/uboot-envtools/files/qualcommax_ipq807x
@@ -39,6 +39,7 @@ linksys,mx8500)
 	;;
 netgear,sxr80|\
 netgear,sxs80|\
+tplink,eap620hd-v1|\
 tplink,eap660hd-v1)
 	idx="$(find_mtd_index 0:appsblenv)"
 	[ -n "$idx" ] && \

diff --git a/package/boot/uboot-stm32/Makefile b/package/boot/uboot-stm32/Makefile
@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2024.07
+PKG_VERSION:=2024.10
 PKG_RELEASE:=1
 
-PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
+PKG_HASH:=b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0
 PKG_MAINTAINER:=Thomas Richard <[email protected]>
 
 UBOOT_USE_INTREE_DTC:=1
@@ -38,6 +38,9 @@ UBOOT_TARGETS := stm32mp135f-dk
 
 UBOOT_MAKE_FLAGS += DEVICE_TREE=$(DEVICE_TREE)
 
+UBOOT_CUSTOMIZE_CONFIG := \
+	--disable TOOLS_MKEFICAPSULE
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(foreach img,$(UBOOT_IMAGE), \

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
@@ -6,9 +6,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
-PKG_SOURCE_DATE:=2024-11-28
-PKG_SOURCE_VERSION:=e1f6c9ac9e1508852f292a2b8167823e180db4e8
-PKG_MIRROR_HASH:=cc7ef25d43bbea4d521e0cb69887b975295be98ddf83b29f52c3c0e7d1ceeb25
+PKG_SOURCE_DATE:=2024-12-18
+PKG_SOURCE_VERSION:=4b849214b137b14a903112af3c2016ad9acf48c2
+PKG_MIRROR_HASH:=28162682fe7612460e42398ecc669e245fc0ece873361e3910c2dd8a56111f1c
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
@@ -55,6 +55,7 @@ ALLWIFIBOARDS:= \
 	redmi_ax6 \
 	skspruce_wia3300-20 \
 	spectrum_sax1v1k \
+	tplink_eap620hd-v1 \
 	tplink_eap660hd-v1 \
 	wallys_dr40x9 \
 	xiaomi_ax3600 \
@@ -184,6 +185,7 @@ $(eval $(call generate-ipq-wifi-package,prpl_haze,prpl Haze))
 $(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
 $(eval $(call generate-ipq-wifi-package,skspruce_wia3300-20,SKSpruce WIA3300-20))
 $(eval $(call generate-ipq-wifi-package,spectrum_sax1v1k,Spectrum SAX1V1K))
+$(eval $(call generate-ipq-wifi-package,tplink_eap620hd-v1,TP-Link EAP620 HD v1))
 $(eval $(call generate-ipq-wifi-package,tplink_eap660hd-v1,TP-Link EAP660 HD v1))
 $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
 $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))

diff --git a/package/firmware/linux-firmware/mediatek.mk b/package/firmware/linux-firmware/mediatek.mk
@@ -69,6 +69,15 @@ define Package/mt7922bt-firmware/install
 endef
 $(eval $(call BuildPackage,mt7922bt-firmware))
 
+Package/mt7925bt-firmware = $(call Package/firmware-default,mt7925bt firmware,,LICENCE.mediatek)
+define Package/mt7925bt-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7925
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin \
+		$(1)/lib/firmware/mediatek/mt7925
+endef
+$(eval $(call BuildPackage,mt7925bt-firmware))
+
 Package/mt7981-wo-firmware = $(call Package/firmware-default,MT7981 offload firmware,,LICENCE.mediatek)
 define Package/mt7981-wo-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/mediatek

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
@@ -366,6 +366,26 @@ endef
 $(eval $(call KernelPackage,crypto-hmac))
 
 
+define KernelPackage/crypto-hw-atmel
+  TITLE:=Microchip / Atmel ECC/SHA/RNG hw accelerator
+  DEPENDS:=+kmod-i2c-core +kmod-crypto-ecdh +kmod-crypto-sha1 \
+	+kmod-crypto-sha256 +kmod-lib-crc16 +kmod-random-core
+  KCONFIG:= \
+	CONFIG_CRYPTO_HW=y \
+	CONFIG_CRYPTO_DEV_ATMEL_I2C \
+	CONFIG_CRYPTO_DEV_ATMEL_ECC \
+	CONFIG_CRYPTO_DEV_ATMEL_SHA204A
+  FILES:= \
+	$(LINUX_DIR)/drivers/crypto/atmel-i2c.ko \
+	$(LINUX_DIR)/drivers/crypto/atmel-ecc.ko \
+	$(LINUX_DIR)/drivers/crypto/atmel-sha204a.ko
+  AUTOLOAD:=$(call AutoLoad,09,atmel-i2c atmel-ecc atmel-sha204a)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hw-atmel))
+
+
 define KernelPackage/crypto-hw-ccp
   TITLE:=AMD Cryptographic Coprocessor
   DEPENDS:= \

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
@@ -1525,6 +1525,28 @@ endef
 
 $(eval $(call KernelPackage,bnx2x))
 
+define KernelPackage/bnxt-en
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Broadcom NetXtreme-C/E network driver
+  DEPENDS:=@PCI_SUPPORT +kmod-hwmon-core +kmod-lib-crc32c +kmod-mdio +kmod-ptp
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/bnxt/bnxt_en.ko
+  KCONFIG:= \
+	  CONFIG_BNXT \
+	  CONFIG_BNXT_SRIOV=y \
+	  CONFIG_BNXT_FLOWER_OFFLOAD=y \
+	  CONFIG_BNXT_DCB=n \
+	  CONFIG_BNXT_HWMON=y
+  AUTOLOAD:=$(call AutoProbe,bnxt_en)
+endef
+
+define KernelPackage/bnxt-en/description
+  Supports Broadcom NetXtreme-C/E based Ethernet NICs including:
+  * BCM573xx
+  * BCM574xx
+endef
+
+$(eval $(call KernelPackage,bnxt-en))
+
 define KernelPackage/be2net
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Broadcom Emulex OneConnect 10Gbps NIC