fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-03-01 21:12:16 +08:00
commit 338f0f4bd6
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
135 changed files with 2068 additions and 908 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/image-commands.mk
View File

@ -191,7 +191,7 @@ define Build/check-size
@imagesize="$$(stat -c%s $@)"; \
limitsize="$$(($(subst k,* 1024,$(subst m, * 1024k,$(if $(1),$(1),$(IMAGE_SIZE))))))"; \
[ $$limitsize -ge $$imagesize ] || { \
echo "WARNING: Image file $@ is too big: $$imagesize > $$limitsize" >&2; \
$(call ERROR_MESSAGE, WARNING: Image file $@ is too big: $$imagesize > $$limitsize); \
rm -f $@; \
}
endef

17
include/netfilter.mk
View File

@ -243,14 +243,15 @@ $(eval $(call nf_add,IPT_NFQUEUE,CONFIG_NETFILTER_XT_TARGET_NFQUEUE, $(P_XT)xt_N
$(eval $(call nf_add,IPT_DEBUG,CONFIG_NETFILTER_XT_TARGET_TRACE, $(P_XT)xt_TRACE))
# tproxy
# socket
$(eval $(call nf_add,NF_SOCKET,CONFIG_NF_SOCKET_IPV4, $(P_V4)nf_socket_ipv4))
$(eval $(call nf_add,NF_SOCKET,CONFIG_NF_SOCKET_IPV6, $(P_V6)nf_socket_ipv6))
$(eval $(call nf_add,IPT_SOCKET,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV4, $(P_V4)nf_socket_ipv4))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_SOCKET_IPV6, $(P_V6)nf_socket_ipv6))
# tproxy
$(eval $(call nf_add,NF_TPROXY,CONFIG_NF_TPROXY_IPV4, $(P_V4)nf_tproxy_ipv4))
$(eval $(call nf_add,NF_TPROXY,CONFIG_NF_TPROXY_IPV6, $(P_V6)nf_tproxy_ipv6))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_TPROXY_IPV4, $(P_V4)nf_tproxy_ipv4))
$(eval $(call nf_add,IPT_TPROXY,CONFIG_NF_TPROXY_IPV6, $(P_V6)nf_tproxy_ipv6))
# led
$(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED))
@ -354,6 +355,10 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_FIB,CONFIG_NFT_FIB_IPV6, $(P_V6)nft_fib
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_QUEUE,CONFIG_NFT_QUEUE, $(P_XT)nft_queue),))
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_SOCKET,CONFIG_NFT_SOCKET, $(P_XT)nft_socket),))
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_TPROXY,CONFIG_NFT_TPROXY, $(P_XT)nft_tproxy),))
$(eval $(if $(NF_KMOD),$(call nf_add,NFT_COMPAT,CONFIG_NFT_COMPAT, $(P_XT)nft_compat),))
# userland only

1
include/u-boot.mk
View File

@ -45,6 +45,7 @@ UBOOT_MAKE_FLAGS = \
HOSTCC="$(HOSTCC)" \
HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \
HOSTLDFLAGS="$(HOST_LDFLAGS)" \
LOCALVERSION="-OpenWrt-$(REVISION)" \
STAGING_PREFIX="$(STAGING_DIR_HOST)" \
PKG_CONFIG_PATH="$(STAGING_DIR_HOST)/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR_HOST)/lib/pkgconfig" \

9
include/verbose.mk
View File

@ -29,15 +29,15 @@ ifeq ($(IS_TTY),1)
endif
endif
define ERROR_MESSAGE
printf "$(_R)%s$(_N)\n" "$(1)" >&8
endef
ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
define MESSAGE
printf "$(_Y)%s$(_N)\n" "$(1)" >&8
endef
define ERROR_MESSAGE
printf "$(_R)%s$(_N)\n" "$(1)" >&8
endef
ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@ -60,5 +60,4 @@ else
define MESSAGE
printf "%s\n" "$(1)"
endef
ERROR_MESSAGE=$(MESSAGE)
endif

2
package/boot/tfa-layerscape/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tfa-layerscape
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

5
package/boot/uboot-envtools/files/ath79
View File

@ -18,6 +18,7 @@ alfa-network,n2q|\
alfa-network,n5q|\
alfa-network,pi-wifi4|\
alfa-network,r36a|\
alfa-network,tube-2hq|\
allnet,all-wap02860ac|\
arduino,yun|\
buffalo,bhr-4grv2|\
@ -122,7 +123,9 @@ qihoo,c301)
wallys,dr531)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0xf800" "0x10000"
;;
zte,mf286)
zte,mf286|\
zte,mf286a|\
zte,mf286r)
ubootenv_add_uci_config "/dev/mtd7" "0x0" "0x20000" "0x10000"
;;
esac

2
package/boot/uboot-layerscape/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uboot-layerscape
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

8
package/firmware/intel-microcode/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=intel-microcode
PKG_VERSION:=20210608
PKG_VERSION:=20220207
PKG_RELEASE:=1
PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).2.tar.xz
PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).1.tar.xz
PKG_SOURCE_URL:=@DEBIAN/pool/non-free/i/intel-microcode/
PKG_HASH:=fbf82688ffd0d87b352a35c57bd097ea014f0ad32c9c8f9629725c1b43d1c84d
PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).2
PKG_HASH:=42f2ab3c14bda745ec64008cde5c0f416f32f40e838a9df04cf5ddf5fc87498b
PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).1
PKG_BUILD_DEPENDS:=iucode-tool/host

2
package/firmware/layerscape/fman-ucode/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fman-ucode
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

2
package/firmware/layerscape/ls-ddr-phy/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ls-ddr-phy
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

2
package/firmware/layerscape/ls-dpl/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ls-dpl
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

2
package/firmware/layerscape/ls-mc/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ls-mc
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

2
package/firmware/layerscape/ls-rcw/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ls-rcw
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

2
package/firmware/layerscape/ppfe-firmware/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ppfe
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

61
package/kernel/linux/modules/netfilter.mk
View File

@ -162,6 +162,28 @@ endef
$(eval $(call KernelPackage,nf-flow))
define KernelPackage/nf-socket
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter socket lookup support
KCONFIG:= $(KCOFNIG_NF_SOCKET)
FILES:=$(foreach mod,$(NF_SOCKET-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_SOCKET-m)))
endef
$(eval $(call KernelPackage,nf-socket))
define KernelPackage/nf-tproxy
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter tproxy support
KCONFIG:= $(KCOFNIG_NF_TPROXY)
FILES:=$(foreach mod,$(NF_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_TPROXY-m)))
endef
$(eval $(call KernelPackage,nf-tproxy))
define AddDepends/ipt
SUBMENU:=$(NF_MENU)
DEPENDS+= +kmod-ipt-core $(1)
@ -644,9 +666,24 @@ endef
$(eval $(call KernelPackage,ipt-led))
define KernelPackage/ipt-socket
TITLE:=Iptables socket matching support
DEPENDS+=+kmod-nf-socket +kmod-nf-conntrack
KCONFIG:=$(KCONFIG_IPT_SOCKET)
FILES:=$(foreach mod,$(IPT_SOCKET-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_SOCKET-m)))
$(call AddDepends/ipt)
endef
define KernelPackage/ipt-socket/description
Kernel modules for socket matching
endef
$(eval $(call KernelPackage,ipt-socket))
define KernelPackage/ipt-tproxy
TITLE:=Transparent proxying support
DEPENDS+=+kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +IPV6:kmod-ip6tables
DEPENDS+=+kmod-nf-tproxy +kmod-nf-conntrack
KCONFIG:=$(KCONFIG_IPT_TPROXY)
FILES:=$(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_TPROXY-m)))
@ -1179,6 +1216,28 @@ endef
$(eval $(call KernelPackage,nft-queue))
define KernelPackage/nft-socket
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables socket support
DEPENDS:=+kmod-nft-core +kmod-nf-socket
FILES:=$(foreach mod,$(NFT_SOCKET-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_SOCKET-m)))
KCONFIG:=$(KCONFIG_NFT_SOCKET)
endef
$(eval $(call KernelPackage,nft-socket))
define KernelPackage/nft-tproxy
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables tproxy support
DEPENDS:=+kmod-nft-core +kmod-nf-tproxy +kmod-nf-conntrack
FILES:=$(foreach mod,$(NFT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_TPROXY-m)))
KCONFIG:=$(KCONFIG_NFT_TPROXY)
endef
$(eval $(call KernelPackage,nft-tproxy))
define KernelPackage/nft-compat
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables compat support

18
package/kernel/mac80211/patches/subsys/308-mac80211-add-support-for-.ndo_fill_forward_path.patch
View File

@ -22,24 +22,27 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw,
@@ -4265,6 +4267,11 @@ struct ieee80211_ops {
@@ -4265,6 +4267,13 @@ struct ieee80211_ops {
struct ieee80211_twt_setup *twt);
void (*twt_teardown_request)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta, u8 flowid);
+#if LINUX_VERSION_IS_GEQ(5,10,0)
+ int (*net_fill_forward_path)(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta,
+ struct net_device_path_ctx *ctx,
+ struct net_device_path *path);
+#endif
};
/**
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -1483,4 +1483,26 @@ static inline void drv_twt_teardown_requ
@@ -1483,4 +1483,28 @@ static inline void drv_twt_teardown_requ
trace_drv_return_void(local);
}
+#if LINUX_VERSION_IS_GEQ(5,10,0)
+static inline int drv_net_fill_forward_path(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_sta *sta,
@ -61,6 +64,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+
+ return ret;
+}
+#endif
+
#endif /* __MAC80211_DRIVER_OPS */
--- a/net/mac80211/ieee80211_i.h
@ -143,7 +147,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
static const struct net_device_ops ieee80211_dataif_8023_ops = {
#if LINUX_VERSION_IS_LESS(4,10,0)
.ndo_change_mtu = __change_mtu,
@@ -839,7 +899,9 @@ static const struct net_device_ops ieee8
@@ -839,7 +901,9 @@ static const struct net_device_ops ieee8
#else
.ndo_get_stats64 = bp_ieee80211_get_stats64,
#endif
@ -156,16 +160,18 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
static bool ieee80211_iftype_supports_hdr_offload(enum nl80211_iftype iftype)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -2892,6 +2892,13 @@ TRACE_EVENT(drv_twt_teardown_request,
@@ -2892,6 +2892,15 @@ TRACE_EVENT(drv_twt_teardown_request,
)
);
+#if LINUX_VERSION_IS_GEQ(5,10,0)
+DEFINE_EVENT(sta_event, drv_net_fill_forward_path,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_sta *sta),
+ TP_ARGS(local, sdata, sta)
+);
+#endif
+
#endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */

2
package/kernel/mac80211/patches/subsys/319-mac80211-introduce-set_radar_offchan-callback.patch
View File

@ -35,9 +35,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
struct ieee80211_sta *sta, u8 flowid);
+ int (*set_radar_offchan)(struct ieee80211_hw *hw,
+ struct cfg80211_chan_def *chandef);
#if LINUX_VERSION_IS_GEQ(5,10,0)
int (*net_fill_forward_path)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4344,6 +4344,18 @@ out:

2
package/kernel/mac80211/patches/subsys/320-cfg80211-rename-offchannel_chain-structs-to-backgrou.patch
View File

@ -107,9 +107,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- struct cfg80211_chan_def *chandef);
+ int (*set_radar_background)(struct ieee80211_hw *hw,
+ struct cfg80211_chan_def *chandef);
#if LINUX_VERSION_IS_GEQ(5,10,0)
int (*net_fill_forward_path)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2608,10 +2608,10 @@ enum nl80211_commands {

13
package/libs/argp-standalone/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=argp-standalone
PKG_VERSION:=1.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/
@ -20,6 +20,7 @@ PKG_LICENSE:=LGPL-2.1
PKG_LICENSE:=Makefile.am
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/argp-standalone
SECTION:=libs
@ -45,4 +46,14 @@ define Build/InstallDev
$(1)/usr/lib/
endef
define Host/Install
$(INSTALL_DIR) $(1)/include
$(CP) $(HOST_BUILD_DIR)/argp.h \
$(1)/include/
$(INSTALL_DIR) $(1)/lib
$(CP) $(HOST_BUILD_DIR)/libargp.a \
$(1)/lib/
endef
$(eval $(call BuildPackage,argp-standalone))
$(eval $(call HostBuild))

7
package/libs/mbedtls/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
PKG_VERSION:=2.16.12
PKG_VERSION:=2.28.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=294871ab1864a65d0b74325e9219d5bcd6e91c34a3c59270c357bb9ae4d5c393
PKG_HASH:=6519579b836ed78cc549375c7c18b111df5717e86ca0eeff4cb64b2674f424cc
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=gpl-2.0.txt
@ -146,6 +146,9 @@ define Build/Configure
END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
>$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new $(PKG_BUILD_DIR)/include/mbedtls/config.h
sed -i '/fuzz/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt
sed -i '/test/d' $(PKG_BUILD_DIR)/programs/CMakeLists.txt
endef
define Build/InstallDev

45
package/libs/mbedtls/patches/200-config.patch
View File

@ -1,6 +1,6 @@
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -692,14 +692,14 @@
@@ -665,14 +665,14 @@
*
* Enable Output Feedback mode (OFB) for symmetric ciphers.
*/
@ -17,10 +17,10 @@
/**
* \def MBEDTLS_CIPHER_NULL_CIPHER
@@ -816,19 +816,19 @@
*
@@ -790,20 +790,20 @@
* Comment macros to disable the curve and functions for it
*/
/* Short Weierstrass curves (supporting ECP, ECDH, ECDSA) */
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
@ -40,13 +40,14 @@
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
/* Montgomery curves (supporting ECP) */
#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
/**
* \def MBEDTLS_ECP_NIST_OPTIM
@@ -952,7 +952,7 @@
@@ -956,7 +956,7 @@
* See dhm.h for more details.
*
*/
@ -55,7 +56,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
@@ -972,7 +972,7 @@
@@ -976,7 +976,7 @@
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
*/
@ -64,7 +65,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
@@ -997,7 +997,7 @@
@@ -1001,7 +1001,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
@ -73,7 +74,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
@@ -1131,7 +1131,7 @@
@@ -1135,7 +1135,7 @@
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
@ -82,7 +83,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
@@ -1155,7 +1155,7 @@
@@ -1159,7 +1159,7 @@
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
@ -91,7 +92,7 @@
/**
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
@@ -1259,7 +1259,7 @@
@@ -1263,7 +1263,7 @@
* This option is only useful if both MBEDTLS_SHA256_C and
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
*/
@ -100,7 +101,7 @@
/**
* \def MBEDTLS_ENTROPY_NV_SEED
@@ -1354,14 +1354,14 @@
@@ -1478,14 +1478,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
@ -117,7 +118,7 @@
/**
* \def MBEDTLS_SHA256_SMALLER
@@ -1515,7 +1515,7 @@
@@ -1756,7 +1756,7 @@
* configuration of this extension).
*
*/
@ -126,7 +127,7 @@
/**
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
@@ -1720,7 +1720,7 @@
@@ -2017,7 +2017,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
@ -135,7 +136,7 @@
/**
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
@@ -1796,7 +1796,7 @@
@@ -2185,7 +2185,7 @@
*
* Comment this to disable run-time checking and save ROM space
*/
@ -144,7 +145,7 @@
/**
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
@@ -2126,7 +2126,7 @@
@@ -2534,7 +2534,7 @@
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
@ -153,7 +154,7 @@
/**
* \def MBEDTLS_ARIA_C
@@ -2192,7 +2192,7 @@
@@ -2600,7 +2600,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
@ -162,7 +163,7 @@
/**
* \def MBEDTLS_CERTS_C
@@ -2204,7 +2204,7 @@
@@ -2612,7 +2612,7 @@
*
* This module is used for testing (ssl_client/server).
*/
@ -171,7 +172,7 @@
/**
* \def MBEDTLS_CHACHA20_C
@@ -2312,7 +2312,7 @@
@@ -2725,7 +2725,7 @@
* \warning DES is considered a weak cipher and its use constitutes a
* security risk. We recommend considering stronger ciphers instead.
*/
@ -180,7 +181,7 @@
/**
* \def MBEDTLS_DHM_C
@@ -2475,7 +2475,7 @@
@@ -2890,7 +2890,7 @@
* This module adds support for the Hashed Message Authentication Code
* (HMAC)-based key derivation function (HKDF).
*/
@ -189,7 +190,7 @@
/**
* \def MBEDTLS_HMAC_DRBG_C
@@ -2785,7 +2785,7 @@
@@ -3203,7 +3203,7 @@
*
* This module enables abstraction of common (libc) functions.
*/
@ -198,7 +199,7 @@
/**
* \def MBEDTLS_POLY1305_C
@@ -2806,7 +2806,7 @@
@@ -3279,7 +3279,7 @@
* Caller: library/md.c
*
*/
@ -207,7 +208,7 @@
/**
* \def MBEDTLS_RSA_C
@@ -3013,7 +3013,7 @@
@@ -3486,7 +3486,7 @@
*
* This module provides run-time version information.
*/
@ -216,7 +217,7 @@
/**
* \def MBEDTLS_X509_USE_C
@@ -3123,7 +3123,7 @@
@@ -3596,7 +3596,7 @@
* Module: library/xtea.c
* Caller:
*/

5
package/network/config/firewall/Makefile
View File

@ -28,8 +28,9 @@ define Package/firewall
SECTION:=net
CATEGORY:=Base system
TITLE:=OpenWrt C Firewall
DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables +kmod-ipt-core \
+kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat +iptables-mod-fullconenat
DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 \
+libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat \
+iptables-mod-fullconenat
PROVIDES:=uci-firewall
CONFLICTS:=firewall4
endef

127
package/network/utils/iptables/Makefile
View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables
PKG_VERSION:=1.8.7
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=https://netfilter.org/projects/iptables/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -41,35 +41,21 @@ endef
define Package/iptables/Module
$(call Package/iptables/Default)
DEPENDS:=+iptables $(1)
DEPENDS:=+libxtables $(1)
endef
define Package/iptables
define Package/iptables-legacy
$(call Package/iptables/Default)
TITLE:=IP firewall administration tool
MENU:=1
DEPENDS+= +kmod-ipt-core +libip4tc +IPV6:libip6tc +libxtables
DEPENDS+= +kmod-ipt-core +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables
PROVIDES:=iptables
ALTERNATIVES:=\
200:/usr/sbin/iptables:/usr/sbin/xtables-legacy-multi \
200:/usr/sbin/iptables-restore:/usr/sbin/xtables-legacy-multi \
200:/usr/sbin/iptables-save:/usr/sbin/xtables-legacy-multi
endef
define Package/iptables/config
config IPTABLES_CONNLABEL
bool "Enable Connlabel support"
default n
help
This enable connlabel support in iptables.
config IPTABLES_NFTABLES
bool "Enable Nftables support"
default y
help
This enable nftables support in iptables.
endef
define Package/iptables/description
define Package/iptables-legacy/description
IP firewall administration tool.
Matches:
@ -112,7 +98,8 @@ endef
define Package/iptables-nft
$(call Package/iptables/Default)
TITLE:=IP firewall administration tool nft
DEPENDS:=@IPTABLES_NFTABLES +libxtables-nft +libip4tc +IPV6:libip6tc +kmod-ipt-core +kmod-nft-compat
DEPENDS:=@IPTABLES_NFTABLES +libnftnl +libiptext +IPV6:libiptext6 +libiptext-nft +kmod-ipt-core +kmod-nft-compat
PROVIDES:=iptables
ALTERNATIVES:=\
300:/usr/sbin/iptables:/usr/sbin/xtables-nft-multi \
300:/usr/sbin/iptables-restore:/usr/sbin/xtables-nft-multi \
@ -452,12 +439,12 @@ define Package/iptables-mod-checksum/description
iptables extension for the CHECKSUM calculation target
endef
define Package/ip6tables
define Package/ip6tables-legacy
$(call Package/iptables/Default)
DEPENDS:=@IPV6 +kmod-ip6tables +iptables
DEPENDS:=@IPV6 +kmod-ip6tables +iptables-legacy
CATEGORY:=Network
TITLE:=IPv6 firewall administration tool
MENU:=1
PROVIDES:=ip6tables
ALTERNATIVES:=\
200:/usr/sbin/ip6tables:/usr/sbin/xtables-legacy-multi \
200:/usr/sbin/ip6tables-restore:/usr/sbin/xtables-legacy-multi \
@ -468,6 +455,7 @@ define Package/ip6tables-nft
$(call Package/iptables/Default)
DEPENDS:=@IPV6 +kmod-ip6tables +iptables-nft
TITLE:=IP firewall administration tool nft
PROVIDES:=ip6tables
ALTERNATIVES:=\
300:/usr/sbin/ip6tables:/usr/sbin/xtables-nft-multi \
300:/usr/sbin/ip6tables-restore:/usr/sbin/xtables-nft-multi \
@ -485,7 +473,7 @@ endef
define Package/ip6tables-extra
$(call Package/iptables/Default)
DEPENDS:=ip6tables +kmod-ip6tables-extra
DEPENDS:=+libxtables +kmod-ip6tables-extra
TITLE:=IPv6 header matching modules
endef
@ -495,7 +483,7 @@ endef
define Package/ip6tables-mod-nat
$(call Package/iptables/Default)
DEPENDS:=ip6tables +kmod-ipt-nat6
DEPENDS:=+libxtables +kmod-ipt-nat6
TITLE:=IPv6 NAT extensions
endef
@ -509,7 +497,6 @@ $(call Package/iptables/Default)
CATEGORY:=Libraries
TITLE:=IPv4 firewall - shared libiptc library
ABI_VERSION:=2
DEPENDS:=+libxtables
endef
define Package/libip6tc
@ -518,7 +505,33 @@ $(call Package/iptables/Default)
CATEGORY:=Libraries
TITLE:=IPv6 firewall - shared libiptc library
ABI_VERSION:=2
DEPENDS:=+libxtables
endef
define Package/libiptext
$(call Package/iptables/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv4 firewall - shared libiptext library
ABI_VERSION:=0
DEPENDS:=+libxtables
endef
define Package/libiptext6
$(call Package/iptables/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv6 firewall - shared libiptext library
ABI_VERSION:=0
DEPENDS:=+libxtables
endef
define Package/libiptext-nft
$(call Package/iptables/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared libiptext nft library
ABI_VERSION:=0
DEPENDS:=@IPTABLES_NFTABLES +libxtables
endef
define Package/libxtables
@ -526,19 +539,23 @@ define Package/libxtables
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared xtables library
MENU:=1
ABI_VERSION:=12
DEPENDS:= \
+IPTABLES_CONNLABEL:libnetfilter-conntrack \
+IPTABLES_NFTABLES:libnftnl
DEPENDS:=+IPTABLES_CONNLABEL:libnetfilter-conntrack
endef
define Package/libxtables-nft
$(call Package/iptables/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared xtables nft library
ABI_VERSION:=12
DEPENDS:=+libxtables
define Package/libxtables/config
config IPTABLES_CONNLABEL
bool "Enable Connlabel support"
default n
help
This enable connlabel support in iptables.
config IPTABLES_NFTABLES
bool "Enable Nftables support"
default y
help
This enable nftables support in iptables.
endef
TARGET_CPPFLAGS := \
@ -611,7 +628,7 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext*.so $(1)/usr/lib/
endef
define Package/iptables/install
define Package/iptables-legacy/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/xtables-legacy-multi $(1)/usr/sbin/
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-legacy{,-restore,-save} $(1)/usr/sbin/
@ -625,7 +642,7 @@ define Package/iptables-nft/install
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables{,-restore}-translate $(1)/usr/sbin/
endef
define Package/ip6tables/install
define Package/ip6tables-legacy/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-legacy{,-restore,-save} $(1)/usr/sbin/
endef
@ -639,24 +656,32 @@ endef
define Package/libip4tc/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so.* $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext4.so $(1)/usr/lib/
endef
define Package/libip6tc/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip6tc.so.* $(1)/usr/lib/
endef
define Package/libiptext/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext.so $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext4.so $(1)/usr/lib/
endef
define Package/libiptext6/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext6.so $(1)/usr/lib/
endef
define Package/libiptext-nft/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext_*.so $(1)/usr/lib/
endef
define Package/libxtables/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so.* $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext.so $(1)/usr/lib/
endef
define Package/libxtables-nft/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/extensions/libiptext_*.so $(1)/usr/lib/
endef
define BuildPlugin
@ -674,10 +699,12 @@ define BuildPlugin
endef
$(eval $(call BuildPackage,libxtables))
$(eval $(call BuildPackage,libxtables-nft))
$(eval $(call BuildPackage,libip4tc))
$(eval $(call BuildPackage,libip6tc))
$(eval $(call BuildPackage,iptables))
$(eval $(call BuildPackage,libiptext))
$(eval $(call BuildPackage,libiptext6))
$(eval $(call BuildPackage,libiptext-nft))
$(eval $(call BuildPackage,iptables-legacy))
$(eval $(call BuildPackage,iptables-nft))
$(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
$(eval $(call BuildPlugin,iptables-mod-conntrack-label,$(IPT_CONNTRACK_LABEL-m)))
@ -701,7 +728,7 @@ $(eval $(call BuildPlugin,iptables-mod-nflog,$(IPT_NFLOG-m)))
$(eval $(call BuildPlugin,iptables-mod-trace,$(IPT_DEBUG-m)))
$(eval $(call BuildPlugin,iptables-mod-nfqueue,$(IPT_NFQUEUE-m)))
$(eval $(call BuildPlugin,iptables-mod-checksum,$(IPT_CHECKSUM-m)))
$(eval $(call BuildPackage,ip6tables))
$(eval $(call BuildPackage,ip6tables-legacy))
$(eval $(call BuildPackage,ip6tables-nft))
$(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m)))
$(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m)))

2
package/network/utils/layerscape/restool/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=restool
PKG_VERSION:=LSDK-21.08
PKG_VERSION:=21.08
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git

15
package/system/iucode-tool/Makefile
View File

@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iucode-tool
PKG_VERSION:=2.3.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=iucode-tool_$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gitlab.com/iucode-tool/releases/raw/latest
PKG_HASH:=12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95
PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone
HOST_BUILD_DEPENDS:=HOST_OS_MACOS:argp-standalone/host
PKG_MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
PKG_LICENSE:=GPL-2.0
@ -41,6 +42,18 @@ define Package/iucode-tool/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/iucode_tool $(1)/usr/bin/
endef
# List of build hosts with working cpuid.h
IUT_NATIVE_HOST_OS_ARCH := \
linux/x86_64 linux/amd64 linux/i386 linux/i686
IUT_HOST_OS_ARCH := $(call tolower,$(HOST_OS))/$(HOST_ARCH)
# Use cpuid.h compat header if build host does not have working cpuid.h
ifeq ($(filter $(IUT_HOST_OS_ARCH),$(IUT_NATIVE_HOST_OS_ARCH)),)
HOST_CFLAGS += \
-I$(HOST_BUILD_DIR)/cpuid-compat
endif
define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/iucode_tool $(STAGING_DIR_HOST)/bin/iucode_tool
endef

31
package/system/iucode-tool/patches/200_add-cpuid-compatibility-header-to-build-on-non-x86.patch Normal file
View File

@ -0,0 +1,31 @@
From a21e75da32c0016f1575ea29775565934a67660d Mon Sep 17 00:00:00 2001
From: "Sergey V. Lobanov" <sergey@lobanov.in>
Date: Sat, 5 Feb 2022 13:10:23 +0300
Subject: [PATCH] Add cpuid compatibility header to build on non-x86 hosts
Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
---
cpuid-compat/cpuid.h | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 cpuid-compat/cpuid.h
--- /dev/null
+++ b/cpuid-compat/cpuid.h
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * cpuid compatibility header to build iucode-tool on non-x86 hosts
+ *
+ * Copyright (C) 2022 Sergey V. Lobanov <sergey@lobanov.in>
+ */
+
+#ifdef __APPLE__
+# include <limits.h>
+#endif
+
+static __inline int __get_cpuid (unsigned int leaf,
+ unsigned int *eax, unsigned int *ebx,
+ unsigned int *ecx, unsigned int *edx)
+{
+ return 0;
+}

6
package/system/ubus/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
PKG_SOURCE_DATE:=2021-08-09
PKG_SOURCE_VERSION:=a72457b61df045d3c499a6211362b751710590d7
PKG_MIRROR_HASH:=ac617577bcb2ff3dbc3039ad67200afcce910840223a2de15977d3224e6557fd
PKG_SOURCE_DATE:=2022-02-28
PKG_SOURCE_VERSION:=584f56a2331471459604ad054b3a7bcc366e0f07
PKG_MIRROR_HASH:=9bb7025fa5513530e6f407e0514014a8116babe9287d4217d0b8f9315b1f2181
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
CMAKE_INSTALL:=1

2
package/utils/jsonfilter/Makefile
View File

@ -21,7 +21,7 @@ define Package/jsonfilter
CATEGORY:=Base system
DEPENDS:=+libubox +libjson-c
TITLE:=OpenWrt JSON filter utility
URL:=http://git.openwrt.org/?p=project/jsonpath.git
URL:=$(PKG_SOURCE_URL)
endef
define Package/jsonfilter/install

8
package/utils/usbmode/Makefile
View File

@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=usbmode
PKG_RELEASE:=2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/usbmode.git
PKG_SOURCE_DATE:=2017-12-19
PKG_SOURCE_VERSION:=f40f84c27534159066c94dadc0c08e0b255c3e26
PKG_MIRROR_HASH:=840c7ee2843102b09d8943a20820025251cc259385e2b0bde6b7c8cce8190f83
PKG_SOURCE_DATE:=2022-02-24
PKG_SOURCE_VERSION:=3c8595a4e75510f58fa231b145d5506768dcafc9
PKG_MIRROR_HASH:=5f0234945f61639080f039522172151452180dd4aec33bafc8a61b60131c3bed
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0

11
scripts/check-toolchain-clean.sh
View File

@ -1,9 +1,14 @@
#!/bin/sh
eval `grep CONFIG_GCC_VERSION .config`
eval "$(grep CONFIG_GCC_VERSION .config)"
CONFIG_TOOLCHAIN_BUILD_VER="$CONFIG_GCC_VERSION-$(cat toolchain/build_version)"
touch .toolchain_build_ver
[ "$CONFIG_TOOLCHAIN_BUILD_VER" = "$(cat .toolchain_build_ver)" ] && exit 0
echo "Toolchain build version changed, running make targetclean"
CURRENT_TOOLCHAIN_BUILD_VER="$(cat .toolchain_build_ver)"
[ -z "$CURRENT_TOOLCHAIN_BUILD_VER" ] && {
echo "$CONFIG_TOOLCHAIN_BUILD_VER" > .toolchain_build_ver
exit 0
}
[ "$CONFIG_TOOLCHAIN_BUILD_VER" = "$CURRENT_TOOLCHAIN_BUILD_VER" ] && exit 0
echo "Toolchain build version changed ($CONFIG_TOOLCHAIN_BUILD_VER != $CURRENT_TOOLCHAIN_BUILD_VER), running make targetclean"
make targetclean
echo "$CONFIG_TOOLCHAIN_BUILD_VER" > .toolchain_build_ver
exit 0

1
scripts/diffconfig.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh
make ./scripts/config/conf >/dev/null || { make ./scripts/config/conf; exit 1; }
grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
grep \^CONFIG_TARGET_DEVICE_ .config >> tmp/.diffconfig.head
grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head

4
target/linux/at91/sama5/config-default
View File

@ -327,12 +327,8 @@ CONFIG_PINCTRL_AT91=y
CONFIG_PINCTRL_AT91PIO4=y
# CONFIG_PINCTRL_SINGLE is not set
CONFIG_PM=y
CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_PM_CLK=y
CONFIG_PM_DEBUG=y
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_AT91_POWEROFF=y
CONFIG_POWER_RESET_AT91_RESET=y

1
target/linux/ath79/base-files/etc/hotplug.d/ieee80211/00-wifi-migration
View File

@ -16,6 +16,7 @@ migrate_wifi_path() {
case "$board" in
tplink,archer-c7-v1|\
tplink,archer-c7-v2|\
zyxel,emg2926-q10a|\
zyxel,nbg6716)
path="pci0000:00/0000:00:00.0"
WIFI_PATH_CHANGED=1

31
target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
View File

@ -96,10 +96,26 @@
reg = <0x030000 0x010000>;
};
art: partition@40000 {
partition@40000 {
label = "art";
reg = <0x040000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
partition@50000 {
@ -122,15 +138,6 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};

39
target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
View File

@ -131,10 +131,30 @@
reg = <0x060000 0x010000>;
};
art: partition@70000 {
partition@70000 {
label = "art";
reg = <0x070000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
partition@80000 {
@ -149,19 +169,6 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};

10
target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
View File

@ -120,13 +120,3 @@
&pcie0 {
status = "okay";
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};

10
target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
View File

@ -86,13 +86,3 @@
#trigger-source-cells = <0>;
};
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};

10
target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
View File

@ -81,13 +81,3 @@
debounce-interval = <60>;
};
};
&art {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};

17
target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
View File

@ -82,10 +82,22 @@
reg = <0x060000 0x010000>;
};
art: partition@70000 {
partition@70000 {
label = "art";
reg = <0x070000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
partition@80000 {
@ -116,5 +128,6 @@
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};

65
target/linux/ath79/dts/qca9531_alfa-network_tube-2hq.dts Normal file
View File

@ -0,0 +1,65 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9531_alfa-network_r36a.dtsi"
/ {
model = "ALFA Network Tube-2HQ";
compatible = "alfa-network,tube-2hq", "qca,qca9531";
aliases {
led-boot = &led_signal4;
led-failsafe = &led_signal4;
led-upgrade = &led_signal4;
};
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&enable_gpio4 &enable_gpio16>;
lan {
label = "blue:lan";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
led_signal4: signal4 {
label = "green:signal4";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
};
signal1 {
label = "red:signal1";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
};
signal2 {
label = "orange:signal2";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
signal3 {
label = "green:signal3";
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
};
};
&eth0 {
nvmem-cells = <&macaddr_art_1002>;
nvmem-cell-names = "mac-address";
mac-address-increment = <(-1)>;
};
&eth1 {
compatible = "syscon", "simple-mfd";
};
&usb0 {
status = "disabled";
};
&usb_phy {
status = "disabled";
};

8
target/linux/ath79/dts/qca9558_zyxel_emg2926_q10a.dts Normal file
View File

@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9558_zyxel_nbg6716.dts"
/ {
compatible = "zyxel,emg2926-q10a", "zyxel,nbg6716", "qca,qca9558";
model = "ZyXEL EMG2926-Q10A";
};

288
target/linux/ath79/dts/qca9563_zte_mf286.dts
View File

@ -1,72 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
// Copyright (c) 2021 Cezary Jackiewicz
// Copyright (c) 2021, 2022 Lech Perczak
#include "qca956x.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
#include "qca9563_zte_mf286.dtsi"
/ {
model = "ZTE MF286";
compatible = "zte,mf286", "qca,qca9563";
aliases {
led-boot = &led_debug;
led-failsafe = &led_debug;
led-running = &led_debug;
led-upgrade = &led_debug;
label-mac-device = &eth0;
};
leds {
compatible = "gpio-leds";
/* Hidden green SMD LED below signal strength LEDs
* Visible through slits underside of the case,
* and slightly through the case below signal state LEDs */
led_debug: led-0 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_DEBUG;
label = "green:debug";
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
default-state = "on";
};
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
wifi {
label = "wifi";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
/* This GPIO is used to reset whole board _including_ the modem */
gpio-restart {
compatible = "gpio-restart";
gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
active-delay = <3000>;
inactive-delay = <1000>;
};
ubi-concat {
compatible = "mtd-concat";
devices = <&ubiconcat0 &ubiconcat1>;
@ -84,173 +24,107 @@
};
};
&gpio {
/* GPIO19 is used as a mask to enable WLAN LED
* in stock firmware, which is controlled directly
* by 5GHz Wi-Fi chip, which currently is inactive
* in OpenWrt */
led-wlan {
gpio-hog;
gpios = <19 GPIO_ACTIVE_LOW>;
output-high;
line-name = "led:wlan";
};
&led_debug {
/* Hidden green SMD LED below signal strength LEDs
* Visible through slits underside of the case,
* and slightly through the case below signal state LEDs
*/
color = <LED_COLOR_ID_GREEN>;
label = "green:debug";
};
&spi {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x000000 0x080000>;
read-only;
};
partition@80000 {
label = "u-boot-env";
reg = <0x080000 0x020000>;
read-only;
};
&boot_flash {
partitions {
partition@0 {
label = "u-boot";
reg = <0x000000 0x080000>;
read-only;
};
};
flash@1 {
compatible = "spi-nand";
reg = <1>;
spi-max-frequency = <25000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "fota-flag";
reg = <0x000000 0x140000>;
read-only;
};
caldata: partition@140000 {
label = "caldata";
reg = <0x140000 0x140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_caldata_1000: cal@1000 {
reg = <0x1000 0x440>;
};
cal_caldata_5000: cal@5000 {
reg = <0x5000 0x844>;
};
};
mac: partition@280000 {
label = "mac";
reg = <0x280000 0x140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_mac_0: macaddr@0 {
reg = <0x0 0x6>;
};
};
/* This encompasses stock cfg-param, oops, web partitions,
* which can be overwritten safely */
ubiconcat0: partition@3c0000 {
label = "ubiconcat0";
reg = <0x3c0000 0xf40000>;
};
/* Kernel MTD size is increased to 4MB from stock 3MB */
partition@1300000 {
label = "kernel";
reg = <0x1300000 0x400000>;
};
/* This encompasses stock rootfs, data, fota partitions,
* which can be overwritten safely */
ubiconcat1: partition@1600000 {
label = "ubiconcat1";
reg = <0x1700000 0x6900000>;
};
partition@80000 {
label = "u-boot-env";
reg = <0x080000 0x020000>;
read-only;
};
};
};
&mdio0 {
status = "okay";
&system_flash {
partitions {
partition@0 {
label = "fota-flag";
reg = <0x000000 0x140000>;
read-only;
};
phy-mask = <0>;
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "sgmii";
partition@140000 {
label = "caldata";
reg = <0x140000 0x140000>;
read-only;
qca,ar8327-initvals = <
0x04 0x00080080 /* PORT0 PAD MODE CTRL */
0x7c 0x0000007e /* PORT0_STATUS */
>;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_caldata_1000: cal@1000 {
reg = <0x1000 0x440>;
};
cal_caldata_5000: cal@5000 {
reg = <0x5000 0x844>;
};
};
partition@280000 {
label = "mac";
reg = <0x280000 0x140000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_mac_0: macaddr@0 {
reg = <0x0 0x6>;
};
};
/* This encompasses stock cfg-param, oops, web partitions,
* which can be overwritten safely
*/
ubiconcat0: partition@3c0000 {
label = "ubiconcat0";
reg = <0x3c0000 0xf40000>;
};
/* Kernel MTD size is increased to 4MB from stock 3MB */
partition@1300000 {
label = "kernel";
reg = <0x1300000 0x400000>;
};
/* This encompasses stock rootfs, data, fota partitions,
* which can be overwritten safely
*/
ubiconcat1: partition@1600000 {
label = "ubiconcat1";
reg = <0x1700000 0x6900000>;
};
};
};
&eth0 {
status = "okay";
nvmem-cells = <&macaddr_mac_0>;
nvmem-cell-names = "mac-address";
phy-mode = "sgmii";
phy-handle = <&phy0>;
};
&pcie {
status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x0 0 0 0 0>;
nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <1>;
};
&wifi_ath10k {
nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
nvmem-cell-names = "mac-address", "calibration";
mac-address-increment = <1>;
};
&wmac {
status = "okay";
nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_1000>;
nvmem-cell-names = "mac-address", "calibration";
};
&usb_phy0 {
status = "okay";
};
&usb0 {
status = "okay";
};
&usb_phy1 {
status = "okay";
};
&usb1 {
status = "okay";
};

158
target/linux/ath79/dts/qca9563_zte_mf286.dtsi Normal file
View File

@ -0,0 +1,158 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
// Copyright (c) 2021 Cezary Jackiewicz
// Copyright (c) 2021, 2022 Lech Perczak
#include "qca956x.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
/ {
aliases {
led-boot = &led_debug;
led-failsafe = &led_debug;
led-running = &led_debug;
led-upgrade = &led_debug;
label-mac-device = &eth0;
};
leds {
compatible = "gpio-leds";
/* Hidden SMD LED below signal strength LEDs.
* Visible through slits underside of the case,
* and slightly through the case below signal state LEDs
*/
led_debug: led-0 {
function = LED_FUNCTION_DEBUG;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
default-state = "on";
};
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
wifi {
label = "wifi";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
/* This GPIO is used to reset whole board _including_ the modem */
gpio-restart {
compatible = "gpio-restart";
gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
active-delay = <3000>;
inactive-delay = <1000>;
};
};
&gpio {
/* GPIO19 is used as a mask to enable WLAN LED
* in stock firmware, which is controlled directly
* by 5GHz Wi-Fi chip, which currently is inactive
* in OpenWrt
*/
led-wlan {
gpio-hog;
gpios = <19 GPIO_ACTIVE_LOW>;
output-high;
line-name = "led:wlan";
};
};
&spi {
status = "okay";
boot_flash: flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
};
};
system_flash: flash@1 {
compatible = "spi-nand";
reg = <1>;
spi-max-frequency = <25000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
};
};
};
&mdio0 {
status = "okay";
phy-mask = <0>;
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "sgmii";
qca,ar8327-initvals = <
0x04 0x00080080 /* PORT0 PAD MODE CTRL */
0x7c 0x0000007e /* PORT0_STATUS */
>;
};
};
&eth0 {
status = "okay";
phy-mode = "sgmii";
phy-handle = <&phy0>;
};
&pcie {
status = "okay";
wifi_ath10k: wifi@0,0 {
compatible = "qcom,ath10k";
reg = <0x0 0 0 0 0>;
};
};
&wmac {
status = "okay";
};
&usb_phy0 {
status = "okay";
};
&usb0 {
status = "okay";
};
&usb_phy1 {
status = "okay";
};
&usb1 {
status = "okay";
};

9
target/linux/ath79/dts/qca9563_zte_mf286a.dts Normal file
View File

@ -0,0 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
// Copyright (c) 2021 Cezary Jackiewicz
// Copyright (c) 2021, 2022 Lech Perczak
#include "qca9563_zte_mf286ar.dtsi"
/ {
model = "ZTE MF286A";
compatible = "zte,mf286a", "qca,qca9563";
};

134
target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi Normal file
View File

@ -0,0 +1,134 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
// Copyright (c) 2021 Cezary Jackiewicz
// Copyright (c) 2021, 2022 Lech Perczak
#include "qca9563_zte_mf286.dtsi"
/ {
ubi-concat {
compatible = "mtd-concat";
devices = <&ubiconcat0 &ubiconcat1>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
reg = <0x0 0x7a60000>;
label = "ubi";
};
};
};
};
&led_debug {
/* Hidden blue SMD LED below signal strength LEDs
* Visible through slits underside of the case,
* and slightly through the case below signal state LEDs
*/
color = <LED_COLOR_ID_BLUE>;
label = "blue:debug";
};
&boot_flash {
partitions {
partition@0 {
label = "u-boot";
reg = <0x000000 0x0a0000>;
read-only;
};
partition@a0000 {
label = "u-boot-env";
reg = <0x0a0000 0x020000>;
read-only;
};
partition@c0000 {
label = "reserved1";
reg = <0x0c0000 0x140000>;
read-only;
};
};
};
&system_flash {
partitions {
partition@0 {
label = "fota-flag";
reg = <0x00000 0xa0000>;
read-only;
};
partition@a0000 {
label = "art";
reg = <0xa0000 0x80000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
partition@120000 {
label = "mac";
reg = <0x120000 0x80000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_mac_0: mac-address@0 {
reg = <0x0 0x6>;
};
};
/* This encompasses stock reserved2, cfg-param, log, oops,
* reserved3, web partitions,
* which can be overwritten safely
*/
ubiconcat0: partition@1a0000 {
label = "ubiconcat0";
reg = <0x1a0000 0x1660000>;
};
/* Kernel MTD size is increased to 4MB from stock 3MB */
partition@1800000 {
label = "kernel";
reg = <0x1800000 0x400000>;
};
/* This encompasses stock rootfs, data, fota partitions,
* which can be overwritten safely
*/
ubiconcat1: partition@1c00000 {
label = "ubiconcat1";
reg = <0x1c00000 0x6400000>;
};
};
};
&eth0 {
nvmem-cells = <&macaddr_mac_0>;
nvmem-cell-names = "mac-address";
};
&wifi_ath10k {
nvmem-cells = <&macaddr_mac_0>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <0x20000>;
};
&wmac {
nvmem-cells = <&macaddr_mac_0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
};

9
target/linux/ath79/dts/qca9563_zte_mf286r.dts Normal file
View File

@ -0,0 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
// Copyright (c) 2021 Cezary Jackiewicz
// Copyright (c) 2021, 2022 Lech Perczak
#include "qca9563_zte_mf286ar.dtsi"
/ {
model = "ZTE MF286R";
compatible = "zte,mf286r", "qca,qca9563";
};

248
target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts Normal file
View File

@ -0,0 +1,248 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca956x.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
model = "TP-Link Archer A9 v6";
compatible = "tplink,archer-a9-v6", "qca,qcn5500", "qca,qca9560";
aliases {
label-mac-device = &eth0;
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
leds {
compatible = "gpio-leds";
led_power: power {
label = "green:power";
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
default-state = "on";
};
usb {
label = "green:usb";
gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
trigger-sources = <&hub_port0>;
linux,default-trigger = "usbport";
};
wan {
label = "green:wan";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wan_orange {
label = "orange:wan";
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
};
wlan2g {
label = "green:wlan2g";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt";
};
wlan5g {
label = "green:wlan5g";
gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "phy0tpt";
};
wps {
label = "green:wps";
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
};
};
&eth0 {
status = "okay";
pll-data = <0x03000101 0x00000101 0x00001919>;
phy-mode = "sgmii";
phy-handle = <&phy0>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&mdio0 {
status = "okay";
phy-mask = <0>;
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "sgmii";
qca,mib-poll-interval = <500>;
qca,ar8327-initvals = <
0x04 0x80080080 /* PORT0 PAD MODE CTRL */
0x08 0x00000000 /* PORT5 PAD MODE CTRL */
0x0c 0x00000000 /* PORT6 PAD MODE CTRL */
0x10 0x00000080 /* POWER_ON_STRAP */
0x7c 0x0000007e /* PORT0_STATUS */
0x94 0x00000200 /* PORT6_STATUS */
>;
};
};
&pcie {
status = "okay";
wifi@0,0 {
compatible = "pci168c,0046";
reg = <0 0 0 0 0>;
nvmem-cells = <&macaddr_info_8>, <&precal_art_5000>;
nvmem-cell-names = "mac-address", "pre-calibration";
mac-address-increment = <(-1)>;
};
};
&spi {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
m25p,fast-read;
mtdparts: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
partition@40000 {
label = "partition-table";
reg = <0x040000 0x010000>;
read-only;
};
partition@50000 {
label = "art";
reg = <0x050000 0x010000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
cal_art_1000: cal@1000 {
reg = <0x1000 0x440>;
};
precal_art_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};
partition@60000 {
label = "info";
reg = <0x060000 0x020000>;
read-only;
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};
partition@80000 {
label = "user-config";
reg = <0x080000 0x040000>;
read-only;
};
partition@c0000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x0c0000 0xf00000>;
};
partition@fc0000 {
label = "log";
reg = <0xfc0000 0x020000>;
read-only;
};
partition@fe0000 {
label = "certificate";
reg = <0xfe0000 0x010000>;
read-only;
};
partition@ff0000 {
label = "default-config";
reg = <0xff0000 0x010000>;
read-only;
};
};
};
};
&usb_phy0 {
status = "okay";
};
&usb0 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
hub_port0: port@1 {
reg = <1>;
#trigger-source-cells = <0>;
};
};
&wmac {
/* TODO: missing support in ath9k */
status = "disabled";
nvmem-cells = <&cal_art_1000>, <&macaddr_info_8>;
nvmem-cell-names = "calibration", "mac-address";
};

11
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View File

@ -48,6 +48,14 @@ alfa-network,r36a)
ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
ucidef_set_led_switch "wan" "WAN" "blue:wan" "switch0" "0x10"
;;
alfa-network,tube-2hq)
ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
ucidef_set_rssimon "wlan0" "200000" "1"
ucidef_set_led_rssi "signal1" "SIGNAL1" "red:signal1" "wlan0" "1" "100"
ucidef_set_led_rssi "signal2" "SIGNAL2" "orange:signal2" "wlan0" "25" "100"
ucidef_set_led_rssi "signal3" "SIGNAL3" "green:signal3" "wlan0" "50" "100"
ucidef_set_led_rssi "signal4" "SIGNAL4" "green:signal4" "wlan0" "75" "100"
;;
asus,rp-ac66)
ucidef_set_rssimon "wlan0" "200000" "1"
ucidef_set_rssimon "wlan1" "200000" "1"
@ -317,6 +325,9 @@ tplink,archer-c7-v5)
ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x10"
ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x20"
;;
tplink,archer-a9-v6)
ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x02"
;;
tplink,archer-c2-v3|\
tplink,tl-wr1043nd-v4|\
tplink,tl-wr1043n-v5)

4
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@ -13,6 +13,7 @@ ath79_setup_interfaces()
allnet,all-wap02860ac|\
alfa-network,ap121f|\
alfa-network,pi-wifi4|\
alfa-network,tube-2hq|\
arduino,yun|\
aruba,ap-105|\
asus,rp-ac66|\
@ -337,6 +338,7 @@ ath79_setup_interfaces()
;;
mercury,mw4530r-v1|\
tplink,archer-a7-v5|\
tplink,archer-a9-v6|\
tplink,archer-c6-v2|\
tplink,archer-c6-v2-us|\
tplink,archer-c7-v4|\
@ -530,6 +532,7 @@ ath79_setup_macs()
alfa-network,n5q|\
alfa-network,pi-wifi4|\
alfa-network,r36a|\
alfa-network,tube-2hq|\
engenius,eap300-v2|\
engenius,ens202ext-v1)
label_mac=$(mtd_get_mac_binary art 0x1002)
@ -690,6 +693,7 @@ ath79_setup_macs()
label_mac=$lan_mac
;;
tplink,archer-a7-v5|\
tplink,archer-a9-v6|\
tplink,archer-c7-v4|\
tplink,archer-c7-v5|\
tplink,tl-wr1043nd-v4|\

12
target/linux/ath79/image/generic-tp-link.mk
View File

@ -12,6 +12,18 @@ define Device/tplink_archer-a7-v5
endef
TARGET_DEVICES += tplink_archer-a7-v5
define Device/tplink_archer-a9-v6
$(Device/tplink-safeloader-uimage)
SOC := qcn5502
IMAGE_SIZE := 15360k
DEVICE_MODEL := Archer A9
DEVICE_VARIANT := v6
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
ath10k-firmware-qca9984-ct
TPLINK_BOARD_ID := ARCHER-A9-V6
endef
TARGET_DEVICES += tplink_archer-a9-v6
define Device/tplink_archer-c2-v3
$(Device/tplink-safeloader-uimage)
SOC := qca9563

10
target/linux/ath79/image/generic.mk
View File

@ -325,6 +325,16 @@ define Device/alfa-network_r36a
endef
TARGET_DEVICES += alfa-network_r36a
define Device/alfa-network_tube-2hq
SOC := qca9531
DEVICE_VENDOR := ALFA Network
DEVICE_MODEL := Tube-2HQ
DEVICE_PACKAGES := rssileds -swconfig
IMAGE_SIZE := 15872k
SUPPORTED_DEVICES += tube-2hq
endef
TARGET_DEVICES += alfa-network_tube-2hq
define Device/allnet_all-wap02860ac
$(Device/senao_loader_okli)
SOC := qca9558

36
target/linux/ath79/image/nand.mk
View File

@ -305,20 +305,39 @@ define Device/netgear_wndr4500-v3
endef
TARGET_DEVICES += netgear_wndr4500-v3
define Device/zte_mf286
define Device/zte_mf286_common
SOC := qca9563
DEVICE_VENDOR := ZTE
DEVICE_MODEL := MF286
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
ath10k-firmware-qca988x-ct kmod-usb-net-qmi-wwan kmod-usb-serial-option \
uqmi
DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct
BLOCKSIZE := 128k
PAGESIZE := 2048
KERNEL_SIZE := 4096k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
define Device/zte_mf286
$(Device/zte_mf286_common)
DEVICE_MODEL := MF286
DEVICE_PACKAGES += ath10k-firmware-qca988x-ct kmod-usb-net-qmi-wwan \
kmod-usb-serial-option uqmi
endef
TARGET_DEVICES += zte_mf286
define Device/zte_mf286a
$(Device/zte_mf286_common)
DEVICE_MODEL := MF286A
DEVICE_PACKAGES += ath10k-firmware-qca9888-ct kmod-usb-net-qmi-wwan \
kmod-usb-serial-option uqmi
endef
TARGET_DEVICES += zte_mf286a
define Device/zte_mf286r
$(Device/zte_mf286_common)
DEVICE_MODEL := MF286R
DEVICE_PACKAGES += ath10k-firmware-qca9888-ct kmod-usb-net-rndis kmod-usb-acm
endef
TARGET_DEVICES += zte_mf286r
define Device/zyxel_nbg6716
SOC := qca9558
DEVICE_VENDOR := ZyXEL
@ -344,3 +363,10 @@ define Device/zyxel_nbg6716
UBINIZE_OPTS := -E 5
endef
TARGET_DEVICES += zyxel_nbg6716
define Device/zyxel_emg2926_q10a
$(Device/zyxel_nbg6716)
DEVICE_MODEL := EMG2926-Q10A
RAS_BOARD := AAVK-EMG2926Q10A
endef
TARGET_DEVICES += zyxel_emg2926_q10a

5
target/linux/ath79/nand/base-files/etc/board.d/02_network
View File

@ -45,10 +45,13 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
;;
zte,mf286)
zte,mf286|\
zte,mf286a|\
zte,mf286r)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "5:lan:1"
;;
zyxel,emg2926-q10a|\
zyxel,nbg6716)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"

1
target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@ -21,6 +21,7 @@ case "$FIRMWARE" in
netgear,r6100)
caldata_extract "caldata" 0x5000 0x844
;;
zyxel,emg2926-q10a|\
zyxel,nbg6716)
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) 1)

1
target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac
View File

@ -15,6 +15,7 @@ case $board in
[ "$PHYNBR" -eq 0 ] && \
macaddr_add $(mtd_get_mac_binary art 0x0) 2 > /sys${DEVPATH}/macaddress
;;
zyxel,emg2926-q10a|\
zyxel,nbg6716)
# Set mac address for 2.4g device
[ "$PHYNBR" -eq 1 ] && \

1
target/linux/ath79/nand/base-files/lib/preinit/10_fix_eth_mac.sh
View File

@ -3,6 +3,7 @@
preinit_set_mac_address() {
case $(board_name) in
zyxel,emg2926-q10a|\
zyxel,nbg6716)
ethaddr=$(mtd_get_mac_ascii u-boot-env ethaddr)
ip link set dev eth0 address $(macaddr_add $ethaddr 2)

2
target/linux/bcm27xx/bcm2710/config-5.10
View File

@ -37,8 +37,6 @@ CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_VA_BITS_39=y
CONFIG_ARM64_VHE=y
CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y

2
target/linux/bcm27xx/bcm2711/config-5.10
View File

@ -37,8 +37,6 @@ CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_VA_BITS_39=y
CONFIG_ARM64_VHE=y
CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y

147
target/linux/bcm4908/patches-5.10/088-v5.18-phy-phy-brcm-usb-fixup-BCM4908-support.patch Normal file
View File

@ -0,0 +1,147 @@
From 32942d33d63d27714ed16a4176e5a99547adb6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Fri, 18 Feb 2022 18:24:59 +0100
Subject: [PATCH] phy: phy-brcm-usb: fixup BCM4908 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Just like every other family BCM4908 should get its own enum value. That
is required to properly handle it in chipset conditional code.
The real change is excluding BCM4908 from the PLL reprogramming code
(see brcmusb_usb3_pll_54mhz()). I'm not sure what's the BCM4908
reference clock frequency but:
1. BCM4908 custom driver from Broadcom's SDK doesn't reprogram PLL
2. Doing that in Linux driver stopped PHY handling some USB 3.0 devices
This change makes USB 3.0 PHY recognize e.g.:
1. 04e8:6860 - Samsung Electronics Co., Ltd Galaxy series, misc. (MTP mode)
2. 1058:259f - Western Digital My Passport 259F
Broadcom's STB SoCs come with a set of SUN_TOP_CTRL_* registers that
allow reading chip family and product ids. Such a block & register is
missing on BCM4908 so this commit introduces "compatible" string
specific binding.
Fixes: 4b402fa8e0b7 ("phy: phy-brcm-usb: support PHY on the BCM4908")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220218172459.10431-1-zajec5@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
drivers/phy/broadcom/phy-brcm-usb-init.c | 36 ++++++++++++++++++++++++
drivers/phy/broadcom/phy-brcm-usb-init.h | 1 +
drivers/phy/broadcom/phy-brcm-usb.c | 11 +++++++-
3 files changed, 47 insertions(+), 1 deletion(-)
--- a/drivers/phy/broadcom/phy-brcm-usb-init.c
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.c
@@ -79,6 +79,7 @@
enum brcm_family_type {
BRCM_FAMILY_3390A0,
+ BRCM_FAMILY_4908,
BRCM_FAMILY_7250B0,
BRCM_FAMILY_7271A0,
BRCM_FAMILY_7364A0,
@@ -96,6 +97,7 @@ enum brcm_family_type {
static const char *family_names[BRCM_FAMILY_COUNT] = {
USB_BRCM_FAMILY(3390A0),
+ USB_BRCM_FAMILY(4908),
USB_BRCM_FAMILY(7250B0),
USB_BRCM_FAMILY(7271A0),
USB_BRCM_FAMILY(7364A0),
@@ -203,6 +205,27 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT
USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
},
+ /* 4908 */
+ [BRCM_FAMILY_4908] = {
+ 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */
+ 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
+ 0, /* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */
+ 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+ 0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */
+ 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+ 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+ USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+ USB_CTRL_USB_PM_USB_PWRDN_MASK,
+ 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+ 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+ 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+ 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+ 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+ 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+ 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+ 0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK */
+ 0, /* USB_CTRL_SETUP ENDIAN bits */
+ },
/* 7250b0 */
[BRCM_FAMILY_7250B0] = {
USB_CTRL_SETUP_SCB1_EN_MASK,
@@ -559,6 +582,7 @@ static void brcmusb_usb3_pll_54mhz(struc
*/
switch (params->selected_family) {
case BRCM_FAMILY_3390A0:
+ case BRCM_FAMILY_4908:
case BRCM_FAMILY_7250B0:
case BRCM_FAMILY_7366C0:
case BRCM_FAMILY_74371A0:
@@ -1004,6 +1028,18 @@ static const struct brcm_usb_init_ops bc
.set_dual_select = usb_set_dual_select,
};
+void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params)
+{
+ int fam;
+
+ fam = BRCM_FAMILY_4908;
+ params->selected_family = fam;
+ params->usb_reg_bits_map =
+ &usb_reg_bits_map_table[fam][0];
+ params->family_name = family_names[fam];
+ params->ops = &bcm7445_ops;
+}
+
void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params)
{
int fam;
--- a/drivers/phy/broadcom/phy-brcm-usb-init.h
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.h
@@ -64,6 +64,7 @@ struct brcm_usb_init_params {
bool suspend_with_clocks;
};
+void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params);
void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params);
void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params);
void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params);
--- a/drivers/phy/broadcom/phy-brcm-usb.c
+++ b/drivers/phy/broadcom/phy-brcm-usb.c
@@ -253,6 +253,15 @@ static const struct attribute_group brcm
.attrs = brcm_usb_phy_attrs,
};
+static const struct match_chip_info chip_info_4908 = {
+ .init_func = &brcm_usb_dvr_init_4908,
+ .required_regs = {
+ BRCM_REGS_CTRL,
+ BRCM_REGS_XHCI_EC,
+ -1,
+ },
+};
+
static const struct match_chip_info chip_info_7216 = {
.init_func = &brcm_usb_dvr_init_7216,
.required_regs = {
@@ -288,7 +297,7 @@ static const struct match_chip_info chip
static const struct of_device_id brcm_usb_dt_ids[] = {
{
.compatible = "brcm,bcm4908-usb-phy",
- .data = &chip_info_7445,
+ .data = &chip_info_4908,
},
{
.compatible = "brcm,bcm7216-usb-phy",

147
target/linux/bcm4908/patches-5.4/088-v5.18-phy-phy-brcm-usb-fixup-BCM4908-support.patch Normal file
View File

@ -0,0 +1,147 @@
From 32942d33d63d27714ed16a4176e5a99547adb6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Fri, 18 Feb 2022 18:24:59 +0100
Subject: [PATCH] phy: phy-brcm-usb: fixup BCM4908 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Just like every other family BCM4908 should get its own enum value. That
is required to properly handle it in chipset conditional code.
The real change is excluding BCM4908 from the PLL reprogramming code
(see brcmusb_usb3_pll_54mhz()). I'm not sure what's the BCM4908
reference clock frequency but:
1. BCM4908 custom driver from Broadcom's SDK doesn't reprogram PLL
2. Doing that in Linux driver stopped PHY handling some USB 3.0 devices
This change makes USB 3.0 PHY recognize e.g.:
1. 04e8:6860 - Samsung Electronics Co., Ltd Galaxy series, misc. (MTP mode)
2. 1058:259f - Western Digital My Passport 259F
Broadcom's STB SoCs come with a set of SUN_TOP_CTRL_* registers that
allow reading chip family and product ids. Such a block & register is
missing on BCM4908 so this commit introduces "compatible" string
specific binding.
Fixes: 4b402fa8e0b7 ("phy: phy-brcm-usb: support PHY on the BCM4908")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220218172459.10431-1-zajec5@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
drivers/phy/broadcom/phy-brcm-usb-init.c | 36 ++++++++++++++++++++++++
drivers/phy/broadcom/phy-brcm-usb-init.h | 1 +
drivers/phy/broadcom/phy-brcm-usb.c | 11 +++++++-
3 files changed, 47 insertions(+), 1 deletion(-)
--- a/drivers/phy/broadcom/phy-brcm-usb-init.c
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.c
@@ -79,6 +79,7 @@
enum brcm_family_type {
BRCM_FAMILY_3390A0,
+ BRCM_FAMILY_4908,
BRCM_FAMILY_7250B0,
BRCM_FAMILY_7271A0,
BRCM_FAMILY_7364A0,
@@ -96,6 +97,7 @@ enum brcm_family_type {
static const char *family_names[BRCM_FAMILY_COUNT] = {
USB_BRCM_FAMILY(3390A0),
+ USB_BRCM_FAMILY(4908),
USB_BRCM_FAMILY(7250B0),
USB_BRCM_FAMILY(7271A0),
USB_BRCM_FAMILY(7364A0),
@@ -203,6 +205,27 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT
USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
},
+ /* 4908 */
+ [BRCM_FAMILY_4908] = {
+ 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */
+ 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
+ 0, /* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */
+ 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
+ 0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */
+ 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
+ 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
+ USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
+ USB_CTRL_USB_PM_USB_PWRDN_MASK,
+ 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
+ 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
+ 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
+ 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
+ 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
+ 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
+ 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
+ 0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK */
+ 0, /* USB_CTRL_SETUP ENDIAN bits */
+ },
/* 7250b0 */
[BRCM_FAMILY_7250B0] = {
USB_CTRL_SETUP_SCB1_EN_MASK,
@@ -559,6 +582,7 @@ static void brcmusb_usb3_pll_54mhz(struc
*/
switch (params->selected_family) {
case BRCM_FAMILY_3390A0:
+ case BRCM_FAMILY_4908:
case BRCM_FAMILY_7250B0:
case BRCM_FAMILY_7366C0:
case BRCM_FAMILY_74371A0:
@@ -1004,6 +1028,18 @@ static const struct brcm_usb_init_ops bc
.set_dual_select = usb_set_dual_select,
};
+void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params)
+{
+ int fam;
+
+ fam = BRCM_FAMILY_4908;
+ params->selected_family = fam;
+ params->usb_reg_bits_map =
+ &usb_reg_bits_map_table[fam][0];
+ params->family_name = family_names[fam];
+ params->ops = &bcm7445_ops;
+}
+
void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params)
{
int fam;
--- a/drivers/phy/broadcom/phy-brcm-usb-init.h
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.h
@@ -64,6 +64,7 @@ struct brcm_usb_init_params {
bool suspend_with_clocks;
};
+void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params);
void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params);
void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params);
void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params);
--- a/drivers/phy/broadcom/phy-brcm-usb.c
+++ b/drivers/phy/broadcom/phy-brcm-usb.c
@@ -253,6 +253,15 @@ static const struct attribute_group brcm
.attrs = brcm_usb_phy_attrs,
};
+static const struct match_chip_info chip_info_4908 = {
+ .init_func = &brcm_usb_dvr_init_4908,
+ .required_regs = {
+ BRCM_REGS_CTRL,
+ BRCM_REGS_XHCI_EC,
+ -1,
+ },
+};
+
static const struct match_chip_info chip_info_7216 = {
.init_func = &brcm_usb_dvr_init_7216,
.required_regs = {
@@ -288,7 +297,7 @@ static const struct match_chip_info chip
static const struct of_device_id brcm_usb_dt_ids[] = {
{
.compatible = "brcm,bcm4908-usb-phy",
- .data = &chip_info_7445,
+ .data = &chip_info_4908,
},
{
.compatible = "brcm,bcm7216-usb-phy",

4
target/linux/bcm63xx/Makefile
View File

@ -10,8 +10,8 @@ BOARD:=bcm63xx
BOARDNAME:=Broadcom BCM63xx
SUBTARGETS:=generic smp
FEATURES:=squashfs usb atm pci pcmcia usbgadget
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.10
KERNEL_PATCHVER:=5.10
define Target/Description
Build firmware images for Broadcom based xDSL/routers

4
target/linux/bcm63xx/base-files/etc/board.d/02_network
View File

@ -100,8 +100,7 @@ huawei,echolife-hg556a-c)
;;
comtrend,ar-5315u|\
innacomm,w3400v6|\
observa,vh4032n|\
sagem,fast-2704n)
observa,vh4032n)
ucidef_add_switch "switch0" \
"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "8t@eth0"
;;
@ -141,6 +140,7 @@ netgear,dgnd3700-v1)
ucidef_add_switch "switch0" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "8t@eth0"
;;
sagem,fast-2704n|\
sercomm,ad1018|\
sercomm,ad1018-nor)
ucidef_add_switch "switch0" \

18
target/linux/bcm63xx/patches-5.10/100-macronix_nand_block_protection_support.patch Normal file
View File

@ -0,0 +1,18 @@
bcm63xx: fix booting with Kernel 5.10
This is a workaround to make the target overall bootable. With this more
people should be able to test the Kernel 5.10 and report further issues.
Suggested-by: Daniel González Cabanelas <dgcbueu@gmail.com>
Signed-off-by: Paul Spooren <mail@aparcar.org>
--- a/drivers/mtd/nand/raw/nand_macronix.c
+++ b/drivers/mtd/nand/raw/nand_macronix.c
@@ -323,7 +323,7 @@ static int macronix_nand_init(struct nan
macronix_nand_fix_broken_get_timings(chip);
macronix_nand_onfi_init(chip);
- macronix_nand_block_protection_support(chip);
+ //macronix_nand_block_protection_support(chip);
macronix_nand_deep_power_down_support(chip);
return 0;

71
target/linux/generic/backport-5.10/870-hwmon-next-hwmon-lm70-Add-ti-tmp125-support.patch Normal file
View File

@ -0,0 +1,71 @@
From 31d8f414e1596ba54a4315418e4c0086fda9e428 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@gmail.com>
Date: Fri, 18 Feb 2022 10:06:43 +0100
Subject: hwmon: (lm70) Add ti,tmp125 support
The TMP125 is a 2 degree Celsius accurate Digital
Temperature Sensor with a SPI interface.
The temperature register is a 16-bit, read-only register.
The MSB (Bit 15) is a leading zero and never set. Bits 14
to 5 are the 1+9 temperature data bits in a two's
complement format. Bits 4 to 0 are useless copies of
Bit 5 value and therefore ignored.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Link: https://lore.kernel.org/r/43b19cbd4e7f51e9509e561b02b5d8d0e7079fac.1645175187.git.chunkeey@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
--- a/drivers/hwmon/lm70.c
+++ b/drivers/hwmon/lm70.c
@@ -34,6 +34,7 @@
#define LM70_CHIP_LM71 2 /* NS LM71 */
#define LM70_CHIP_LM74 3 /* NS LM74 */
#define LM70_CHIP_TMP122 4 /* TI TMP122/TMP124 */
+#define LM70_CHIP_TMP125 5 /* TI TMP125 */
struct lm70 {
struct spi_device *spi;
@@ -87,6 +88,12 @@ static ssize_t temp1_input_show(struct d
* LM71:
* 14 bits of 2's complement data, discard LSB 2 bits,
* resolution 0.0312 degrees celsius.
+ *
+ * TMP125:
+ * MSB/D15 is a leading zero. D14 is the sign-bit. This is
+ * followed by 9 temperature bits (D13..D5) in 2's complement
+ * data format with a resolution of 0.25 degrees celsius per unit.
+ * LSB 5 bits (D4..D0) share the same value as D5 and get discarded.
*/
switch (p_lm70->chip) {
case LM70_CHIP_LM70:
@@ -102,6 +109,10 @@ static ssize_t temp1_input_show(struct d
case LM70_CHIP_LM71:
val = ((int)raw / 4) * 3125 / 100;
break;
+
+ case LM70_CHIP_TMP125:
+ val = (sign_extend32(raw, 14) / 32) * 250;
+ break;
}
status = sprintf(buf, "%d\n", val); /* millidegrees Celsius */
@@ -136,6 +147,10 @@ static const struct of_device_id lm70_of
.data = (void *) LM70_CHIP_TMP122,
},
{
+ .compatible = "ti,tmp125",
+ .data = (void *) LM70_CHIP_TMP125,
+ },
+ {
.compatible = "ti,lm71",
.data = (void *) LM70_CHIP_LM71,
},
@@ -184,6 +199,7 @@ static const struct spi_device_id lm70_i
{ "lm70", LM70_CHIP_LM70 },
{ "tmp121", LM70_CHIP_TMP121 },
{ "tmp122", LM70_CHIP_TMP122 },
+ { "tmp125", LM70_CHIP_TMP125 },
{ "lm71", LM70_CHIP_LM71 },
{ "lm74", LM70_CHIP_LM74 },
{ },

10
target/linux/generic/config-5.10
View File

@ -414,6 +414,7 @@ CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_AS3935 is not set
# CONFIG_AS73211 is not set
# CONFIG_ASM9260_TIMER is not set
# CONFIG_ASN1 is not set
# CONFIG_ASUS_LAPTOP is not set
# CONFIG_ASUS_WIRELESS is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
@ -1329,8 +1330,10 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_WX is not set
# CONFIG_DEBUG_ZBOOT is not set
# CONFIG_DECNET is not set
# CONFIG_DEFAULT_CODEL is not set
CONFIG_DEFAULT_CUBIC=y
CONFIG_DEFAULT_DEADLINE=y
# CONFIG_DEFAULT_FQ is not set
CONFIG_DEFAULT_FQ_CODEL=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
@ -1343,6 +1346,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
CONFIG_DEFAULT_SECURITY=""
CONFIG_DEFAULT_SECURITY_DAC=y
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
# CONFIG_DEFAULT_SFQ is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@ -3613,6 +3617,7 @@ CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_JZ4740 is not set
# CONFIG_MTD_NAND_MPC5121_NFC is not set
# CONFIG_MTD_NAND_MTK is not set
# CONFIG_MTD_NAND_MTK_BMT is not set
# CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_MXIC is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@ -3698,7 +3703,6 @@ CONFIG_MTD_SPLIT_SUPPORT=y
# CONFIG_MTD_UBI_GLUEBI is not set
# CONFIG_MTD_UIMAGE_SPLIT is not set
# CONFIG_MTD_VIRT_CONCAT is not set
# CONFIG_MTD_NAND_MTK_BMT is not set
# CONFIG_MTK_MMC is not set
# CONFIG_MTK_MMSYS is not set
# CONFIG_MULTIPLEXER is not set
@ -4610,14 +4614,14 @@ CONFIG_PROC_SYSCTL=y
# CONFIG_PSB6970_PHY is not set
# CONFIG_PSI is not set
# CONFIG_PSTORE is not set
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_COMPRESS is not set
# CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
# CONFIG_PSTORE_CONSOLE is not set
# CONFIG_PSTORE_DEFLATE_COMPRESS is not set
# CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT is not set
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_LZ4_COMPRESS is not set
# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
# CONFIG_PSTORE_LZ4_COMPRESS is not set
# CONFIG_PSTORE_LZO_COMPRESS is not set
# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_RAM is not set

15
target/linux/generic/config-5.4
View File

@ -1507,6 +1507,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EFI is not set
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_VARS_PSTORE is not set
# CONFIG_EFS_FS is not set
CONFIG_ELFCORE=y
# CONFIG_ELF_CORE is not set
@ -4221,6 +4222,17 @@ CONFIG_PROC_SYSCTL=y
# CONFIG_PSB6970_PHY is not set
# CONFIG_PSI is not set
# CONFIG_PSTORE is not set
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_COMPRESS is not set
# CONFIG_PSTORE_CONSOLE is not set
# CONFIG_PSTORE_DEFLATE_COMPRESS is not set
# CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT is not set
# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
# CONFIG_PSTORE_LZ4_COMPRESS is not set
# CONFIG_PSTORE_LZO_COMPRESS is not set
# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_RAM is not set
# CONFIG_PSTORE_ZSTD_COMPRESS is not set
# CONFIG_PTP_1588_CLOCK is not set
# CONFIG_PTP_1588_CLOCK_IXP46X is not set
# CONFIG_PTP_1588_CLOCK_KVM is not set
@ -4319,6 +4331,9 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
# CONFIG_READ_ONLY_THP_FOR_FS is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_REDWOOD is not set
# CONFIG_REED_SOLOMON is not set
# CONFIG_REED_SOLOMON_DEC8 is not set
# CONFIG_REED_SOLOMON_ENC8 is not set
# CONFIG_REED_SOLOMON_TEST is not set
# CONFIG_REFCOUNT_FULL is not set
# CONFIG_REGMAP is not set

11
target/linux/ipq806x/base-files/etc/uci-defaults/05_fix-compat-version Normal file
View File

@ -0,0 +1,11 @@
. /lib/functions.sh
case "$(board_name)" in
linksys,ea7500-v1|\
linksys,ea8500)
uci set system.@system[0].compat_version="2.0"
uci commit system
;;
esac
exit 0

2
target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
View File

@ -1,4 +1,4 @@
. /lib/functions.sh
. "$IPKG_INSTROOT/lib/functions.sh"
asrock_bootconfig_mangle() {
local mtdnum="$(find_mtd_index 0:bootconfig)"

10
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
View File

@ -133,12 +133,12 @@
partition@f80000 {
label = "kernel1";
reg = <0x0f80000 0x2800000>; /* 3 MB spill to rootfs */
reg = <0x0f80000 0x2800000>; /* 4 MB, spill to rootfs */
};
partition@1280000 {
partition@1380000 {
label = "rootfs1";
reg = <0x1280000 0x2500000>;
reg = <0x1380000 0x2400000>;
};
partition@3780000 {
@ -146,9 +146,9 @@
reg = <0x3780000 0x2800000>;
};
partition@3a80000 {
partition@3b80000 {
label = "rootfs2";
reg = <0x3a80000 0x2500000>;
reg = <0x3b80000 0x2400000>;
};
};
};

15
target/linux/ipq806x/image/generic.mk
View File

@ -1,6 +1,13 @@
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
DEVICE_VARS += TPLINK_BOARD_ID
define Device/kernel-size-migration
DEVICE_COMPAT_VERSION := 2.0
DEVICE_COMPAT_MESSAGE := *** Kernel partition size has changed from earlier \
versions. You need to sysupgrade with the OpenWrt factory image and \
use the force flag when image check fails. Settings will be lost. ***
endef
define Build/buffalo-rootfs-cksum
( \
echo -ne "\x$$(od -A n -t u1 $@ | tr -s ' ' '\n' | \
@ -128,13 +135,14 @@ TARGET_DEVICES += edgecore_ecw5410
define Device/linksys_ea7500-v1
$(call Device/LegacyImage)
$(Device/kernel-size-migration)
DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA7500
DEVICE_VARIANT := v1
SOC := qcom-ipq8064
PAGESIZE := 2048
BLOCKSIZE := 128k
KERNEL_SIZE := 3072k
KERNEL_SIZE := 4096k
KERNEL = kernel-bin | append-dtb | uImage none | \
append-uImage-fakehdr filesystem
UBINIZE_OPTS := -E 5
@ -142,18 +150,18 @@ define Device/linksys_ea7500-v1
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
append-ubi | pad-to $$$$(PAGESIZE)
DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
DEFAULT := n
endef
TARGET_DEVICES += linksys_ea7500-v1
define Device/linksys_ea8500
$(call Device/LegacyImage)
$(Device/kernel-size-migration)
DEVICE_VENDOR := Linksys
DEVICE_MODEL := EA8500
SOC := qcom-ipq8064
PAGESIZE := 2048
BLOCKSIZE := 128k
KERNEL_SIZE := 3072k
KERNEL_SIZE := 4096k
KERNEL = kernel-bin | append-dtb | uImage none | \
append-uImage-fakehdr filesystem
BOARD_NAME := ea8500
@ -163,7 +171,6 @@ define Device/linksys_ea8500
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
append-ubi
DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
DEFAULT := n
endef
TARGET_DEVICES += linksys_ea8500

9
target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
View File

@ -24,6 +24,7 @@
led-running = &led_power_green;
led-upgrade = &led_fault_red;
label-mac-device = &enet0;
spi0 = &spi0;
};
memory {
@ -113,6 +114,14 @@
board_soc: soc: soc@ffe00000 {
ranges = <0x0 0x0 0xffe00000 0x100000>;
spi0: spi@7000 {
temperature-sensor@1 {
compatible = "ti,tmp125";
reg = <1>;
spi-max-frequency = <5000000>;
};
};
i2c@3100 {
tpm@29 {
compatible = "atmel,at97sc3204t";

2
target/linux/mpc85xx/image/p1020.mk
View File

@ -15,7 +15,7 @@ define Device/aerohive_hiveap-330
DEVICE_MODEL := HiveAP-330
DEVICE_ALT0_VENDOR := Aerohive
DEVICE_ALT0_MODEL := HiveAP-350
DEVICE_PACKAGES := kmod-tpm-i2c-atmel
DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-hwmon-lm70
BLOCKSIZE := 128k
KERNEL := kernel-bin | uImage none
KERNEL_INITRAMFS := kernel-bin | MultiImage none

8
target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi
View File

@ -26,6 +26,14 @@
gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
};
};
watchdog {
compatible = "linux,wdt-gpio";
gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
hw_algo = "toggle";
hw_margin_ms = <20000>;
always-running;
};
};
&pcie {

6
target/linux/ramips/dts/mt7621.dtsi
View File

@ -465,7 +465,7 @@
mediatek,ethsys = <&sysc>;
pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &mdio_pins>;
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>, <&rgmii2_pins>;
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
@ -492,8 +492,6 @@
switch0: switch@1f {
compatible = "mediatek,mt7621";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x1f>;
mediatek,mcm;
resets = <&rstctrl 2>;
@ -505,7 +503,6 @@
ports {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
port@0 {
status = "disabled";
@ -546,6 +543,7 @@
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
};

4
target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts
View File

@ -147,6 +147,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts
View File

@ -152,6 +152,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&switch0 {
ports {
port@0 {

4
target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts
View File

@ -172,6 +172,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_4>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
View File

@ -174,6 +174,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_firefly_firewrt.dts
View File

@ -104,6 +104,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts
View File

@ -99,6 +99,10 @@
status = "okay";
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts
View File

@ -109,6 +109,10 @@
status = "okay";
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
View File

@ -112,6 +112,10 @@
status = "okay";
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_5>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts
View File

@ -39,6 +39,10 @@
status = "okay";
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&switch0 {
ports {
port@0 {

4
target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
View File

@ -66,6 +66,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&switch0 {
ports {
port@0 {

4
target/linux/ramips/dts/mt7621_mtc_wr1201.dts
View File

@ -98,6 +98,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_4>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_netgear_ex6150.dts
View File

@ -227,6 +227,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_4>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_sercomm_na502.dts
View File

@ -95,6 +95,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
View File

@ -120,6 +120,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e006>;
nvmem-cell-names = "mac-address";

6
target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
View File

@ -115,7 +115,7 @@
&state_default {
gpio {
groups = "i2c", "uart2", "uart3", "jtag", "wdt";
groups = "i2c", "rgmii2", "uart2", "uart3", "jtag", "wdt";
function = "gpio";
};
};
@ -153,6 +153,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_config_8>;
nvmem-cell-names = "mac-address";

194
target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts Normal file
View File

@ -0,0 +1,194 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "mt7621.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
/ {
compatible = "tplink,eap615-wall-v1", "mediatek,mt7621-soc";
model = "TP-Link EAP615-Wall v1";
aliases {
label-mac-device = &gmac0;
led-boot = &led_status;
led-failsafe = &led_status;
led-running = &led_status;
led-upgrade = &led_status;
};
chosen {
bootargs = "console=ttyS0,115200";
};
leds {
compatible = "gpio-leds";
led_status: status {
label = "white:status";
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_STATUS;
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
};
};
keys {
compatible = "gpio-keys";
led {
label = "led";
gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
linux,code = <KEY_LIGHTS_TOGGLE>;
};
reset {
label = "reset";
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};
gpio-export {
compatible = "gpio-export";
poe_passthrough {
gpio-export,name = "poe-passthrough";
gpio-export,output = <0>;
gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
};
};
};
&ethernet {
reg = <0x1e100000 0xe000>;
};
&spi0 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x80000>;
read-only;
};
partition@80000 {
label = "partition-table";
reg = <0x80000 0x10000>;
read-only;
};
info: partition@90000 {
label = "product-info";
reg = <0x90000 0x10000>;
read-only;
};
partition@a0000 {
compatible = "denx,fit";
label = "firmware";
reg = <0xa0000 0xcf0000>;
};
partition@d90000 {
label = "user-config";
reg = <0xd90000 0x60000>;
read-only;
};
partition@f30000 {
label = "mutil-log";
reg = <0xf30000 0x80000>;
read-only;
};
partition@fb0000 {
label = "oops";
reg = <0xfb0000 0x40000>;
read-only;
};
radio: partition@ff0000 {
label = "radio";
reg = <0xff0000 0x10000>;
read-only;
};
};
};
};
&state_default {
gpio {
groups = "uart2", "uart3";
function = "gpio";
};
};
&pcie {
status = "okay";
};
&pcie1 {
wifi@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&radio 0x0>;
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
};
&pcie2 {
status = "disabled";
};
&gmac0 {
nvmem-cells = <&macaddr_info_8>;
nvmem-cell-names = "mac-address";
};
&switch0 {
compatible = "mediatek,mt7530";
ports {
port@0 {
status = "okay";
label = "lan0";
};
port@1 {
status = "okay";
label = "lan3";
};
port@2 {
status = "okay";
label = "lan2";
};
port@3 {
status = "okay";
label = "lan1";
};
};
};
&info {
compatible = "nvmem-cells";
#address-cells = <1>;
#size-cells = <1>;
macaddr_info_8: macaddr@8 {
reg = <0x8 0x6>;
};
};

4
target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
View File

@ -147,6 +147,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_config_10008>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi
View File

@ -167,6 +167,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_config_10008>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
View File

@ -19,6 +19,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_22>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_wavlink_wl-wn531a6.dts
View File

@ -137,6 +137,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dtsi
View File

@ -108,6 +108,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts
View File

@ -118,6 +118,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
View File

@ -152,6 +152,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
View File

@ -148,6 +148,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
View File

@ -106,6 +106,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

4
target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
View File

@ -110,6 +110,10 @@
};
};
&ethernet {
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
};
&gmac0 {
nvmem-cells = <&macaddr_factory_e000>;
nvmem-cell-names = "mac-address";

Some files were not shown because too many files have changed in this diff Show More