diff --git a/include/download.mk b/include/download.mk index 769f45669e..1cc2e2df01 100644 --- a/include/download.mk +++ b/include/download.mk @@ -187,7 +187,7 @@ define DownloadMethod/svn svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \ svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \ echo "Packing checkout..." && \ - export TAR_TIMESTAMP="" && \ + export TAR_TIMESTAMP="`svn info -r$(VERSION) --show-item last-changed-date $(URL)`" && \ $(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \ rm -rf $(SUBDIR); \ diff --git a/include/kernel-5.15 b/include/kernel-5.15 index f1b1323e0e..ddb9b7a875 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .111 -LINUX_KERNEL_HASH-5.15.111 = 77ceea259c0158dd624304871170d09b2e59ed612f3a4d436fe0f07362dcaec2 +LINUX_VERSION-5.15 = .112 +LINUX_KERNEL_HASH-5.15.112 = b0e8ebdba38e0c369f64ec4dc2a69ec59ffe87a64b82f940dbdf8e752b6ad651 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index bd6e90a2ae..0161df70dd 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -28,38 +28,17 @@ endef # ALLWIFIBOARDS:= \ - 8dev_habanero \ - 8dev_jalapeno \ - aruba_ap-365 \ buffalo_wxr-5950ax12 \ - devolo_magic-2-wifi-next \ dynalink_dl-wrx36 \ edgecore_eap102 \ - edgecore_ecw5410 \ - edgecore_oap100 \ edimax_cax1800 \ - extreme-networks_ws-ap3915i \ - glinet_gl-a1300 \ - glinet_gl-ap1300 \ - glinet_gl-s1300 \ - linksys_ea8300 \ - linksys_whw03v2 \ netgear_wax218 \ - nokia_ac400i \ - p2w_r619ac \ - pakedge_wr-1 \ qnap_301w \ - qxwlan_e2600ac-c1 \ - qxwlan_e2600ac-c2 \ redmi_ax6 \ - sony_ncp-hg100-cellular \ - teltonika_rutx \ wallys_dr40x9 \ xiaomi_ax3600 \ xiaomi_ax9000 \ - zte_mf18a \ zte_mf269 \ - zte_mf289f \ zyxel_nbg7815 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) @@ -134,38 +113,17 @@ endef # Place files in this directory as board-. # Add $(eval $(call generate-ipq-wifi-package,,)) -$(eval $(call generate-ipq-wifi-package,8dev_habanero,8devices Habanero)) -$(eval $(call generate-ipq-wifi-package,8dev_jalapeno,8devices Jalapeno)) -$(eval $(call generate-ipq-wifi-package,aruba_ap-365,Aruba AP-365)) $(eval $(call generate-ipq-wifi-package,buffalo_wxr-5950ax12,Buffalo WXR-5950AX12)) -$(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next)) $(eval $(call generate-ipq-wifi-package,dynalink_dl-wrx36,Dynalink DL-WRX36)) $(eval $(call generate-ipq-wifi-package,edgecore_eap102,Edgecore EAP102)) -$(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410)) -$(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100)) $(eval $(call generate-ipq-wifi-package,edimax_cax1800,Edimax CAX1800)) -$(eval $(call generate-ipq-wifi-package,extreme-networks_ws-ap3915i,Edgecore OAP100)) -$(eval $(call generate-ipq-wifi-package,glinet_gl-a1300,GL.iNet GL-A1300)) -$(eval $(call generate-ipq-wifi-package,glinet_gl-ap1300,GL.iNet GL-AP1300)) -$(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300)) -$(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300)) -$(eval $(call generate-ipq-wifi-package,linksys_whw03v2,Linksys WHW03 V2)) $(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218)) -$(eval $(call generate-ipq-wifi-package,nokia_ac400i,Nokia AC400i)) -$(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC)) -$(eval $(call generate-ipq-wifi-package,pakedge_wr-1,Pakedge WR-1)) $(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w)) -$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac-c1,Qxwlan E2600AC C1)) -$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac-c2,Qxwlan E2600AC C2)) $(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6)) -$(eval $(call generate-ipq-wifi-package,sony_ncp-hg100-cellular,Sony NCP-HG100/Cellular)) -$(eval $(call generate-ipq-wifi-package,teltonika_rutx,Teltonika RUTX)) $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9)) $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600)) $(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000)) -$(eval $(call generate-ipq-wifi-package,zte_mf18a,ZTE MF18A)) $(eval $(call generate-ipq-wifi-package,zte_mf269,ZTE MF269)) -$(eval $(call generate-ipq-wifi-package,zte_mf289f,ZTE MF289F)) $(eval $(call generate-ipq-wifi-package,zyxel_nbg7815,Zyxel NBG7815)) $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE)))) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 2b39ec8f3b..522085bb2f 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -506,6 +506,13 @@ static int gpio_keys_button_probe(struct platform_device *pdev, goto out; } + if (button->irq) { + dev_err(dev, "skipping button %s (only gpio buttons supported)\n", + button->desc); + bdata->b = &pdata->buttons[i]; + continue; + } + if (gpio_is_valid(button->gpio)) { /* legacy platform data... but is it the lookup table? */ bdata->gpiod = devm_gpiod_get_index(dev, desc, i, diff --git a/package/kernel/ksmbd/Makefile b/package/kernel/ksmbd/Makefile deleted file mode 100644 index 674e816186..0000000000 --- a/package/kernel/ksmbd/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=ksmbd -PKG_VERSION:=3.4.8 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/cifsd-team/ksmbd/releases/download/$(PKG_VERSION) -PKG_HASH:=209bfba4dc5c50007942a3ec24f86a7f7c628618ac07f79c62e3404dc247d495 - -PKG_LICENSE:=GPL-2.0-or-later -PKG_LICENSE_FILES:=COPYING - -include $(INCLUDE_DIR)/kernel.mk -include $(INCLUDE_DIR)/package.mk - -TAR_OPTIONS+= --strip-components 1 -TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) - -define KernelPackage/fs-ksmbd - SUBMENU:=Filesystems - TITLE:=SMB kernel server support - URL:=https://github.com/cifsd-team/cifsd - FILES:=$(PKG_BUILD_DIR)/ksmbd.ko - DEPENDS:= \ - +kmod-nls-base \ - +kmod-nls-utf8 \ - +kmod-crypto-md4 \ - +kmod-crypto-md5 \ - +kmod-crypto-hmac \ - +kmod-crypto-ecb \ - +kmod-crypto-des \ - +kmod-crypto-sha256 \ - +kmod-crypto-cmac \ - +kmod-crypto-sha512 \ - +kmod-crypto-aead \ - +kmod-crypto-ccm \ - +kmod-crypto-gcm \ - +kmod-asn1-decoder \ - +kmod-oid-registry -endef - -# The last two DEPENDS are hacks in order to get CONFIG_ASN1 and CONFIG_OID_REGISTRY -# which it seems can't be selected independently. Some bug in either base or upstream. - -define KernelPackage/fs-ksmbd/description - Ksmbd is an In-kernel SMBv(1)2/3 fileserver. - It's an implementation of the SMB protocol in kernel space for sharing files and IPC services over network. -endef - -define KernelPackage/fs-ksmbd/config -config KSMBD_SMB_INSECURE_SERVER - bool "Support for insecure SMB1/CIFS and SMB2.0 protocols" - depends on PACKAGE_kmod-fs-ksmbd - help - This enables deprecated insecure protocols dialects: SMB1/CIFS and SMB2.0. - default y -endef - -ifeq ($(CONFIG_KSMBD_SMB_INSECURE_SERVER),y) -PKG_EXTRA_KCONFIG:=CONFIG_SMB_INSECURE_SERVER=y -EXTRA_CFLAGS += -DCONFIG_SMB_INSECURE_SERVER=1 -endif - -define Build/Compile - $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \ - EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ - $(PKG_EXTRA_KCONFIG) \ - CONFIG_SMB_SERVER=m \ - modules -endef - -$(eval $(call KernelPackage,fs-ksmbd)) diff --git a/package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch b/package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch deleted file mode 100644 index b2c6687d06..0000000000 --- a/package/kernel/ksmbd/patches/01-keep_kmod_metadata.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/glob.h -+++ b/glob.h -@@ -7,6 +7,8 @@ - #ifndef __KSMBD_GLOB_H - #define __KSMBD_GLOB_H - -+#undef CONFIG_MODULE_STRIPPED -+ - #include - - #include "unicode.h" diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 77d8d6c98b..1dddebfed7 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -83,21 +83,36 @@ endef $(eval $(call KernelPackage,fs-btrfs)) +define KernelPackage/fs-smbfs-common + SUBMENU:=$(FS_MENU) + TITLE:=SMBFS common dependencies support + HIDDEN:=1 + KCONFIG:=CONFIG_SMBFS_COMMON + FILES:= \ + $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \ + $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko +endef + +define KernelPackage/fs-smbfs-common/description + Kernel module dependency for CIFS or SMB_SERVER support +endef + +$(eval $(call KernelPackage,fs-smbfs-common)) + + define KernelPackage/fs-cifs SUBMENU:=$(FS_MENU) TITLE:=CIFS support KCONFIG:= \ - CONFIG_SMBFS_COMMON \ CONFIG_CIFS \ CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_UPCALL=n FILES:= \ - $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \ - $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko \ $(LINUX_DIR)/fs/cifs/cifs.ko AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) DEPENDS+= \ + +kmod-fs-smbfs-common \ +kmod-crypto-md5 \ +kmod-crypto-sha256 \ +kmod-crypto-sha512 \ @@ -330,6 +345,43 @@ endef $(eval $(call KernelPackage,fs-jfs)) + +define KernelPackage/fs-ksmbd + SUBMENU:=$(FS_MENU) + TITLE:=SMB kernel server support + DEPENDS:= \ + +kmod-nls-base \ + +kmod-nls-utf8 \ + +kmod-crypto-md4 \ + +kmod-crypto-md5 \ + +kmod-crypto-hmac \ + +kmod-crypto-ecb \ + +kmod-crypto-des \ + +kmod-crypto-sha256 \ + +kmod-crypto-cmac \ + +kmod-crypto-sha512 \ + +kmod-crypto-aead \ + +kmod-crypto-ccm \ + +kmod-crypto-gcm \ + +kmod-asn1-decoder \ + +kmod-oid-registry \ + +kmod-fs-smbfs-common + KCONFIG:= \ + CONFIG_SMB_SERVER \ + CONFIG_SMB_SERVER_SMBDIRECT=n \ + CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \ + CONFIG_SMB_SERVER_KERBEROS5=n + FILES:=$(LINUX_DIR)/fs/ksmbd/ksmbd.ko + AUTOLOAD:=$(call AutoLoad,41,ksmbd) +endef + +define KernelPackage/fs-ksmbd/description + Kernel module for SMB kernel server support +endef + +$(eval $(call KernelPackage,fs-ksmbd)) + + define KernelPackage/fs-minix SUBMENU:=$(FS_MENU) TITLE:=Minix filesystem support diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 51e70fbe18..cd827725bd 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1338,7 +1338,7 @@ define KernelPackage/mhi-bus TITLE:=MHI bus KCONFIG:=CONFIG_MHI_BUS \ CONFIG_MHI_BUS_DEBUG=y - FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko + FILES:=$(LINUX_DIR)/drivers/bus/mhi/host/mhi.ko AUTOLOAD:=$(call AutoProbe,mhi) endef @@ -1353,7 +1353,7 @@ define KernelPackage/mhi-pci-generic TITLE:=MHI PCI controller driver DEPENDS:=@PCI_SUPPORT +kmod-mhi-bus KCONFIG:=CONFIG_MHI_BUS_PCI_GENERIC - FILES:=$(LINUX_DIR)/drivers/bus/mhi/mhi_pci_generic.ko + FILES:=$(LINUX_DIR)/drivers/bus/mhi/host/mhi_pci_generic.ko AUTOLOAD:=$(call AutoProbe,mhi_pci_generic) endef diff --git a/package/libs/libxml2/Makefile b/package/libs/libxml2/Makefile index e93d1c06bd..5a7de0d8a1 100644 --- a/package/libs/libxml2/Makefile +++ b/package/libs/libxml2/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 -PKG_VERSION:=2.10.3 -PKG_RELEASE:=2 +PKG_VERSION:=2.11.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libxml2/$(basename $(PKG_VERSION)) -PKG_HASH:=5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c +PKG_HASH:=f1acae1664bda006cd81bfc238238217043d586d06659d5c0e3d1bcebe040870 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/package/libs/libxml2/patches/010-iconv.patch b/package/libs/libxml2/patches/010-iconv.patch index e35b7ce939..92b09685c5 100644 --- a/package/libs/libxml2/patches/010-iconv.patch +++ b/package/libs/libxml2/patches/010-iconv.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -496,6 +496,9 @@ if(LIBXML2_WITH_PROGRAMS) +@@ -469,6 +469,9 @@ if(LIBXML2_WITH_PROGRAMS) add_executable(LibXml2::${PROGRAM} ALIAS ${PROGRAM}) target_compile_definitions(${PROGRAM} PRIVATE SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") target_link_libraries(${PROGRAM} LibXml2) diff --git a/package/network/services/umdns/Makefile b/package/network/services/umdns/Makefile index 7f196cd1f5..b7564fa7c3 100644 --- a/package/network/services/umdns/Makefile +++ b/package/network/services/umdns/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2014-2021 OpenWrt.org +# Copyright (C) 2014-2023 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,9 +12,9 @@ PKG_RELEASE:=5 PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-05-13 -PKG_SOURCE_VERSION:=b777a0b53f7d89ab2a60e3eed7d98036806da9a4 -PKG_MIRROR_HASH:=54992acf7edd32610de7bcb0ea7c58b20f69bf1ac20be69e76abcff41f25e775 +PKG_SOURCE_DATE:=2023-01-16 +PKG_SOURCE_VERSION:=65b3308d13de7d7975444d34389651612e2a4d38 +PKG_MIRROR_HASH:=945fdf51a299b68982aab74e8fba5614f2553a7b4c49a3a53b3093ea8aac0279 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=LGPL-2.1 diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 1ae6bb7b2d..e14d816a42 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.38.1 -PKG_RELEASE:=2 +PKG_VERSION:=2.39 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.38 -PKG_HASH:=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39 +PKG_HASH:=32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0-only diff --git a/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch b/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch new file mode 100644 index 0000000000..602ffe67e7 --- /dev/null +++ b/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch @@ -0,0 +1,24 @@ +From 2558932c65524d953e4c86d7fda2282a582aa5ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Wed, 17 May 2023 16:50:47 +0200 +Subject: [PATCH] test_enosys: add support for mips +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Weißschuh +--- + tests/helpers/test_enosys.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/tests/helpers/test_enosys.c ++++ b/tests/helpers/test_enosys.c +@@ -53,6 +53,8 @@ + # else + # define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC64LE + # endif ++#elif __mips__ ++# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPS + #else + # error Unknown target architecture + #endif diff --git a/package/utils/util-linux/patches/030-meson-don-t-use-run.patch b/package/utils/util-linux/patches/030-meson-don-t-use-run.patch deleted file mode 100644 index 7803dd7725..0000000000 --- a/package/utils/util-linux/patches/030-meson-don-t-use-run.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e25db9169450d3d5fb43656a2eae5c08999310f4 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 16:56:54 -0700 -Subject: [PATCH 2/7] meson: don't use run - -Fixes cross compilation. run is not needed anyway. - -Signed-off-by: Rosen Penev ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/meson.build -+++ b/meson.build -@@ -577,8 +577,7 @@ int main(void) { - return tzname ? 0 : 1; - } - '''.format(have ? 1 : 0) --result = cc.run(code, name : 'using tzname[]') --have = result.compiled() and result.returncode() == 0 -+have = cc.compiles(code, name : 'using tzname[]') - conf.set('HAVE_TZNAME', have ? 1 : false) - - socket_libs = [] -@@ -641,8 +640,7 @@ int main(void) { - return (*__progname != 0); - } - ''' --result = cc.run(code, name : 'using __progname') --have = result.compiled() and result.returncode() == 0 -+have = cc.compiles(code, name : 'using __progname') - conf.set('HAVE___PROGNAME', have ? 1 : false) - - build_plymouth_support = get_option('build-plymouth-support') diff --git a/package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch b/package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch deleted file mode 100644 index bdbfc4bfe0..0000000000 --- a/package/utils/util-linux/patches/040-meson-fix-cpu_set_t-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4194bb5b35e9b5f3296bf17b7cabcc5cb1632ba3 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 16:55:15 -0700 -Subject: [PATCH 3/7] meson: fix cpu_set_t test - -_GNU_SOURCE is needed here. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -379,7 +379,7 @@ endforeach - have = cc.has_header('sched.h') - conf.set10('HAVE_DECL_CPU_ALLOC', have) - # We get -1 if the size cannot be determined --have_cpu_set_t = cc.sizeof('cpu_set_t', prefix : '#include ') > 0 -+have_cpu_set_t = cc.sizeof('cpu_set_t', prefix : '#define _GNU_SOURCE\n#include ') > 0 - conf.set('HAVE_CPU_SET_T', have_cpu_set_t ? 1 : false) - - have = cc.has_header_symbol('stdlib.h', 'environ') diff --git a/package/utils/util-linux/patches/050-meson-fix-environ-search.patch b/package/utils/util-linux/patches/050-meson-fix-environ-search.patch deleted file mode 100644 index 2cd02e5b47..0000000000 --- a/package/utils/util-linux/patches/050-meson-fix-environ-search.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1e9e2b9fe365cc4a0025d44dc0a9c54bfffe9058 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 18:16:17 -0700 -Subject: [PATCH 4/7] meson: fix environ search - -musl has it defined in unistd.h and hidden behind _GNU_SOURCE. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -382,7 +382,7 @@ conf.set10('HAVE_DECL_CPU_ALLOC', have) - have_cpu_set_t = cc.sizeof('cpu_set_t', prefix : '#define _GNU_SOURCE\n#include ') > 0 - conf.set('HAVE_CPU_SET_T', have_cpu_set_t ? 1 : false) - --have = cc.has_header_symbol('stdlib.h', 'environ') -+have = cc.has_header_symbol('unistd.h', 'environ', prefix : '#define _GNU_SOURCE') - conf.set10('HAVE_ENVIRON_DECL', have) - - have = cc.has_header_symbol('signal.h', 'sighandler_t') diff --git a/package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch b/package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch deleted file mode 100644 index 7f9137f8bc..0000000000 --- a/package/utils/util-linux/patches/060-meson-add-_GNU_SOURCE-for-sighandler_t.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5d7557eb3827664b2b78145373907f2a6994bdf9 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 18:17:52 -0700 -Subject: [PATCH 5/7] meson: add _GNU_SOURCE for sighandler_t - -musl requires it. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -385,7 +385,7 @@ conf.set('HAVE_CPU_SET_T', have_cpu_set_ - have = cc.has_header_symbol('unistd.h', 'environ', prefix : '#define _GNU_SOURCE') - conf.set10('HAVE_ENVIRON_DECL', have) - --have = cc.has_header_symbol('signal.h', 'sighandler_t') -+have = cc.has_header_symbol('signal.h', 'sighandler_t', prefix : '#define _GNU_SOURCE') - conf.set('HAVE_SIGHANDLER_T', have ? 1 : false) - - have = cc.has_header_symbol('string.h', 'strsignal') diff --git a/package/utils/util-linux/patches/070-meson-fix-isnan-check.patch b/package/utils/util-linux/patches/070-meson-fix-isnan-check.patch deleted file mode 100644 index a0b104f801..0000000000 --- a/package/utils/util-linux/patches/070-meson-fix-isnan-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 777652585924034deeba98ae3192f26bc32bb661 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 18:19:53 -0700 -Subject: [PATCH 6/7] meson: fix isnan check - -musl only has isnan as a macro, not as a function. Handle the former -case. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -622,7 +622,7 @@ rtas_libs = cc.find_library('rtas', requ - conf.set('HAVE_LIBRTAS', rtas_libs.found() ? 1 : false) - - math_libs = [] --if not cc.has_function('isnan') -+if not cc.has_header_symbol('math.h', 'isnan') - lib = cc.find_library('m', required : true) - if (cc.has_function('isnan', dependencies : lib) and - cc.has_function('__isnan', dependencies : lib)) diff --git a/package/utils/util-linux/patches/080-meson-fix-tzname-check.patch b/package/utils/util-linux/patches/080-meson-fix-tzname-check.patch deleted file mode 100644 index f5d53c4d36..0000000000 --- a/package/utils/util-linux/patches/080-meson-fix-tzname-check.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9a6b2618b46a859388139d1eb18f876886786659 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 29 Apr 2022 19:00:53 -0700 -Subject: [PATCH] meson: fix tzname check - -tzname is not a type but a variable. sizeof only works on types. - -Signed-off-by: Rosen Penev ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -565,7 +565,7 @@ have = cc.has_member('struct tm', 'tm_zo - prefix : '#include ') - conf.set('HAVE_STRUCT_TM_TM_ZONE', have ? 1 : false) - --have = cc.sizeof('tzname', prefix : '#include ') > 0 -+have = cc.has_header_symbol('time.h', 'tzname') - conf.set('HAVE_DECL_TZNAME', have ? 1 : false) - - code = ''' diff --git a/package/utils/util-linux/patches/090-meson-libpam.patch b/package/utils/util-linux/patches/090-meson-libpam.patch deleted file mode 100644 index c9a91b9937..0000000000 --- a/package/utils/util-linux/patches/090-meson-libpam.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -299,10 +299,14 @@ conf.set('HAVE_LIBUDEV', lib_udev.found( - - lib_crypt = cc.find_library('crypt') - --lib_pam = cc.find_library('pam') -+req_libpam = not (get_option('build-login').disabled() or get_option('build-chfn-chsh').disabled() -+ or get_option('build-su').disabled() or get_option('build-runuser').disabled()) -+lib_pam = cc.find_library('pam', required : req_libpam) - if lib_pam.found() - lib_pam_misc = cc.find_library('pam_misc') - lib_pam = [lib_pam, lib_pam_misc] -+else -+ lib_pam_misc = declare_dependency() - endif - - lib_cryptsetup = dependency( diff --git a/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch b/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch deleted file mode 100644 index d8b1199004..0000000000 --- a/package/utils/util-linux/patches/100-meson-make-libcap-ng-dependent-on-setpriv.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd23a4336f49ba6a12ade557a09589f2a7c966f4 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 2 May 2022 16:18:33 -0700 -Subject: [PATCH] meson: make libcap-ng dependent on setpriv - -Signed-off-by: Rosen Penev ---- - meson.build | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/meson.build -+++ b/meson.build -@@ -334,7 +334,8 @@ have = cc.has_function( - conf.set('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY', have ? 1 : false) - - lib_cap_ng = dependency( -- 'libcap-ng') -+ 'libcap-ng', -+ required : get_option('build-setpriv')) - - lib_selinux = dependency( - 'libselinux', -@@ -1754,7 +1755,7 @@ if opt and not is_disabler(exe) - exes += exe - endif - --opt = not get_option('build-setpriv').disabled() -+opt = not get_option('build-setpriv').disabled() and lib_cap_ng.found() - exe = executable( - 'setpriv', - setpriv_sources, diff --git a/package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch b/package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch deleted file mode 100644 index 8529c8268e..0000000000 --- a/package/utils/util-linux/patches/120-meson-get-the-project-version-from-the-version-gen-s.patch +++ /dev/null @@ -1,20 +0,0 @@ -From e0c1a86bf88b568a7afe8ebaea1b9f84afb892c2 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Wed, 4 May 2022 23:52:31 -0400 -Subject: [PATCH] meson: get the project version from the version-gen script - -This matches autotools and ensures that the version number is actually -reliable. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('util-linux', 'c', -- version : '2.37', -+ version : run_command('tools/git-version-gen', check: true).stdout(), - license : 'GPLv2+') - - pkgconfig = import('pkgconfig') diff --git a/package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch b/package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch deleted file mode 100644 index 75e88682e3..0000000000 --- a/package/utils/util-linux/patches/130-meson-fix-error-in-processing-version-for-pc-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc307e1cbf73f6dbf72bb049c19d332774cdb4e7 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Thu, 5 May 2022 00:16:15 -0400 -Subject: [PATCH] meson: fix error in processing version for pc files - -This awk command was copied verbatim from configure.ac, which included -non-awk syntax because configure.ac cannot contain [ literals. - -Rewrite these autoconf quadrigraphs as their actual values, for meson. - -Fixes always setting the micro version to "0". ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/meson.build -+++ b/meson.build -@@ -41,7 +41,7 @@ conf.set_quoted('PACKAGE_VERSION', meson - - codes = [''' {print $1} ''', - ''' {sub("-.*","",$2); print $2} ''', -- ''' {sub("-.*","",$3); print $3 ~ /^@<:@0-9@:>@+$/ ? $3 : 0} '''] -+ ''' {sub("-.*","",$3); print $3 ~ /^[0-9]+$/ ? $3 : 0} '''] - pc_version = [] - foreach code : codes - res = run_command('bash', '-c', diff --git a/package/utils/util-linux/patches/200-meson-no-po.patch b/package/utils/util-linux/patches/200-meson-no-po.patch index d626036bb2..4d94f6b89a 100644 --- a/package/utils/util-linux/patches/200-meson-no-po.patch +++ b/package/utils/util-linux/patches/200-meson-no-po.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -774,7 +774,6 @@ subdir('disk-utils') +@@ -874,7 +874,6 @@ subdir('disk-utils') subdir('misc-utils') subdir('text-utils') subdir('term-utils') diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh index ef13624402..5c88dcea80 100755 --- a/scripts/gen_image_generic.sh +++ b/scripts/gen_image_generic.sh @@ -19,7 +19,7 @@ head=16 sect=63 # create partition table -set $(ptgen -o "$OUTPUT" -h $head -s $sect ${GUID:+-g} -p "${KERNELSIZE}m" -p "${ROOTFSSIZE}m" ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE} ${GUID:+-G $GUID}) +set $(ptgen -o "$OUTPUT" -h $head -s $sect ${GUID:+-g} -p "${KERNELSIZE}m${PARTOFFSET:+@$PARTOFFSET}" -p "${ROOTFSSIZE}m" ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE} ${GUID:+-G $GUID}) KERNELOFFSET="$(($1 / 512))" KERNELSIZE="$2" diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 4f34521a50..d1bd4feb1f 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -272,7 +272,7 @@ define Device/meraki_mr18 SOC := qca9557 DEVICE_VENDOR := Meraki DEVICE_MODEL := MR18 - DEVICE_PACKAGES := kmod-spi-gpio nu801 + DEVICE_PACKAGES := kmod-leds-uleds kmod-spi-gpio nu801 KERNEL_SIZE := 8m BLOCKSIZE := 128k PAGESIZE := 2048 diff --git a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch index bbf071cb01..e756fa2fff 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17537,6 +17537,14 @@ T: git git://linuxtv.org/media_tree.git +@@ -17538,6 +17538,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml F: drivers/media/i2c/imx412.c diff --git a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch index f006899069..27fd0e5793 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch @@ -132,7 +132,7 @@ Signed-off-by: David Plowman +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17551,6 +17551,7 @@ M: Raspberry Pi Kernel Maintenance +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17555,6 +17555,14 @@ F: Documentation/devicetree/bindings/med +@@ -17556,6 +17556,14 @@ F: Documentation/devicetree/bindings/med F: Documentation/devicetree/bindings/media/i2c/imx477.yaml F: drivers/media/i2c/imx477.c diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 931fe30f38..6467aea46e 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -351,7 +351,7 @@ define Device/meraki_mr26 DEVICE_VENDOR := Meraki DEVICE_MODEL := MR26 DEVICE_PACKAGES := $(B43) kmod-i2c-bcm-iproc kmod-eeprom-at24 \ - kmod-hwmon-ina2xx nu801 + kmod-hwmon-ina2xx kmod-leds-uleds nu801 DEVICE_DTS := bcm53015-meraki-mr26 # resize the initramfs to fit the size of the existing part.safe. KERNEL_LOADADDR := 0x00008000 diff --git a/target/linux/generic/backport-5.15/780-v5.16-bus-mhi-pci_generic-Introduce-Sierra-EM919X-support.patch b/target/linux/generic/backport-5.15/780-v5.16-bus-mhi-pci_generic-Introduce-Sierra-EM919X-support.patch index 5fe10e0caa..44f0864e9a 100644 --- a/target/linux/generic/backport-5.15/780-v5.16-bus-mhi-pci_generic-Introduce-Sierra-EM919X-support.patch +++ b/target/linux/generic/backport-5.15/780-v5.16-bus-mhi-pci_generic-Introduce-Sierra-EM919X-support.patch @@ -16,11 +16,11 @@ Signed-off-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20211216081227.237749-11-manivannan.sadhasivam@linaro.org Signed-off-by: Greg Kroah-Hartman --- - drivers/bus/mhi/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++ + drivers/bus/mhi/host/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) ---- a/drivers/bus/mhi/pci_generic.c -+++ b/drivers/bus/mhi/pci_generic.c +--- a/drivers/bus/mhi/host/pci_generic.c ++++ b/drivers/bus/mhi/host/pci_generic.c @@ -406,6 +406,46 @@ static const struct mhi_pci_dev_info mhi .mru_default = 32768, }; diff --git a/target/linux/generic/backport-5.15/781-v6.1-bus-mhi-host-always-print-detected-modem-name.patch b/target/linux/generic/backport-5.15/781-v6.1-bus-mhi-host-always-print-detected-modem-name.patch index e974c21cb7..3c71a27b79 100644 --- a/target/linux/generic/backport-5.15/781-v6.1-bus-mhi-host-always-print-detected-modem-name.patch +++ b/target/linux/generic/backport-5.15/781-v6.1-bus-mhi-host-always-print-detected-modem-name.patch @@ -21,11 +21,11 @@ Link: https://lore.kernel.org/r/20220831100349.1488762-1-koen.vandeputte@citymes [mani: added missing review tags] Signed-off-by: Manivannan Sadhasivam --- - drivers/bus/mhi/pci_generic.c | 2 +- + drivers/bus/mhi/host/pci_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/drivers/bus/mhi/pci_generic.c -+++ b/drivers/bus/mhi/pci_generic.c +--- a/drivers/bus/mhi/host/pci_generic.c ++++ b/drivers/bus/mhi/host/pci_generic.c @@ -806,7 +806,7 @@ static int mhi_pci_probe(struct pci_dev struct mhi_controller *mhi_cntrl; int err; diff --git a/target/linux/rockchip/patches-5.15/011-01-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch b/target/linux/generic/backport-5.15/790-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-01-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch rename to target/linux/generic/backport-5.15/790-v6.0-net-mii-add-mii_bmcr_encode_fixed.patch diff --git a/target/linux/rockchip/patches-5.15/011-02-v6.2-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch b/target/linux/generic/backport-5.15/791-v6.2-01-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch similarity index 99% rename from target/linux/rockchip/patches-5.15/011-02-v6.2-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch rename to target/linux/generic/backport-5.15/791-v6.2-01-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch index cc01d6e5c3..57137c34fc 100644 --- a/target/linux/rockchip/patches-5.15/011-02-v6.2-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch +++ b/target/linux/generic/backport-5.15/791-v6.2-01-net-phy-Add-driver-for-Motorcomm-yt8521-gigabit-ethernet.patch @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -12705,6 +12705,7 @@ F: include/uapi/linux/meye.h +@@ -12697,6 +12697,7 @@ F: include/uapi/linux/meye.h MOTORCOMM PHY DRIVER M: Peter Geis @@ -31,7 +31,7 @@ Signed-off-by: David S. Miller F: drivers/net/phy/motorcomm.c --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -319,7 +319,7 @@ config MOTORCOMM_PHY +@@ -245,7 +245,7 @@ config MOTORCOMM_PHY tristate "Motorcomm PHYs" help Enables support for Motorcomm network PHYs. diff --git a/target/linux/rockchip/patches-5.15/011-03-v6.2-net-phy-fix-yt8521-duplicated-argument-to-or.patch b/target/linux/generic/backport-5.15/791-v6.2-02-net-phy-fix-yt8521-duplicated-argument-to-or.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-03-v6.2-net-phy-fix-yt8521-duplicated-argument-to-or.patch rename to target/linux/generic/backport-5.15/791-v6.2-02-net-phy-fix-yt8521-duplicated-argument-to-or.patch diff --git a/target/linux/rockchip/patches-5.15/011-04-v6.2-net-phy-add-Motorcomm-YT8531S-phy-id.patch b/target/linux/generic/backport-5.15/791-v6.2-03-net-phy-add-Motorcomm-YT8531S-phy-id.patch similarity index 99% rename from target/linux/rockchip/patches-5.15/011-04-v6.2-net-phy-add-Motorcomm-YT8531S-phy-id.patch rename to target/linux/generic/backport-5.15/791-v6.2-03-net-phy-add-Motorcomm-YT8531S-phy-id.patch index 226ad789df..da60c63905 100644 --- a/target/linux/rockchip/patches-5.15/011-04-v6.2-net-phy-add-Motorcomm-YT8531S-phy-id.patch +++ b/target/linux/generic/backport-5.15/791-v6.2-03-net-phy-add-Motorcomm-YT8531S-phy-id.patch @@ -22,7 +22,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -319,7 +319,7 @@ config MOTORCOMM_PHY +@@ -245,7 +245,7 @@ config MOTORCOMM_PHY tristate "Motorcomm PHYs" help Enables support for Motorcomm network PHYs. diff --git a/target/linux/rockchip/patches-5.15/011-05-v6.3-net-phy-fix-the-spelling-problem-of-Sentinel.patch b/target/linux/generic/backport-5.15/791-v6.3-04-net-phy-fix-the-spelling-problem-of-Sentinel.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-05-v6.3-net-phy-fix-the-spelling-problem-of-Sentinel.patch rename to target/linux/generic/backport-5.15/791-v6.3-04-net-phy-fix-the-spelling-problem-of-Sentinel.patch diff --git a/target/linux/rockchip/patches-5.15/011-06-v6.3-net-phy-motorcomm-change-the-phy-id-of-yt8521-and-yt8531s.patch b/target/linux/generic/backport-5.15/791-v6.3-05-net-phy-motorcomm-change-the-phy-id-of-yt8521-and-yt8531s.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-06-v6.3-net-phy-motorcomm-change-the-phy-id-of-yt8521-and-yt8531s.patch rename to target/linux/generic/backport-5.15/791-v6.3-05-net-phy-motorcomm-change-the-phy-id-of-yt8521-and-yt8531s.patch diff --git a/target/linux/rockchip/patches-5.15/011-07-v6.3-net-phy-Add-BIT-macro-for-Motorcomm-yt8521-yt8531-gigabit.patch b/target/linux/generic/backport-5.15/791-v6.3-06-net-phy-Add-BIT-macro-for-Motorcomm-yt8521-yt8531-gigabit.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-07-v6.3-net-phy-Add-BIT-macro-for-Motorcomm-yt8521-yt8531-gigabit.patch rename to target/linux/generic/backport-5.15/791-v6.3-06-net-phy-Add-BIT-macro-for-Motorcomm-yt8521-yt8531-gigabit.patch diff --git a/target/linux/rockchip/patches-5.15/011-08-v6.3-net-phy-Add-dts-support-for-Motorcomm-yt8521-gigabit.patch b/target/linux/generic/backport-5.15/791-v6.3-07-net-phy-Add-dts-support-for-Motorcomm-yt8521-gigabit.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-08-v6.3-net-phy-Add-dts-support-for-Motorcomm-yt8521-gigabit.patch rename to target/linux/generic/backport-5.15/791-v6.3-07-net-phy-Add-dts-support-for-Motorcomm-yt8521-gigabit.patch diff --git a/target/linux/rockchip/patches-5.15/011-09-v6.3-net-phy-Add-dts-support-for-Motorcomm-yt8531s-gigabit.patch b/target/linux/generic/backport-5.15/791-v6.3-08-net-phy-Add-dts-support-for-Motorcomm-yt8531s-gigabit.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-09-v6.3-net-phy-Add-dts-support-for-Motorcomm-yt8531s-gigabit.patch rename to target/linux/generic/backport-5.15/791-v6.3-08-net-phy-Add-dts-support-for-Motorcomm-yt8531s-gigabit.patch diff --git a/target/linux/rockchip/patches-5.15/011-10-v6.3-net-phy-Add-driver-for-Motorcomm-yt8531-gigabit-ethernet.patch b/target/linux/generic/backport-5.15/791-v6.3-09-net-phy-Add-driver-for-Motorcomm-yt8531-gigabit-ethernet.patch similarity index 99% rename from target/linux/rockchip/patches-5.15/011-10-v6.3-net-phy-Add-driver-for-Motorcomm-yt8531-gigabit-ethernet.patch rename to target/linux/generic/backport-5.15/791-v6.3-09-net-phy-Add-driver-for-Motorcomm-yt8531-gigabit-ethernet.patch index 4efcf784c4..9dce5a8add 100644 --- a/target/linux/rockchip/patches-5.15/011-10-v6.3-net-phy-Add-driver-for-Motorcomm-yt8531-gigabit-ethernet.patch +++ b/target/linux/generic/backport-5.15/791-v6.3-09-net-phy-Add-driver-for-Motorcomm-yt8531-gigabit-ethernet.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -319,7 +319,7 @@ config MOTORCOMM_PHY +@@ -245,7 +245,7 @@ config MOTORCOMM_PHY tristate "Motorcomm PHYs" help Enables support for Motorcomm network PHYs. diff --git a/target/linux/rockchip/patches-5.15/011-11-v6.3-net-phy-motorcomm-uninitialized-variables-in.patch b/target/linux/generic/backport-5.15/791-v6.3-10-net-phy-motorcomm-uninitialized-variables-in.patch similarity index 100% rename from target/linux/rockchip/patches-5.15/011-11-v6.3-net-phy-motorcomm-uninitialized-variables-in.patch rename to target/linux/generic/backport-5.15/791-v6.3-10-net-phy-motorcomm-uninitialized-variables-in.patch diff --git a/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch b/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch index 95929b7fe3..2a9dc74947 100644 --- a/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch +++ b/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17961,6 +17961,11 @@ L: netdev@vger.kernel.org +@@ -17962,6 +17962,11 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/dlink/sundance.c diff --git a/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch index c315dcf8ff..f61c078521 100644 --- a/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152 +@@ -6886,6 +6887,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp +@@ -6927,6 +6944,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp) +@@ -7067,6 +7086,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp +@@ -7149,6 +7170,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index c6b56699c4..18933de3a0 100644 --- a/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6332,6 +6332,7 @@ static int mv88e6xxx_register_switch(str +@@ -6333,6 +6333,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch b/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch index 00d5cb9ce9..2f728fefd7 100644 --- a/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch +++ b/target/linux/generic/pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch @@ -14,12 +14,12 @@ callback that the controller can trigger off. Signed-off-by: Robert Marko --- - drivers/bus/mhi/core/main.c | 1 + + drivers/bus/mhi/host/main.c | 1 + include/linux/mhi.h | 2 ++ 2 files changed, 3 insertions(+) ---- a/drivers/bus/mhi/core/main.c -+++ b/drivers/bus/mhi/core/main.c +--- a/drivers/bus/mhi/host/main.c ++++ b/drivers/bus/mhi/host/main.c @@ -891,6 +891,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_ switch (event) { case MHI_EE_SBL: diff --git a/target/linux/imx/config-5.15 b/target/linux/imx/config-5.15 index 90b8c285fd..73d0b3fe78 100644 --- a/target/linux/imx/config-5.15 +++ b/target/linux/imx/config-5.15 @@ -41,6 +41,7 @@ CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_SD=y CONFIG_BLK_PM=y CONFIG_CACHE_L2X0=y CONFIG_CLKSRC_IMX_GPT=y @@ -420,6 +421,7 @@ CONFIG_USB_MXS_PHY=y CONFIG_USB_OTG=y CONFIG_USB_PHY=y CONFIG_USB_ROLE_SWITCH=y +CONFIG_USB_STORAGE=y CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=y CONFIG_USE_OF=y diff --git a/target/linux/imx/image/bootscript-ventana b/target/linux/imx/image/bootscript-ventana index 734f74a30c..44a425d348 100644 --- a/target/linux/imx/image/bootscript-ventana +++ b/target/linux/imx/image/bootscript-ventana @@ -44,7 +44,7 @@ if itest.s "x${dtype}" == "xnand" ; then setenv root "ubi0:ubi ubi.mtd=2 rootfstype=squashfs,ubifs" else setenv fsload "${fs}load ${dtype} ${disk}:1" - part uuid ${dtype} ${disk}:1 uuid + part uuid ${dtype} ${disk}:2 uuid if test -z "${uuid}"; then # fallback to bootdev if test -n "$bootdev" ; then @@ -60,7 +60,7 @@ else else setenv root "root=PARTUUID=${uuid}" fi - setenv root "$root rootfstype=${fs} rootwait rw" + setenv root "$root rootfstype=squashfs rootwait" fi setenv bootargs "${bootargs}" "${root}" "${video}" "${extra}" diff --git a/target/linux/imx/image/cortexa9.mk b/target/linux/imx/image/cortexa9.mk index 78079aa746..2edbbaac47 100644 --- a/target/linux/imx/image/cortexa9.mk +++ b/target/linux/imx/image/cortexa9.mk @@ -52,6 +52,29 @@ define Build/apalis-emmc $(Build/imx-combined-image-clean) endef +define Build/ventana-img + rm -rf $@.boot + mkdir -p $@.boot/boot + $(CP) $(IMAGE_KERNEL) $@.boot/boot/uImage + $(foreach dts,$(DEVICE_DTS), \ + $(CP) \ + $(DTS_DIR)/$(dts).dtb \ + $@.boot/boot/; + ) + mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ + -n '$(DEVICE_ID) OpenWrt bootscript' \ + -d bootscript-$(DEVICE_NAME) \ + $@.boot/boot/6x_bootscript-ventana + cp $@ $@.fs + + $(SCRIPT_DIR)/gen_image_generic.sh $@ \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) \ + $@.boot \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) \ + $@.fs \ + 1024 + $(Build/imx-combined-image-clean) +endef define Device/Default PROFILES := Default @@ -99,10 +122,11 @@ define Device/gateworks_ventana kmod-sound-soc-imx-sgtl5000 kmod-can kmod-can-flexcan kmod-can-raw \ kmod-hwmon-gsc kmod-leds-gpio kmod-pps-gpio kobs-ng KERNEL += | boot-overlay - IMAGES := nand.ubi bootfs.tar.gz dtb + IMAGES := img.gz nand.ubi bootfs.tar.gz dtb IMAGE/nand.ubi := append-ubi IMAGE/bootfs.tar.gz := bootfs.tar.gz IMAGE/dtb := install-dtb + IMAGE/img.gz := append-rootfs | pad-extra 128k | ventana-img | gzip UBINIZE_PARTS = boot=$$(KDIR_KERNEL_IMAGE).boot.ubifs=15 PAGESIZE := 2048 BLOCKSIZE := 128k diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index adce4fe0f2..c8b8ec936b 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -132,7 +132,6 @@ define Device/8dev_habanero-dvk IMAGE_SIZE := 30976k SOC := qcom-ipq4019 IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | check-size | append-metadata - DEVICE_PACKAGES := ipq-wifi-8dev_habanero endef TARGET_DEVICES += 8dev_habanero-dvk @@ -142,7 +141,6 @@ define Device/8dev_jalapeno-common BLOCKSIZE := 128k PAGESIZE := 2048 SOC := qcom-ipq4018 - DEVICE_PACKAGES := ipq-wifi-8dev_jalapeno endef define Device/8dev_jalapeno @@ -188,7 +186,7 @@ TARGET_DEVICES += aruba_ap-303h define Device/aruba_ap-365 $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-365 - DEVICE_PACKAGES := kmod-hwmon-ad7418 ipq-wifi-aruba_ap-365 + DEVICE_PACKAGES := kmod-hwmon-ad7418 endef TARGET_DEVICES += aruba_ap-365 @@ -388,7 +386,6 @@ define Device/devolo_magic-2-wifi-next IMAGE_SIZE := 26624k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-devolo_magic-2-wifi-next DEFAULT := n endef # Missing DSA Setup @@ -443,7 +440,7 @@ define Device/edgecore_oap100 PAGESIZE := 2048 IMAGES := sysupgrade.bin DEVICE_DTS_CONFIG := config@ap.dk07.1-c1 - DEVICE_PACKAGES := ipq-wifi-edgecore_oap100 kmod-usb-acm kmod-usb-net kmod-usb-net-cdc-qmi uqmi + DEVICE_PACKAGES := kmod-usb-acm kmod-usb-net kmod-usb-net-cdc-qmi uqmi endef # Missing DSA Setup #TARGET_DEVICES += edgecore_oap100 @@ -540,7 +537,6 @@ define Device/extreme-networks_ws-ap3915i SOC := qcom-ipq4029 BLOCKSIZE := 128k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata - DEVICE_PACKAGES := ipq-wifi-extreme-networks_ws-ap3915i endef TARGET_DEVICES += extreme-networks_ws-ap3915i @@ -572,7 +568,6 @@ define Device/glinet_gl-a1300 BLOCKSIZE := 128k PAGESIZE := 2048 IMAGE_SIZE := 131072k - DEVICE_PACKAGE := ipq-wifi-glinet_gl-a1300 endef TARGET_DEVICES += glinet_gl-a1300 @@ -587,7 +582,7 @@ define Device/glinet_gl-ap1300 PAGESIZE := 2048 IMAGE_SIZE := 131072k KERNEL_INSTALL := 1 - DEVICE_PACKAGES := ipq-wifi-glinet_gl-ap1300 kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi + DEVICE_PACKAGES := kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi endef TARGET_DEVICES += glinet_gl-ap1300 @@ -630,7 +625,7 @@ define Device/glinet_gl-s1300 IMAGE_SIZE := 26624k IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-glinet_gl-s1300 kmod-fs-ext4 kmod-mmc kmod-spi-dev + DEVICE_PACKAGES := kmod-fs-ext4 kmod-mmc kmod-spi-dev endef # Missing DSA Setup #TARGET_DEVICES += glinet_gl-s1300 @@ -697,7 +692,7 @@ define Device/linksys_ea8300 UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA8300 - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-linksys_ea8300 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-usb-ledtrig-usbport endef TARGET_DEVICES += linksys_ea8300 @@ -731,7 +726,7 @@ define Device/linksys_whw03v2 UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=WHW03v2 - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-linksys_whw03v2 kmod-leds-pca963x kmod-spi-dev kmod-bluetooth + DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-leds-pca963x kmod-spi-dev kmod-bluetooth endef TARGET_DEVICES += linksys_whw03v2 @@ -935,7 +930,6 @@ define Device/p2w_r619ac DEVICE_DTS_CONFIG := config@10 BLOCKSIZE := 128k PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-p2w_r619ac endef define Device/p2w_r619ac-64m @@ -957,7 +951,6 @@ define Device/pakedge_wr-1 DEVICE_VENDOR := Pakedge DEVICE_MODEL := WR-1 DEVICE_DTS_CONFIG := config@ap.dk01.1-c1 - DEVICE_PACKAGES := ipq-wifi-pakedge_wr-1 SOC := qcom-ipq4018 BLOCKSIZE := 64k IMAGE_SIZE := 31232k @@ -1039,7 +1032,6 @@ define Device/qxwlan_e2600ac-c1 KERNEL_SIZE := 4096k IMAGE_SIZE := 31232k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac-c1 DEFAULT := n endef # Missing DSA Setup @@ -1055,7 +1047,6 @@ define Device/qxwlan_e2600ac-c2 KERNEL_INSTALL := 1 BLOCKSIZE := 128k PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac-c2 endef # Missing DSA Setup #TARGET_DEVICES += qxwlan_e2600ac-c2 @@ -1068,8 +1059,7 @@ define Device/sony_ncp-hg100-cellular SOC := qcom-ipq4019 KERNEL_SIZE := 8192k IMAGE_SIZE := 128m - DEVICE_PACKAGES := e2fsprogs ipq-wifi-sony_ncp-hg100-cellular \ - kmod-fs-ext4 uqmi + DEVICE_PACKAGES := e2fsprogs kmod-fs-ext4 uqmi endef TARGET_DEVICES += sony_ncp-hg100-cellular @@ -1085,7 +1075,7 @@ define Device/teltonika_rutx10 PAGESIZE := 2048 FILESYSTEMS := squashfs IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand | append-rutx-metadata - DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth + DEVICE_PACKAGES := kmod-bluetooth endef # Missing DSA Setup #TARGET_DEVICES += teltonika_rutx10 @@ -1141,7 +1131,7 @@ define Device/zte_mf18a BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_IN_UBI := 1 - DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct ipq-wifi-zte_mf18a + DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct endef TARGET_DEVICES += zte_mf18a @@ -1165,7 +1155,7 @@ TARGET_DEVICES += zte_mf286d define Device/zte_mf289f $(call Device/zte_mf28x_common) DEVICE_MODEL := MF289F - DEVICE_PACKAGES += ipq-wifi-zte_mf289f ath10k-firmware-qca9984-ct + DEVICE_PACKAGES += ath10k-firmware-qca9984-ct endef TARGET_DEVICES += zte_mf289f diff --git a/target/linux/ipq40xx/patches-5.15/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch b/target/linux/ipq40xx/patches-5.15/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch new file mode 100644 index 0000000000..e24895deec --- /dev/null +++ b/target/linux/ipq40xx/patches-5.15/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch @@ -0,0 +1,27 @@ +From c87df89a82c17411cd6b98e5afaa1203ee9508dc Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 18 May 2023 12:16:02 +0200 +Subject: [PATCH] Revert "firmware: qcom_scm: Clear download bit during reboot" + +This reverts commit a3ea89b5978dbcd0fa55f675c5a1e04611093709. + +It is breaking reboot on IPQ4019 boards, so revert until a proper fix +is found. + +Signed-off-by: Robert Marko +--- + drivers/firmware/qcom_scm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/firmware/qcom_scm.c ++++ b/drivers/firmware/qcom_scm.c +@@ -1352,7 +1352,8 @@ static int qcom_scm_probe(struct platfor + static void qcom_scm_shutdown(struct platform_device *pdev) + { + /* Clean shutdown, disable download mode to allow normal restart */ +- qcom_scm_set_download_mode(false); ++ if (download_mode) ++ qcom_scm_set_download_mode(false); + } + + static const struct of_device_id qcom_scm_dt_match[] = { diff --git a/target/linux/ipq806x/image/generic.mk b/target/linux/ipq806x/image/generic.mk index e02de3ba58..f66bc1f43a 100644 --- a/target/linux/ipq806x/image/generic.mk +++ b/target/linux/ipq806x/image/generic.mk @@ -141,8 +141,7 @@ define Device/edgecore_ecw5410 BLOCKSIZE := 128k PAGESIZE := 2048 DEVICE_DTS_CONFIG := config@v2.0-ap160 - DEVICE_PACKAGES := ath10k-firmware-qca9984-ct \ - ipq-wifi-edgecore_ecw5410 + DEVICE_PACKAGES := ath10k-firmware-qca9984-ct endef TARGET_DEVICES += edgecore_ecw5410 @@ -345,7 +344,7 @@ define Device/nokia_ac400i BLOCKSIZE := 128k PAGESIZE := 2048 BOARD_NAME := ac400i - DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-nokia-ac400i + DEVICE_PACKAGES := ath10k-firmware-qca9984-ct endef TARGET_DEVICES += nokia_ac400i diff --git a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch index a11549ba47..3f4597c65d 100644 --- a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2760,6 +2760,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds index bfc589e6c0..2b045d0945 100644 --- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds +++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds @@ -15,15 +15,6 @@ ctera,c200-v2) ucidef_set_led_usbport "usb2" "USB2" "green:usb-2" "usb1-port1" "usb2-port1" ucidef_set_led_usbport "usb3" "USB3" "green:usb-1" "usb1-port2" "usb2-port2" ;; -fortinet,fg-50e) - ucidef_set_led_netdev "wan1_link" "WAN1 Link" "green:speed_wan1" "eth1" "link" - ucidef_set_led_netdev "wan2_link" "WAN2 Link" "green:speed_wan2" "eth2" "link" - ucidef_set_led_netdev "lan1_link" "LAN1 Link" "green:speed_lan1" "lan1" "link" - ucidef_set_led_netdev "lan2_link" "LAN2 Link" "green:speed_lan2" "lan2" "link" - ucidef_set_led_netdev "lan3_link" "LAN3 Link" "green:speed_lan3" "lan3" "link" - ucidef_set_led_netdev "lan4_link" "LAN4 Link" "green:speed_lan4" "lan4" "link" - ucidef_set_led_netdev "lan5_link" "LAN5 Link" "green:speed_lan5" "lan5" "link" - ;; kobol,helios4) ucidef_set_led_usbport "USB" "USB" "helios4:green:usb" "usb1-port1" "usb2-port1" "usb3-port1" "usb4-port1" "usb5-port1" ;; diff --git a/target/linux/mvebu/cortexa9/config-5.15 b/target/linux/mvebu/cortexa9/config-5.15 index b737c44d42..88a2f14c02 100644 --- a/target/linux/mvebu/cortexa9/config-5.15 +++ b/target/linux/mvebu/cortexa9/config-5.15 @@ -1,2 +1,3 @@ +CONFIG_LED_TRIGGER_PHY=y CONFIG_PHY_MVEBU_A38X_COMPHY=y CONFIG_RTC_DRV_MV=y diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts index 506e01f0ff..61d2da1755 100644 --- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts +++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts @@ -97,72 +97,84 @@ label = "green:speed_wan1"; gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; color = ; + linux,default-trigger = "f1072004.mdio-mii:00:1Gbps"; }; led-7 { label = "green:speed_wan2"; gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; color = ; + linux,default-trigger = "f1072004.mdio-mii:01:1Gbps"; }; led-8 { label = "amber:speed_lan5"; gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; color = ; + linux,default-trigger = "mv88e6xxx-1:00:100Mbps"; }; led-9 { label = "green:speed_lan5"; gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; color = ; + linux,default-trigger = "mv88e6xxx-1:00:1Gbps"; }; led-10 { label = "green:speed_lan4"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:01:1Gbps"; }; led-11 { label = "amber:speed_lan4"; gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:01:100Mbps"; }; led-12 { label = "amber:speed_lan3"; gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:02:100Mbps"; }; led-13 { label = "green:speed_lan3"; gpios = <&gpio2 7 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:02:1Gbps"; }; led-14 { label = "green:speed_lan1"; gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:04:1Gbps"; }; led-15 { label = "amber:speed_lan1"; gpios = <&gpio2 13 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:04:100Mbps"; }; led-16 { label = "green:speed_lan2"; gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:03:1Gbps"; }; led-17 { label = "amber:speed_lan2"; gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; color = ; + linux,default-trigger = "mv88e6xxx-1:03:100Mbps"; }; }; diff --git a/target/linux/octeontx/config-5.15 b/target/linux/octeontx/config-5.15 index 40cab28f60..c2ad7e7ab9 100644 --- a/target/linux/octeontx/config-5.15 +++ b/target/linux/octeontx/config-5.15 @@ -59,6 +59,7 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y @@ -401,6 +402,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_USB=y CONFIG_USB_COMMON=y CONFIG_USB_PCI=y +CONFIG_USB_STORAGE=y CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set CONFIG_USB_XHCI_HCD=y diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index baa930e684..c080456e7a 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -172,6 +172,7 @@ endef define Device/Default PROFILES = Default + BLOCKSIZE := 64k KERNEL := $(KERNEL_DTB) | uImage lzma KERNEL_LOADADDR := $(loadaddr-y) LZMA_TEXT_START := 0x81800000 @@ -185,7 +186,6 @@ define Device/Default endef define Device/netgear_sercomm_nor - BLOCKSIZE := 64k DEVICE_VENDOR := NETGEAR IMAGES += factory.img IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ @@ -197,7 +197,6 @@ define Device/netgear_sercomm_nor endef define Device/seama - BLOCKSIZE := 64k SEAMA_MTDBLOCK := 2 IMAGES += factory.bin diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 7da7fced08..b4e087889e 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -79,7 +79,6 @@ define Device/ampedwireless_b1200ex SOC := mt7620a DEVICE_VENDOR := Amped Wireless DEVICE_MODEL := B1200EX - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN10 -f 0x70000 -S 0x01100000 | pad-rootfs | \ @@ -207,7 +206,6 @@ TARGET_DEVICES += comfast_cf-wr800n define Device/dlink_dch-m225 $(Device/seama) SOC := mt7620a - BLOCKSIZE := 4k SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b IMAGE_SIZE := 6848k DEVICE_VENDOR := D-Link @@ -393,7 +391,6 @@ define Device/edimax_br-6478ac-v2 DEVICE_VENDOR := Edimax DEVICE_MODEL := BR-6478AC DEVICE_VARIANT := V2 - BLOCKSIZE := 64k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \ @@ -407,7 +404,6 @@ define Device/edimax_ew-7476rpc SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := EW-7476RPC - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN79 -f 0x70000 -S 0x01100000 | pad-rootfs | \ @@ -420,7 +416,6 @@ define Device/edimax_ew-7478ac SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := EW-7478AC - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN70 -f 0x70000 -S 0x01100000 | pad-rootfs | \ @@ -433,7 +428,6 @@ define Device/edimax_ew-7478apc SOC := mt7620a DEVICE_VENDOR := Edimax DEVICE_MODEL := EW-7478APC - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN75 -f 0x70000 -S 0x01100000 | pad-rootfs | \ @@ -458,7 +452,6 @@ TARGET_DEVICES += elecom_wrh-300cr define Device/engenius_epg600 $(Device/uimage-lzma-loader) SOC := mt7620a - BLOCKSIZE := 4k IMAGE_SIZE := 15616k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ @@ -472,7 +465,6 @@ TARGET_DEVICES += engenius_epg600 define Device/engenius_esr600 SOC := mt7620a - BLOCKSIZE := 64k IMAGE_SIZE := 15616k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ @@ -771,7 +763,6 @@ TARGET_DEVICES += microduino_microwrt define Device/netcore_nw5212 SOC := mt7620a IMAGE_SIZE := 16064k - BLOCKSIZE := 4k DEVICE_VENDOR := Netcore DEVICE_MODEL := NW5212 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci @@ -782,7 +773,6 @@ define Device/netgear_ex2700 SOC := mt7620a NETGEAR_HW_ID := 29764623+4+0+32+2x2+0 NETGEAR_BOARD_ID := EX2700 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ @@ -798,7 +788,6 @@ TARGET_DEVICES += netgear_ex2700 define Device/netgear_ex3700 SOC := mt7620a NETGEAR_BOARD_ID := U12H319T00_NETGEAR - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | netgear-chk @@ -812,7 +801,6 @@ TARGET_DEVICES += netgear_ex3700 define Device/netgear_ex6120 SOC := mt7620a NETGEAR_BOARD_ID := U12H319T30_NETGEAR - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | netgear-chk @@ -825,7 +813,6 @@ TARGET_DEVICES += netgear_ex6120 define Device/netgear_ex6130 SOC := mt7620a NETGEAR_BOARD_ID := U12H319T50_NETGEAR - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.chk IMAGE/factory.chk := $$(sysupgrade_bin) | check-size | netgear-chk @@ -838,7 +825,6 @@ TARGET_DEVICES += netgear_ex6130 define Device/netgear_jwnr2010-v5 $(Device/netgear_sercomm_nor) SOC := mt7620n - BLOCKSIZE := 4k IMAGE_SIZE := 3840k DEVICE_MODEL := JWNR2010 DEVICE_VARIANT := v5 @@ -854,7 +840,6 @@ TARGET_DEVICES += netgear_jwnr2010-v5 define Device/netgear_pr2000 $(Device/netgear_sercomm_nor) SOC := mt7620n - BLOCKSIZE := 4k IMAGE_SIZE := 15488k DEVICE_MODEL := PR2000 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci @@ -871,7 +856,6 @@ define Device/netgear_wn3000rp-v3 IMAGE_SIZE := 7872k NETGEAR_HW_ID := 29764836+8+0+32+2x2+0 NETGEAR_BOARD_ID := WN3000RPv3 - BLOCKSIZE := 4k IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ append-uImage-fakehdr filesystem @@ -888,7 +872,6 @@ define Device/netgear_wn3100rp-v2 IMAGE_SIZE := 7872k NETGEAR_HW_ID := 29764883+8+0+32+2x2+0 NETGEAR_BOARD_ID := WN3100RPv2 - BLOCKSIZE := 4k IMAGES += factory.bin KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | \ append-uImage-fakehdr filesystem @@ -912,7 +895,6 @@ TARGET_DEVICES += netis_wf2770 define Device/nexx_wt3020-4m SOC := mt7620n - BLOCKSIZE := 4k IMAGE_SIZE := 3776k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ @@ -1118,7 +1100,6 @@ TARGET_DEVICES += sercomm_na930 define Device/sitecom_wlr-4100-v1-002 SOC := mt7620a - BLOCKSIZE := 4k IMAGE_SIZE := 7744k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ @@ -1255,7 +1236,6 @@ TARGET_DEVICES += trendnet_tew-810dr define Device/vonets_var11n-300 SOC := mt7620n IMAGE_SIZE := 3776k - BLOCKSIZE := 4k DEVICE_VENDOR := Vonets DEVICE_MODEL := VAR11N-300 DEFAULT := n diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index e0da1260c8..b2c47ea85e 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -148,6 +148,15 @@ define Device/dsa-migration DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA endef +define Device/nand + $(Device/dsa-migration) + BLOCKSIZE := 128k + KERNEL_SIZE := 4096k + PAGESIZE := 2048 + UBINIZE_OPTS := -E 5 + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata +endef + define Device/adslr_g7 $(Device/dsa-migration) IMAGE_SIZE := 16064k @@ -181,17 +190,12 @@ endef TARGET_DEVICES += alfa-network_quad-e4g define Device/ampedwireless_ally_common - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := Amped Wireless DEVICE_PACKAGES := kmod-mt7615-firmware IMAGE_SIZE := 32768k - KERNEL_SIZE := 4096k - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 KERNEL_INITRAMFS := $(KERNEL_DTB) | uImage lzma -n 'flashable-initramfs' |\ edimax-header -s CSYS -m RN68 -f 0x001c0000 -S 0x01100000 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef define Device/ampedwireless_ally-r1900k @@ -217,7 +221,6 @@ define Device/arcadyan_we420223-99 IMAGE_SIZE := 32128k KERNEL_SIZE := 4352k UBINIZE_OPTS := -E 5 - BLOCKSIZE := 64k PAGESIZE := 1 SUBPAGESIZE := 1 VID_HDR_OFFSET := 64 @@ -258,7 +261,6 @@ define Device/asus_rp-ac56 DEVICE_VENDOR := ASUS DEVICE_MODEL := RP-AC56 IMAGE_SIZE := 16000k - BLOCKSIZE := 64k DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 \ kmod-i2c-ralink kmod-sound-mt7620 -uboot-envtools IMAGES += factory.bin @@ -297,16 +299,11 @@ endef TARGET_DEVICES += asus_rt-ac57u-v1 define Device/asus_rt-ac65p - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC65P IMAGE_SIZE := 51200k - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_PACKAGES := kmod-usb3 kmod-mt7615-firmware @@ -314,16 +311,11 @@ endef TARGET_DEVICES += asus_rt-ac65p define Device/asus_rt-ac85p - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC85P IMAGE_SIZE := 51200k - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_PACKAGES := kmod-usb3 kmod-mt7615-firmware @@ -343,18 +335,13 @@ endef TARGET_DEVICES += asus_rt-n56u-b1 define Device/asus_rt-ax53u - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AX53U DEVICE_ALT0_VENDOR := ASUS DEVICE_ALT0_MODEL := RT-AX1800U IMAGE_SIZE := 51200k - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 kmod-usb-ledtrig-usbport @@ -362,7 +349,7 @@ endef TARGET_DEVICES += asus_rt-ax53u define Device/asus_rt-ax54 - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AX54 DEVICE_ALT0_VENDOR := ASUS @@ -372,12 +359,7 @@ define Device/asus_rt-ax54 DEVICE_ALT2_VENDOR := ASUS DEVICE_ALT2_MODEL := RT-AX1800S IMAGE_SIZE := 51200k - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_PACKAGES := kmod-mt7915-firmware @@ -385,22 +367,18 @@ endef TARGET_DEVICES += asus_rt-ax54 define Device/beeline_smartbox-flash - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) DEVICE_VENDOR := Beeline DEVICE_MODEL := SmartBox Flash IMAGE_SIZE := 32768k KERNEL_SIZE := 4352k - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | \ uImage none | arcadyan-trx 0x746f435d | pad-to $$(KERNEL_SIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel | \ uImage none IMAGES += factory.trx IMAGE/factory.trx := append-kernel | append-ubi | check-size - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-usb3 kmod-mt7615-firmware uencrypt-openssl endef TARGET_DEVICES += beeline_smartbox-flash @@ -431,21 +409,16 @@ endef TARGET_DEVICES += beeline_smartbox-turbo define Device/belkin_rt1800 - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k + $(Device/nand) IMAGE_SIZE := 49152k DEVICE_VENDOR := Belkin DEVICE_MODEL := RT1800 DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 - UBINIZE_OPTS := -E 5 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ append-squashfs4-fakeroot IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ append-ubi | check-size | belkin-header RT18 1 9.9.9 endef @@ -583,20 +556,16 @@ endef TARGET_DEVICES += dlink_dap-1620-b1 define Device/dlink_dap-x1860-a1 - $(Device/dsa-migration) + $(Device/nand) IMAGE_SIZE := 53248k DEVICE_VENDOR := D-Link DEVICE_MODEL := DAP-X1860 DEVICE_VARIANT := A1 - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 KERNEL_SIZE := 8192k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size | elx-header 011b0060 8844A2D168B45A2D DEVICE_PACKAGES := kmod-mt7915-firmware rssileds -uboot-envtools @@ -626,18 +595,13 @@ define Device/dlink_dir-8xx-r1 endef define Device/dlink_dir-xx60-a1 - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k + $(Device/nand) IMAGE_SIZE := 40960k - UBINIZE_OPTS := -E 5 DEVICE_VENDOR := D-Link DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 \ kmod-usb-ledtrig-usbport -uboot-envtools KERNEL := $$(KERNEL) | uimage-sgehdr IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size endef @@ -1039,17 +1003,13 @@ endef TARGET_DEVICES += hanyang_hyc-g920 define Device/h3c_tx180x - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 + $(Device/nand) KERNEL_SIZE := 8192k IMAGE_SIZE := 120832k - UBINIZE_OPTS := -E 5 KERNEL_LOADADDR := 0x82000000 KERNEL_INITRAMFS := kernel-bin | relocate-kernel 0x80001000 | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb KERNEL := $$(KERNEL_INITRAMFS) | h3c-blank-header - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := H3C DEVICE_PACKAGES := kmod-mt7915-firmware endef @@ -1073,12 +1033,8 @@ endef TARGET_DEVICES += h3c_tx1806 define Device/haier-sim_wr1800k - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k + $(Device/nand) IMAGE_SIZE := 125440k - UBINIZE_OPTS := -E 5 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb @@ -1087,7 +1043,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) ARTIFACT/initramfs-factory.bin := append-image-stage initramfs-kernel.bin | \ haier-sim_wr1800k-factory endif - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7915-firmware endef @@ -1109,15 +1064,10 @@ endef TARGET_DEVICES += hilink_hlk-7621a-evb define Device/hiwifi_hc5962 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 IMAGE_SIZE := 32768k IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_VENDOR := HiWiFi @@ -1171,16 +1121,11 @@ endef TARGET_DEVICES += iodata_wn-ax1167gr define Device/iodata_nand - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := I-O DATA - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 - KERNEL_SIZE := 4096k IMAGE_SIZE := 51200k LOADER_TYPE := bin KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | lzma | uImage lzma - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef # The OEM webinterface expects an kernel with initramfs which has the uImage @@ -1281,16 +1226,11 @@ endef TARGET_DEVICES += iptime_a3004ns-dual define Device/iptime_a3004t - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 FILESYSTEMS := squashfs - KERNEL_SIZE := 4096k IMAGE_SIZE := 129280k UIMAGE_NAME := a3004t - UBINIZE_OPTS := -E 5 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := ipTIME DEVICE_MODEL := A3004T DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 -uboot-envtools @@ -1330,17 +1270,12 @@ endef TARGET_DEVICES += iptime_a8004t define Device/iptime_ax2004m - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k + $(Device/nand) IMAGE_SIZE := 121344k - UBINIZE_OPTS := -E 5 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb IMAGES += recovery.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/recovery.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size | iptime-crc32 ax2004m DEVICE_VENDOR := ipTIME @@ -1350,14 +1285,9 @@ endef TARGET_DEVICES += iptime_ax2004m define Device/iptime_t5004 - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k + $(Device/nand) IMAGE_SIZE := 129280k - UBINIZE_OPTS := -E 5 UIMAGE_NAME := t5004 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := ipTIME DEVICE_MODEL := T5004 DEVICE_PACKAGES := -wpad-basic-openssl -uboot-envtools @@ -1378,15 +1308,10 @@ endef TARGET_DEVICES += jcg_jhr-ac876m define Device/jcg_q20 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 - KERNEL_SIZE := 4096k IMAGE_SIZE := 91136k IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_VENDOR := JCG @@ -1421,7 +1346,6 @@ TARGET_DEVICES += jdcloud_re-sp-01b define Device/keenetic_kn-3010 $(Device/dsa-migration) $(Device/uimage-lzma-loader) - BLOCKSIZE := 64k IMAGE_SIZE := 31488k DEVICE_VENDOR := Keenetic DEVICE_MODEL := KN-3010 @@ -1446,18 +1370,13 @@ endef TARGET_DEVICES += lenovo_newifi-d1 define Device/linksys_e5600 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGE_SIZE := 26624k DEVICE_VENDOR := Linksys DEVICE_MODEL := E5600 DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap - UBINIZE_OPTS := -E 5 IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | check-size | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ append-ubi | check-size | gemtek-trailer endef @@ -1473,17 +1392,12 @@ endef TARGET_DEVICES += linksys_e7350 define Device/linksys_ea7xxx - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGE_SIZE := 36864k DEVICE_VENDOR := Linksys DEVICE_PACKAGES := kmod-usb3 kmod-mt7615-firmware - UBINIZE_OPTS := -E 5 IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | check-size | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ append-ubi | check-size | linksys-image type=$$$$(LINKSYS_HWNAME) endef @@ -1570,7 +1484,6 @@ TARGET_DEVICES += mediatek_ap-mt7621a-v60 define Device/mediatek_mt7621-eval-board $(Device/dsa-migration) - BLOCKSIZE := 64k IMAGE_SIZE := 15104k DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7621 EVB @@ -1596,7 +1509,6 @@ TARGET_DEVICES += mercusys_mr70x-v1 define Device/MikroTik $(Device/dsa-migration) DEVICE_VENDOR := MikroTik - BLOCKSIZE := 64k IMAGE_SIZE := 16128k DEVICE_PACKAGES := kmod-usb3 -uboot-envtools KERNEL_NAME := vmlinuz @@ -1669,22 +1581,18 @@ endef TARGET_DEVICES += mtc_wr1201 define Device/mts_wg430223 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) DEVICE_VENDOR := MTS DEVICE_MODEL := WG430223 IMAGE_SIZE := 32768k KERNEL_SIZE := 4352k - UBINIZE_OPTS := -E 5 - BLOCKSIZE := 128k - PAGESIZE := 2048 KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | \ uImage none | arcadyan-trx 0x53485231 | pad-to $$(KERNEL_SIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-kernel | \ uImage none IMAGES += factory.trx IMAGE/factory.trx := append-kernel | append-ubi | check-size - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_PACKAGES := kmod-mt7615-firmware uencrypt-openssl endef TARGET_DEVICES += mts_wg430223 @@ -1703,17 +1611,12 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 IMAGES += factory.img kernel.bin rootfs.bin IMAGE/factory.img := pad-extra 2048k | append-kernel | pad-to 6144k | \ append-ubi | pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ zip $$$$(SERCOMM_HWNAME).bin | sercom-seal - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-ubi | check-size DEVICE_VENDOR := NETGEAR @@ -1864,17 +1767,13 @@ endef TARGET_DEVICES += netgear_wac124 define Device/netgear_wax202 - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := WAX202 DEVICE_PACKAGES := kmod-mt7915-firmware -uboot-envtools NETGEAR_ENC_MODEL := WAX202 NETGEAR_ENC_REGION := US - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 IMAGE_SIZE := 38912k - KERNEL_SIZE := 4096k KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | \ @@ -1882,7 +1781,6 @@ define Device/netgear_wax202 IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-to $$(KERNEL_SIZE) | \ append-ubi | check-size | netgear-encrypted-factory - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += netgear_wax202 @@ -1905,18 +1803,13 @@ endef TARGET_DEVICES += netgear_wndr3700-v5 define Device/netis_wf2881 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 FILESYSTEMS := squashfs - KERNEL_SIZE := 4096k IMAGE_SIZE := 129280k - UBINIZE_OPTS := -E 5 UIMAGE_NAME := WF2881_0.0.00 KERNEL_INITRAMFS := $$(KERNEL) | netis-tail WF2881 IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_VENDOR := NETIS @@ -1960,14 +1853,9 @@ endef TARGET_DEVICES += planex_vr500 define Device/raisecom_msg1500-x-00 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k IMAGE_SIZE := 129280k - UBINIZE_OPTS := -E 5 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_VENDOR := RAISECOM DEVICE_MODEL := MSG1500 DEVICE_VARIANT := X.00 @@ -2014,13 +1902,8 @@ endef TARGET_DEVICES += samknows_whitebox-v8 define Device/sercomm_na502 - $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 + $(Device/nand) IMAGE_SIZE := 20480k - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - UBINIZE_OPTS := -E 5 - KERNEL_SIZE := 4096k DEVICE_VENDOR := SERCOMM DEVICE_MODEL := NA502 DEVICE_PACKAGES := kmod-mt76x2 kmod-mt7603 kmod-usb3 -uboot-envtools @@ -2028,13 +1911,8 @@ endef TARGET_DEVICES += sercomm_na502 define Device/sercomm_na502s - $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 + $(Device/nand) IMAGE_SIZE := 20971520 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - UBINIZE_OPTS := -E 5 - KERNEL_SIZE := 4096k DEVICE_VENDOR := SERCOMM DEVICE_MODEL := NA502S DEVICE_PACKAGES := kmod-mt76x2 kmod-mt7603 kmod-usb3 kmod-usb-serial \ @@ -2250,12 +2128,8 @@ endef TARGET_DEVICES += tplink_eap615-wall-v1 define Device/tplink_ec330-g5u-v1 - $(Device/dsa-migration) + $(Device/nand) LOADER := bin - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 - KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k DEVICE_VENDOR := TP-Link DEVICE_MODEL := EC330-G5u @@ -2272,24 +2146,19 @@ define Device/tplink_ec330-g5u-v1 IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \ append-ubi | check-size - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata | check-size endef TARGET_DEVICES += tplink_ec330-g5u-v1 define Device/tplink_er605-v2 - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := TP-Link DEVICE_MODEL := ER605 DEVICE_VARIANT := v2 DEVICE_PACKAGES := -wpad-basic-openssl kmod-usb3 -uboot-envtools - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k KERNEL_IN_UBI := 1 KERNEL_LOADADDR := 0x82000000 KERNEL := kernel-bin | relocate-kernel 0x80001000 | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb IMAGES += sysupgrade.tar - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE_SIZE := 127744k endef TARGET_DEVICES += tplink_er605-v2 @@ -2513,7 +2382,6 @@ TARGET_DEVICES += wavlink_wl-wn533a8 define Device/wavlink_ws-wn572hp3-4g $(Device/dsa-migration) - BLOCKSIZE := 64k DEVICE_VENDOR := Wavlink DEVICE_MODEL := WS-WN572HP3 DEVICE_VARIANT := 4G @@ -2569,17 +2437,12 @@ endef TARGET_DEVICES += winstars_ws-wn583a6 define Device/xiaomi_nand_separate - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) DEVICE_VENDOR := Xiaomi - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 IMAGES += kernel1.bin rootfs0.bin IMAGE/kernel1.bin := append-kernel IMAGE/rootfs0.bin := append-ubi | check-size - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef define Device/xiaomi_mi-router-3g @@ -2605,17 +2468,12 @@ endef TARGET_DEVICES += xiaomi_mi-router-3g-v2 define Device/xiaomi_mi-router-3-pro - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE:= 4096k - UBINIZE_OPTS := -E 5 IMAGE_SIZE := 255488k DEVICE_VENDOR := Xiaomi DEVICE_MODEL := Mi Router 3 Pro IMAGES += factory.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport @@ -2663,16 +2521,11 @@ endef TARGET_DEVICES += xiaomi_mi-router-ac2100 define Device/xiaomi_mi-router-cr660x - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) DEVICE_VENDOR := Xiaomi - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 IMAGE_SIZE := 128512k IMAGES += firmware.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/firmware.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size DEVICE_PACKAGES += kmod-mt7915-firmware @@ -2917,12 +2770,10 @@ endef TARGET_DEVICES += zte_e8820s define Device/zyxel_lte3301-plus - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 + $(Device/nand) DEVICE_VENDOR := ZyXEL DEVICE_MODEL := LTE3301-PLUS + KERNEL_SIZE := 31488k DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 kmod-usb-ledtrig-usbport \ kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi KERNEL := $(KERNEL_DTB) | uImage lzma | \ @@ -2930,38 +2781,30 @@ define Device/zyxel_lte3301-plus KERNEL_INITRAMFS := $(KERNEL_DTB) | uImage lzma | \ zytrx-header $$(DEVICE_MODEL) 9.99(ABQU.1)$$(VERSION_DIST)-recovery KERNEL_INITRAMFS_SUFFIX := -recovery.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += zyxel_lte3301-plus define Device/zyxel_nr7101 - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 + $(Device/nand) DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NR7101 + KERNEL_SIZE := 31488k DEVICE_PACKAGES := kmod-mt7603 kmod-usb3 kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi KERNEL := $(KERNEL_DTB) | uImage lzma | zytrx-header $$(DEVICE_MODEL) $$(VERSION_DIST)-$$(REVISION) KERNEL_INITRAMFS := $(KERNEL_DTB) | uImage lzma | zytrx-header $$(DEVICE_MODEL) 9.99(ABUV.9)$$(VERSION_DIST)-recovery KERNEL_INITRAMFS_SUFFIX := -recovery.bin - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += zyxel_nr7101 define Device/zyxel_nwa-ax - $(Device/dsa-migration) + $(Device/nand) DEVICE_VENDOR := ZyXEL - BLOCKSIZE := 128k - PAGESIZE := 2048 KERNEL_SIZE := 8192k - UBINIZE_OPTS := -E 5 DEVICE_PACKAGES := kmod-mt7915-firmware zyxel-bootconfig KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb IMAGES += factory.bin ramboot-factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | zyxel-nwa-fit IMAGE/ramboot-factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef define Device/zyxel_nwa50ax @@ -2977,33 +2820,24 @@ endef TARGET_DEVICES += zyxel_nwa55axe define Device/zyxel_wap6805 - $(Device/dsa-migration) + $(Device/nand) $(Device/uimage-lzma-loader) - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 IMAGE_SIZE := 32448k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := WAP6805 DEVICE_PACKAGES := kmod-mt7603 kmod-mt7621-qtn-rgmii -uboot-envtools KERNEL := $$(KERNEL/lzma-loader) | uImage none | uimage-padhdr 160 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += zyxel_wap6805 define Device/zyxel_wsm20 - $(Device/dsa-migration) - BLOCKSIZE := 128k - PAGESIZE := 2048 + $(Device/nand) KERNEL_SIZE := 8192k IMAGE_SIZE := 41943040 - UBINIZE_OPTS := -E 5 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := WSM20 DEVICE_PACKAGES := kmod-mt7915-firmware KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | znet-header V1.00(ABZF.0)C0 KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb | znet-header V1.00(ABZF.0)C0 - IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += zyxel_wsm20 diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index a1db4a4316..333b402e7f 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -50,7 +50,6 @@ endef TARGET_DEVICES += asus_rt-ac1200 define Device/asus_rt-ac1200-v2 - BLOCKSIZE := 64k IMAGE_SIZE := 16064k DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC1200 @@ -324,7 +323,6 @@ endef TARGET_DEVICES += jotale_js76x8-32m define Device/keenetic_kn-1613 - BLOCKSIZE := 64k IMAGE_SIZE := 31488k DEVICE_VENDOR := Keenetic DEVICE_MODEL := KN-1613 @@ -382,7 +380,6 @@ endef TARGET_DEVICES += mediatek_linkit-smart-7688 define Device/mediatek_mt7628an-eval-board - BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := MediaTek DEVICE_MODEL := MT7628 EVB @@ -1043,7 +1040,6 @@ TARGET_DEVICES += zbtlink_zbt-we1226 define Device/zyxel_keenetic-extra-ii IMAGE_SIZE := 29824k - BLOCKSIZE := 64k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic Extra II DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \ diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk index 5e69e291d2..3d2d0c7ae0 100644 --- a/target/linux/ramips/image/rt288x.mk +++ b/target/linux/ramips/image/rt288x.mk @@ -12,11 +12,10 @@ define Build/gemtek-header endef define Device/airlink101_ar670w - BLOCKSIZE := 64k DEVICE_VENDOR := Airlink DEVICE_MODEL := AR670W IMAGE_SIZE := 3840k - KERNEL := $(KERNEL_DTB) | pad-to $$(BLOCKSIZE) + KERNEL := $(KERNEL_DTB) | pad-to $$$$(BLOCKSIZE) IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | \ wrg-header wrgn16a_airlink_ar670w @@ -38,7 +37,6 @@ endef TARGET_DEVICES += airlink101_ar725w define Device/asus_rt-n15 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-N15 @@ -60,7 +58,6 @@ endef TARGET_DEVICES += belkin_f5d8235-v1 define Device/buffalo_wli-tx4-ag300n - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WLI-TX4-AG300N @@ -71,7 +68,6 @@ endef TARGET_DEVICES += buffalo_wli-tx4-ag300n define Device/buffalo_wzr-agl300nh - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WZR-AGL300NH @@ -82,7 +78,6 @@ endef TARGET_DEVICES += buffalo_wzr-agl300nh define Device/dlink_dap-1522-a1 - BLOCKSIZE := 64k IMAGE_SIZE := 3712k DEVICE_VENDOR := D-Link DEVICE_MODEL := DAP-1522 @@ -98,7 +93,6 @@ endef TARGET_DEVICES += dlink_dap-1522-a1 define Device/ralink_v11st-fe - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Ralink DEVICE_MODEL := V11ST-FE diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index 92cc9094a8..83658cffa2 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -67,7 +67,6 @@ TARGET_DEVICES += accton_wr6202 define Device/airlive_air3gii SOC := rt5350 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := AirLive DEVICE_MODEL := Air3GII @@ -174,7 +173,6 @@ TARGET_DEVICES += argus_atp-52b define Device/asiarf_awapn2403 SOC := rt3052 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := AsiaRF DEVICE_MODEL := AWAPN2403 @@ -208,7 +206,6 @@ TARGET_DEVICES += asiarf_awm002-evb-8m define Device/asus_rt-g32-b1 SOC := rt3050 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-G32 @@ -220,7 +217,6 @@ TARGET_DEVICES += asus_rt-g32-b1 define Device/asus_rt-n10-plus SOC := rt3050 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-N10+ @@ -241,7 +237,6 @@ TARGET_DEVICES += asus_rt-n13u define Device/asus_wl-330n SOC := rt3050 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := ASUS DEVICE_MODEL := WL-330N @@ -252,7 +247,6 @@ TARGET_DEVICES += asus_wl-330n define Device/asus_wl-330n3g SOC := rt3050 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k DEVICE_VENDOR := ASUS DEVICE_MODEL := WL-330N3G @@ -305,7 +299,6 @@ TARGET_DEVICES += belkin_f7c027 define Device/buffalo_whr-g300n SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3712k DEVICE_VENDOR := Buffalo DEVICE_MODEL := WHR-G300N @@ -371,7 +364,6 @@ TARGET_DEVICES += dlink_dir-300-b1 define Device/dlink_dir-300-b7 SOC := rt5350 - BLOCKSIZE := 4k IMAGE_SIZE := 7872k DEVICE_VENDOR := D-Link DEVICE_MODEL := DIR-300 @@ -407,7 +399,6 @@ TARGET_DEVICES += dlink_dir-600-b1 define Device/dlink_dir-610-a1 $(Device/seama) SOC := rt5350 - BLOCKSIZE := 4k SEAMA_SIGNATURE := wrgn59_dlob.hans_dir610 KERNEL := $(KERNEL_DTB) IMAGE_SIZE := 3776k @@ -436,7 +427,6 @@ TARGET_DEVICES += dlink_dir-615-d define Device/dlink_dir-615-h1 $(Device/uimage-lzma-loader) SOC := rt3352 - BLOCKSIZE := 4k IMAGES += factory.bin IMAGE_SIZE := 3776k IMAGE/factory.bin := $$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3 @@ -525,7 +515,6 @@ TARGET_DEVICES += edimax_3g-6200nl define Device/engenius_esr-9753 SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := EnGenius DEVICE_MODEL := ESR-9753 @@ -549,7 +538,6 @@ TARGET_DEVICES += fon_fonera-20n define Device/hame_mpr-a1 SOC := rt5350 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := HAME @@ -609,7 +597,6 @@ TARGET_DEVICES += hootoo_ht-tm02 define Device/huawei_d105 SOC := rt3050 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Huawei DEVICE_MODEL := D105 @@ -810,7 +797,6 @@ TARGET_DEVICES += omnima_miniembwifi define Device/petatel_psr-680w SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Petatel DEVICE_MODEL := PSR-680W Wireless 3G Router @@ -821,7 +807,6 @@ TARGET_DEVICES += petatel_psr-680w define Device/planex_mzk-dp150n SOC := rt5350 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Planex DEVICE_MODEL := MZK-DP150N @@ -943,7 +928,6 @@ TARGET_DEVICES += prolink_pwh2004 define Device/ralink_v22rw-2x2 SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Ralink DEVICE_MODEL := AP-RT3052-V22RW-2X2 @@ -954,7 +938,6 @@ TARGET_DEVICES += ralink_v22rw-2x2 define Device/sitecom_wl-351 SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Sitecom DEVICE_MODEL := WL-351 v1 @@ -966,7 +949,6 @@ TARGET_DEVICES += sitecom_wl-351 define Device/skyline_sl-r7205 SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Skyline DEVICE_MODEL := SL-R7205 Wireless 3G Router @@ -977,7 +959,6 @@ TARGET_DEVICES += skyline_sl-r7205 define Device/sparklan_wcr-150gn SOC := rt3050 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Sparklan DEVICE_MODEL := WCR-150GN @@ -997,7 +978,6 @@ TARGET_DEVICES += teltonika_rut5xx define Device/tenda_3g150b SOC := rt5350 - BLOCKSIZE := 4k IMAGE_SIZE := 3776k UIMAGE_NAME:= Linux Kernel Image DEVICE_VENDOR := Tenda @@ -1045,7 +1025,6 @@ TARGET_DEVICES += tenda_w306r-v2 define Device/trendnet_tew-638apb-v2 SOC := rt3050 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \ check-size | append-metadata @@ -1103,7 +1082,6 @@ TARGET_DEVICES += unbranded_wr512-3gn-8m define Device/unbranded_xdx-rn502j SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := Unbranded DEVICE_MODEL := XDX-RN502J @@ -1114,7 +1092,6 @@ TARGET_DEVICES += unbranded_xdx-rn502j define Device/upvel_ur-326n4g SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := UPVEL DEVICE_MODEL := UR-326N4G @@ -1197,7 +1174,6 @@ TARGET_DEVICES += zte_mf283plus define Device/zyxel_keenetic SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := Keenetic @@ -1238,7 +1214,6 @@ TARGET_DEVICES += zyxel_keenetic-start define Device/zyxel_nbg-419n SOC := rt3052 - BLOCKSIZE := 64k IMAGE_SIZE := 3776k DEVICE_VENDOR := ZyXEL DEVICE_MODEL := NBG-419N diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk index a00c8dc510..ccefee7fb0 100644 --- a/target/linux/ramips/image/rt3883.mk +++ b/target/linux/ramips/image/rt3883.mk @@ -7,7 +7,6 @@ endef define Device/asus_rt-n56u SOC := rt3662 - BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGE/sysupgrade.bin += | mkrtn56uimg -s DEVICE_VENDOR := ASUS @@ -21,7 +20,6 @@ TARGET_DEVICES += asus_rt-n56u define Device/belkin_f9k1109v1 $(Device/uimage-lzma-loader) SOC := rt3883 - BLOCKSIZE := 64k DEVICE_VENDOR := Belkin DEVICE_MODEL := F9K1109 DEVICE_VARIANT := Version 1.0 @@ -35,7 +33,6 @@ TARGET_DEVICES += belkin_f9k1109v1 define Device/dlink_dir-645 $(Device/seama-lzma-loader) SOC := rt3662 - BLOCKSIZE := 4k IMAGE_SIZE := 7872k SEAMA_SIGNATURE := wrgn39_dlob.hans_dir645 DEVICE_VENDOR := D-Link @@ -47,7 +44,6 @@ TARGET_DEVICES += dlink_dir-645 define Device/edimax_br-6475nd SOC := rt3662 - BLOCKSIZE := 64k IMAGE_SIZE := 7744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \ @@ -61,7 +57,6 @@ TARGET_DEVICES += edimax_br-6475nd define Device/engenius_esr600h $(Device/uimage-lzma-loader) SOC := rt3662 - BLOCKSIZE := 4k IMAGE_SIZE := 7872k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ @@ -74,7 +69,6 @@ TARGET_DEVICES += engenius_esr600h define Device/loewe_wmdr-143n SOC := rt3662 - BLOCKSIZE := 64k IMAGE_SIZE := 7872k DEVICE_VENDOR := Loewe DEVICE_MODEL := WMDR-143N @@ -84,7 +78,6 @@ TARGET_DEVICES += loewe_wmdr-143n define Device/omnima_hpm SOC := rt3662 - BLOCKSIZE := 64k IMAGE_SIZE := 16064k DEVICE_VENDOR := Omnima DEVICE_MODEL := HPM @@ -109,7 +102,6 @@ TARGET_DEVICES += samsung_cy-swr1100 define Device/sitecom_wlr-6000 $(Device/uimage-lzma-loader) SOC := rt3883 - BLOCKSIZE := 4k IMAGE_SIZE := 7244k IMAGES += factory.dlf IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size | \ @@ -123,7 +115,6 @@ TARGET_DEVICES += sitecom_wlr-6000 define Device/trendnet_tew-691gr SOC := rt3883 - BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | umedia-header 0x026910 @@ -135,7 +126,6 @@ TARGET_DEVICES += trendnet_tew-691gr define Device/trendnet_tew-692gr SOC := rt3883 - BLOCKSIZE := 64k IMAGE_SIZE := 7872k IMAGES += factory.bin IMAGE/factory.bin := $$(sysupgrade_bin) | check-size | umedia-header 0x026920 diff --git a/target/linux/ramips/mt76x8/config-5.15 b/target/linux/ramips/mt76x8/config-5.15 index 5a82edfb10..7248aa6633 100644 --- a/target/linux/ramips/mt76x8/config-5.15 +++ b/target/linux/ramips/mt76x8/config-5.15 @@ -116,6 +116,7 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PARSER_TRX=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_TPLINK_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_VIRT_CONCAT=y diff --git a/target/linux/ramips/rt288x/config-5.15 b/target/linux/ramips/rt288x/config-5.15 index 19a71d67ea..0e4afe367e 100644 --- a/target/linux/ramips/rt288x/config-5.15 +++ b/target/linux/ramips/rt288x/config-5.15 @@ -103,6 +103,7 @@ CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_LZMA_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_SPLIT_WRGG_FW=y diff --git a/target/linux/ramips/rt305x/config-5.15 b/target/linux/ramips/rt305x/config-5.15 index 2c2fc37a63..fccc7370a5 100644 --- a/target/linux/ramips/rt305x/config-5.15 +++ b/target/linux/ramips/rt305x/config-5.15 @@ -106,7 +106,7 @@ CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_JIMAGE_FW=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y diff --git a/target/linux/ramips/rt3883/config-5.15 b/target/linux/ramips/rt3883/config-5.15 index 70d8797306..3d412e8b9d 100644 --- a/target/linux/ramips/rt3883/config-5.15 +++ b/target/linux/ramips/rt3883/config-5.15 @@ -104,7 +104,7 @@ CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_SEAMA_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_NEED_DMA_MAP_STATE=y diff --git a/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch b/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch index df66df794c..e562dd8396 100644 --- a/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch +++ b/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch @@ -32,7 +32,7 @@ Signed-off-by: Guenter Roeck --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -15898,6 +15898,13 @@ S: Maintained +@@ -15899,6 +15899,13 @@ S: Maintained F: include/sound/rt*.h F: sound/soc/codecs/rt* diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 33afb2d60a..0d880e04df 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -12,8 +12,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=d8e1a7590d375159fb5aac07ad8111ab4699e994 -PKG_MIRROR_HASH:=4ea04f4b5cdd5567e11defe6f8947c168382fc0a22abe121bb43f4bb83615237 +PKG_SOURCE_VERSION:=7c32cb7dd88cf100b0b412163896e30aa2ee671a +PKG_MIRROR_HASH:=92afa3672e4af0c3ba9d360e9aaac60c094a0aad9334ef78a1fd2ee49f5e1b64 PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz @@ -79,11 +79,6 @@ define Host/SetToolchainInfo endef define Host/Configure - [ -f $(HOST_BUILD_DIR)/.autoconf ] || { \ - cd $(HOST_BUILD_DIR)/; \ - autoconf --force && \ - touch $(HOST_BUILD_DIR)/.autoconf; \ - } mkdir -p $(CUR_BUILD_DIR) ( cd $(CUR_BUILD_DIR); rm -f config.cache; \ $(GLIBC_CONFIGURE) \