Merge branch 'openwrt:main' into mx4300-dev

include/site/linux

@@ -53,7 +53,6 @@ ac_cv_have_control_in_msghdr=yes
 ac_cv_have_decl_sys_siglist=no
 ac_cv_have_openpty_ctty_bug=yes
 ac_cv_have_space_d_name_in_struct_dirent=yes
-ac_cv_header_netinet_sctp_h=no
 ac_cv_header_netinet_sctp_uio_h=no
 ac_cv_int64_t=yes
 ac_cv_lbl_unaligned_fail=no

package/boot/tfa-layerscape/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tfa-layerscape
-PKG_VERSION:=6.6.3.1.0.0
+PKG_VERSION:=6.6.23.2.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf
-PKG_SOURCE_VERSION:=lf-6.6.3-1.0.0
-PKG_MIRROR_HASH:=28b731c1c4cc3226ccaef2142c61127f213c03cbd219df556c1d191e95f8470c
+PKG_SOURCE_VERSION:=lf-6.6.23-2.0.0
+PKG_MIRROR_HASH:=628a95ba60a593ae0575ee9ede1154445ec3a86a07b18e4947e06e13c2b67859
 PKG_BUILD_DEPENDS:=tfa-layerscape/host
 
 include $(INCLUDE_DIR)/host-build.mk

package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -953,10 +953,6 @@ CRTTOOL			?=	${CRTTOOLPATH}/cert_create$
+@@ -128,10 +128,6 @@ CRTTOOL			?=	${CRTTOOLPATH}/cert_create$
  ENCTOOLPATH		?=	tools/encrypt_fw
  ENCTOOL			?=	${ENCTOOLPATH}/encrypt_fw${BIN_EXT}
 
@@ -11,7 +11,7 @@
  # Variables for use with sptool
  SPTOOLPATH		?=	tools/sptool
  SPTOOL			?=	${SPTOOLPATH}/sptool.py
-@@ -1409,13 +1405,6 @@ endif
+@@ -1597,13 +1593,6 @@ endif #(CHECKPATCH)
  clean:
  	@echo "  CLEAN"
  	$(call SHELL_REMOVE_DIR,${BUILD_PLAT})
@@ -21,11 +21,11 @@
 -# Clear the MAKEFLAGS as we do not want
 -# to pass the gnumake flags to nmake.
 -	${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) clean
--endif
+-endif #(UNIX_MK)
  	${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
  	${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean
  	${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
-@@ -1424,13 +1413,6 @@ realclean distclean:
+@@ -1612,13 +1601,6 @@ realclean distclean:
  	@echo "  REALCLEAN"
  	$(call SHELL_REMOVE_DIR,${BUILD_BASE})
  	$(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
@@ -35,29 +35,29 @@
 -# Clear the MAKEFLAGS as we do not want
 -# to pass the gnumake flags to nmake.
 -	${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) realclean
--endif
+-endif #(UNIX_MK)
  	${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} realclean
  	${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean
  	${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
-@@ -1486,7 +1468,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
+@@ -1674,7 +1656,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
  	@${ECHO_BLANK_LINE}
- endif
+ endif #(GENERATE_COT)
 
 -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL}
 +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS}
  	$(eval ${CHECK_FIP_CMD})
  	${Q}${FIPTOOL} create ${FIP_ARGS} $@
  	${Q}${FIPTOOL} info $@
-@@ -1503,7 +1485,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
+@@ -1691,7 +1673,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
  	@${ECHO_BLANK_LINE}
- endif
+ endif #(GENERATE_COT)
 
 -${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL}
 +${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS}
  	$(eval ${CHECK_FWU_FIP_CMD})
  	${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
  	${Q}${FIPTOOL} info $@
-@@ -1511,19 +1493,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
+@@ -1699,19 +1681,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
  	@echo "Built $@ successfully"
  	@${ECHO_BLANK_LINE}
 
@@ -72,26 +72,26 @@
 -# Clear the MAKEFLAGS as we do not want
 -# to pass the gnumake flags to nmake.
 -	${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL))
--endif
+-endif #(UNIX_MK)
 -
  romlib.bin: libraries FORCE
  	${Q}${MAKE} PLAT_DIR=${PLAT_DIR} BUILD_PLAT=${BUILD_PLAT} ENABLE_BTI=${ENABLE_BTI} ARM_ARCH_MINOR=${ARM_ARCH_MINOR} INCLUDES='${INCLUDES}' DEFINES='${DEFINES}' --no-print-directory -C ${ROMLIBPATH} all
 
 --- a/tools/fiptool/Makefile
 +++ b/tools/fiptool/Makefile
-@@ -67,7 +67,7 @@ all: ${PROJECT}
+@@ -81,7 +81,7 @@ all: --openssl ${PROJECT}
 
- ${PROJECT}: --openssl ${OBJECTS} Makefile
+ ${PROJECT}: ${OBJECTS} Makefile
  	@echo "  HOSTLD  $@"
--	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
-+	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
+-	${Q}${HOSTCC} ${OBJECTS} -o $@ $(LDOPTS)
++	${Q}${HOSTCC} ${OBJECTS} -o $@ $(LDOPTS) $(LDFLAGS)
  	@${ECHO_BLANK_LINE}
  	@echo "Built $@ successfully"
  	@${ECHO_BLANK_LINE}
---- a/tools/nxp/plat_fiptool/plat_fiptool.mk
-+++ b/tools/nxp/plat_fiptool/plat_fiptool.mk
-@@ -22,11 +22,11 @@ INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_C
- $(shell rm ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o)
+--- a/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk
++++ b/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk
+@@ -21,11 +21,11 @@ INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_C
+ 		 -I./
 
  ifeq (${PLAT_DEF_OID},yes)
 -HOSTCCFLAGS += -DPLAT_DEF_OID

package/boot/uboot-envtools/files/mediatek_filogic

@@ -86,6 +86,8 @@ zbtlink,zbt-z8103ax)
 dlink,aquila-pro-ai-m30-a1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
 	;;
+glinet,gl-x3000|\
+glinet,gl-xe3000|\
 glinet,gl-mt2500|\
 glinet,gl-mt6000)
 	local envdev=$(find_mmc_part "u-boot-env")

package/boot/uboot-layerscape/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-layerscape
-PKG_VERSION:=6.6.3.1.0.0
+PKG_VERSION:=6.6.23.2.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nxp-qoriq/u-boot
-PKG_SOURCE_VERSION:=lf-6.6.3-1.0.0
-PKG_MIRROR_HASH:=dec5b6e4fe328b930f201fbf06a0a7b71a9dd72f38f16c9570188c0a7fea916a
+PKG_SOURCE_VERSION:=lf-6.6.23-2.0.0
+PKG_MIRROR_HASH:=41e089fde1d0b3b0998e6af33d5f4c2b62860bda6cd1e6a0e8d47dfd5749005d
 
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk

package/boot/uboot-layerscape/patches/0900-layerscape-adjust-LS1021A-IOT-config-for-OpenWrt.patch

@@ -17,25 +17,25 @@ Signed-off-by: Pawel Dembicki <[email protected]>
 
 --- a/configs/ls1021aiot_sdcard_defconfig
 +++ b/configs/ls1021aiot_sdcard_defconfig
-@@ -24,7 +24,7 @@ CONFIG_AHCI=y
- CONFIG_LAYERSCAPE_NS_ACCESS=y
- CONFIG_PCIE1=y
- CONFIG_PCIE2=y
+@@ -14,7 +14,7 @@ CONFIG_SYS_I2C_MXC_I2C3=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
+ CONFIG_SPL_TEXT_BASE=0x10000000
 -CONFIG_SYS_MONITOR_LEN=524288
 +CONFIG_SYS_MONITOR_LEN=786432
- CONFIG_OF_BOARD_SETUP=y
- CONFIG_OF_STDOUT_VIA_ALIAS=y
- CONFIG_RAMBOOT_PBL=y
-@@ -40,7 +40,7 @@ CONFIG_SPL_MAX_SIZE=0x1a000
+ CONFIG_SPL_MMC=y
+ CONFIG_SPL_SERIAL=y
+ CONFIG_SPL_STACK=0x1001d000
+@@ -43,7 +43,7 @@ CONFIG_SPL_MAX_SIZE=0x1a000
  CONFIG_SPL_PAD_TO=0x1c000
  CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
  CONFIG_SPL_BSS_START_ADDR=0x80100000
 -CONFIG_SPL_BSS_MAX_SIZE=0x80000
 +CONFIG_SPL_BSS_MAX_SIZE=0xc0000
  CONFIG_SPL_FSL_PBL=y
  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
- CONFIG_SYS_SPL_MALLOC=y
-@@ -66,8 +66,11 @@ CONFIG_CMD_MII=y
+ CONFIG_SPL_SYS_MALLOC=y
+@@ -67,8 +67,11 @@ CONFIG_CMD_MII=y
  # CONFIG_CMD_MDIO is not set
  CONFIG_CMD_PING=y
  CONFIG_CMD_EXT2=y

package/boot/uboot-mediatek/Makefile

@@ -255,6 +255,30 @@ define U-Boot/mt7981_cmcc_rax3000m-nand
   DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr4
 endef
 
+define U-Boot/mt7981_glinet_gl-x3000
+  NAME:=GL.iNet GL-X3000
+  BUILD_SUBTARGET:=filogic
+  BUILD_DEVICES:=glinet_gl-x3000
+  UBOOT_CONFIG:=mt7981_glinet_gl-x3000
+  UBOOT_IMAGE:=u-boot.fip
+  BL2_BOOTDEV:=emmc
+  BL2_SOC:=mt7981
+  BL2_DDRTYPE:=ddr4
+  DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr4
+endef
+
+define U-Boot/mt7981_glinet_gl-xe3000
+  NAME:=GL.iNet GL-XE3000
+  BUILD_SUBTARGET:=filogic
+  BUILD_DEVICES:=glinet_gl-xe3000
+  UBOOT_CONFIG:=mt7981_glinet_gl-x3000
+  UBOOT_IMAGE:=u-boot.fip
+  BL2_BOOTDEV:=emmc
+  BL2_SOC:=mt7981
+  BL2_DDRTYPE:=ddr4
+  DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr4
+endef
+
 define U-Boot/mt7981_h3c_magic-nx30-pro
   NAME:=H3C Magic NX30 Pro
   BUILD_SUBTARGET:=filogic
@@ -761,6 +785,8 @@ UBOOT_TARGETS := \
 	mt7981_abt_asr3000 \
 	mt7981_cmcc_rax3000m-emmc \
 	mt7981_cmcc_rax3000m-nand \
+	mt7981_glinet_gl-x3000 \
+	mt7981_glinet_gl-xe3000 \
 	mt7981_h3c_magic-nx30-pro \
 	mt7981_jcg_q30-pro \
 	mt7981_nokia_ea0326gmp \