diff --git a/.github/update.log b/.github/update.log
index 1641f9b02f..9ffd083f42 100644
--- a/.github/update.log
+++ b/.github/update.log
@@ -689,3 +689,4 @@ Update On Thu Jun 27 20:29:48 CEST 2024
 Update On Fri Jun 28 20:30:26 CEST 2024
 Update On Sat Jun 29 20:29:36 CEST 2024
 Update On Sun Jun 30 20:30:33 CEST 2024
+Update On Mon Jul  1 20:30:34 CEST 2024
diff --git a/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/direct.go b/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/direct.go
index 1b01a576c4..7114045d63 100644
--- a/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/direct.go
+++ b/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/direct.go
@@ -3,15 +3,19 @@ package outbound
 import (
 	"context"
 	"errors"
-	"net/netip"
+	"os"
+	"strconv"
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/loopback"
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/features"
 )
 
+var DisableLoopBackDetector, _ = strconv.ParseBool(os.Getenv("DISABLE_LOOPBACK_DETECTOR"))
+
 type Direct struct {
 	*Base
 	loopBack *loopback.Detector
@@ -24,8 +28,10 @@ type DirectOption struct {
 
 // DialContext implements C.ProxyAdapter
 func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	if err := d.loopBack.CheckConn(metadata); err != nil {
-		return nil, err
+	if !features.CMFA && !DisableLoopBackDetector {
+		if err := d.loopBack.CheckConn(metadata); err != nil {
+			return nil, err
+		}
 	}
 	opts = append(opts, dialer.WithResolver(resolver.DefaultResolver))
 	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress(), d.Base.DialOptions(opts...)...)
@@ -38,8 +44,10 @@ func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...
 
 // ListenPacketContext implements C.ProxyAdapter
 func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	if err := d.loopBack.CheckPacketConn(metadata); err != nil {
-		return nil, err
+	if !features.CMFA && !DisableLoopBackDetector {
+		if err := d.loopBack.CheckPacketConn(metadata); err != nil {
+			return nil, err
+		}
 	}
 	// net.UDPConn.WriteTo only working with *net.UDPAddr, so we need a net.UDPAddr
 	if !metadata.Resolved() {
@@ -49,13 +57,17 @@ func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
 		}
 		metadata.DstIP = ip
 	}
-	pc, err := dialer.NewDialer(d.Base.DialOptions(opts...)...).ListenPacket(ctx, "udp", "", netip.AddrPortFrom(metadata.DstIP, metadata.DstPort))
+	pc, err := dialer.NewDialer(d.Base.DialOptions(opts...)...).ListenPacket(ctx, "udp", "", metadata.AddrPort())
 	if err != nil {
 		return nil, err
 	}
 	return d.loopBack.NewPacketConn(newPacketConn(pc, d)), nil
 }
 
+func (d *Direct) IsL3Protocol(metadata *C.Metadata) bool {
+	return true // tell DNSDialer don't send domain to DialContext, avoid lookback to DefaultResolver
+}
+
 func NewDirectWithOption(option DirectOption) *Direct {
 	return &Direct{
 		Base: &Base{
diff --git a/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/wireguard.go b/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/wireguard.go
index 976f395933..2e34dd83cd 100644
--- a/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/wireguard.go
+++ b/clash-meta-android/core/src/foss/golang/clash/adapter/outbound/wireguard.go
@@ -12,6 +12,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/metacubex/mihomo/common/atomic"
 	CN "github.com/metacubex/mihomo/common/net"
@@ -48,6 +49,10 @@ type WireGuard struct {
 	connectAddr   M.Socksaddr
 	localPrefixes []netip.Prefix
 
+	serverAddrMap   map[M.Socksaddr]netip.AddrPort
+	serverAddrTime  atomic.TypedValue[time.Time]
+	serverAddrMutex sync.Mutex
+
 	closeCh chan struct{} // for test
 }
 
@@ -67,6 +72,8 @@ type WireGuardOption struct {
 
 	RemoteDnsResolve bool     `proxy:"remote-dns-resolve,omitempty"`
 	Dns              []string `proxy:"dns,omitempty"`
+
+	RefreshServerIPInterval int `proxy:"refresh-server-ip-interval,omitempty"`
 }
 
 type WireGuardPeerOption struct {
@@ -287,6 +294,15 @@ func (w *WireGuard) resolve(ctx context.Context, address M.Socksaddr) (netip.Add
 }
 
 func (w *WireGuard) init(ctx context.Context) error {
+	err := w.init0(ctx)
+	if err != nil {
+		return err
+	}
+	w.updateServerAddr(ctx)
+	return nil
+}
+
+func (w *WireGuard) init0(ctx context.Context) error {
 	if w.initOk.Load() {
 		return nil
 	}
@@ -301,41 +317,118 @@ func (w *WireGuard) init(ctx context.Context) error {
 	}
 
 	w.bind.ResetReservedForEndpoint()
-	ipcConf := "private_key=" + w.option.PrivateKey
+	w.serverAddrMap = make(map[M.Socksaddr]netip.AddrPort)
+	ipcConf, err := w.genIpcConf(ctx, false)
+	if err != nil {
+		// !!! do not set initErr here !!!
+		// let us can retry domain resolve in next time
+		return err
+	}
+
+	if debug.Enabled {
+		log.SingLogger.Trace(fmt.Sprintf("[WG](%s) created wireguard ipc conf: \n %s", w.option.Name, ipcConf))
+	}
+	err = w.device.IpcSet(ipcConf)
+	if err != nil {
+		w.initErr = E.Cause(err, "setup wireguard")
+		return w.initErr
+	}
+	w.serverAddrTime.Store(time.Now())
+
+	err = w.tunDevice.Start()
+	if err != nil {
+		w.initErr = err
+		return w.initErr
+	}
+
+	w.initOk.Store(true)
+	return nil
+}
+
+func (w *WireGuard) updateServerAddr(ctx context.Context) {
+	if w.option.RefreshServerIPInterval != 0 && time.Since(w.serverAddrTime.Load()) > time.Second*time.Duration(w.option.RefreshServerIPInterval) {
+		if w.serverAddrMutex.TryLock() {
+			defer w.serverAddrMutex.Unlock()
+			ipcConf, err := w.genIpcConf(ctx, true)
+			if err != nil {
+				log.Warnln("[WG](%s)UpdateServerAddr failed to generate wireguard ipc conf: %s", w.option.Name, err)
+				return
+			}
+			err = w.device.IpcSet(ipcConf)
+			if err != nil {
+				log.Warnln("[WG](%s)UpdateServerAddr failed to update wireguard ipc conf: %s", w.option.Name, err)
+				return
+			}
+			w.serverAddrTime.Store(time.Now())
+		}
+	}
+}
+
+func (w *WireGuard) genIpcConf(ctx context.Context, updateOnly bool) (string, error) {
+	ipcConf := ""
+	if !updateOnly {
+		ipcConf += "private_key=" + w.option.PrivateKey + "\n"
+	}
 	if len(w.option.Peers) > 0 {
 		for i, peer := range w.option.Peers {
-			destination, err := w.resolve(ctx, peer.Addr())
+			peerAddr := peer.Addr()
+			destination, err := w.resolve(ctx, peerAddr)
 			if err != nil {
-				// !!! do not set initErr here !!!
-				// let us can retry domain resolve in next time
-				return E.Cause(err, "resolve endpoint domain for peer ", i)
+				return "", E.Cause(err, "resolve endpoint domain for peer ", i)
 			}
-			ipcConf += "\npublic_key=" + peer.PublicKey
-			ipcConf += "\nendpoint=" + destination.String()
-			if peer.PreSharedKey != "" {
-				ipcConf += "\npreshared_key=" + peer.PreSharedKey
+			if w.serverAddrMap[peerAddr] != destination {
+				w.serverAddrMap[peerAddr] = destination
+			} else if updateOnly {
+				continue
 			}
-			for _, allowedIP := range peer.AllowedIPs {
-				ipcConf += "\nallowed_ip=" + allowedIP
+
+			if len(w.option.Peers) == 1 { // must call SetConnectAddr if isConnect == true
+				w.bind.SetConnectAddr(destination)
 			}
+			ipcConf += "public_key=" + peer.PublicKey + "\n"
+			if updateOnly {
+				ipcConf += "update_only=true\n"
+			}
+			ipcConf += "endpoint=" + destination.String() + "\n"
 			if len(peer.Reserved) > 0 {
 				var reserved [3]uint8
 				copy(reserved[:], w.option.Reserved)
 				w.bind.SetReservedForEndpoint(destination, reserved)
 			}
+			if updateOnly {
+				continue
+			}
+			if peer.PreSharedKey != "" {
+				ipcConf += "preshared_key=" + peer.PreSharedKey + "\n"
+			}
+			for _, allowedIP := range peer.AllowedIPs {
+				ipcConf += "allowed_ip=" + allowedIP + "\n"
+			}
+			if w.option.PersistentKeepalive != 0 {
+				ipcConf += fmt.Sprintf("persistent_keepalive_interval=%d\n", w.option.PersistentKeepalive)
+			}
 		}
 	} else {
-		ipcConf += "\npublic_key=" + w.option.PublicKey
 		destination, err := w.resolve(ctx, w.connectAddr)
 		if err != nil {
-			// !!! do not set initErr here !!!
-			// let us can retry domain resolve in next time
-			return E.Cause(err, "resolve endpoint domain")
+			return "", E.Cause(err, "resolve endpoint domain")
+		}
+		if w.serverAddrMap[w.connectAddr] != destination {
+			w.serverAddrMap[w.connectAddr] = destination
+		} else if updateOnly {
+			return "", nil
+		}
+		w.bind.SetConnectAddr(destination) // must call SetConnectAddr if isConnect == true
+		ipcConf += "public_key=" + w.option.PublicKey + "\n"
+		if updateOnly {
+			ipcConf += "update_only=true\n"
+		}
+		ipcConf += "endpoint=" + destination.String() + "\n"
+		if updateOnly {
+			return ipcConf, nil
 		}
-		w.bind.SetConnectAddr(destination)
-		ipcConf += "\nendpoint=" + destination.String()
 		if w.option.PreSharedKey != "" {
-			ipcConf += "\npreshared_key=" + w.option.PreSharedKey
+			ipcConf += "preshared_key=" + w.option.PreSharedKey + "\n"
 		}
 		var has4, has6 bool
 		for _, address := range w.localPrefixes {
@@ -346,34 +439,17 @@ func (w *WireGuard) init(ctx context.Context) error {
 			}
 		}
 		if has4 {
-			ipcConf += "\nallowed_ip=0.0.0.0/0"
+			ipcConf += "allowed_ip=0.0.0.0/0\n"
 		}
 		if has6 {
-			ipcConf += "\nallowed_ip=::/0"
+			ipcConf += "allowed_ip=::/0\n"
+		}
+
+		if w.option.PersistentKeepalive != 0 {
+			ipcConf += fmt.Sprintf("persistent_keepalive_interval=%d\n", w.option.PersistentKeepalive)
 		}
 	}
-
-	if w.option.PersistentKeepalive != 0 {
-		ipcConf += fmt.Sprintf("\npersistent_keepalive_interval=%d", w.option.PersistentKeepalive)
-	}
-
-	if debug.Enabled {
-		log.SingLogger.Trace(fmt.Sprintf("[WG](%s) created wireguard ipc conf: \n %s", w.option.Name, ipcConf))
-	}
-	err := w.device.IpcSet(ipcConf)
-	if err != nil {
-		w.initErr = E.Cause(err, "setup wireguard")
-		return w.initErr
-	}
-
-	err = w.tunDevice.Start()
-	if err != nil {
-		w.initErr = err
-		return w.initErr
-	}
-
-	w.initOk.Store(true)
-	return nil
+	return ipcConf, nil
 }
 
 func closeWireGuard(w *WireGuard) {
diff --git a/clash-meta-android/core/src/foss/golang/clash/adapter/outboundgroup/relay.go b/clash-meta-android/core/src/foss/golang/clash/adapter/outboundgroup/relay.go
index 07fbcd9588..29aa9c6a74 100644
--- a/clash-meta-android/core/src/foss/golang/clash/adapter/outboundgroup/relay.go
+++ b/clash-meta-android/core/src/foss/golang/clash/adapter/outboundgroup/relay.go
@@ -9,6 +9,7 @@ import (
 	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/log"
 )
 
 type Relay struct {
@@ -149,6 +150,7 @@ func (r *Relay) Addr() string {
 }
 
 func NewRelay(option *GroupCommonOption, providers []provider.ProxyProvider) *Relay {
+	log.Warnln("The group [%s] with relay type is deprecated, please using dialer-proxy instead", option.Name)
 	return &Relay{
 		GroupBase: NewGroupBase(GroupBaseOption{
 			outbound.BaseOption{
diff --git a/clash-meta-android/core/src/foss/golang/clash/adapter/provider/parser.go b/clash-meta-android/core/src/foss/golang/clash/adapter/provider/parser.go
index 1094668d46..edb6b9110a 100644
--- a/clash-meta-android/core/src/foss/golang/clash/adapter/provider/parser.go
+++ b/clash-meta-android/core/src/foss/golang/clash/adapter/provider/parser.go
@@ -28,7 +28,10 @@ type healthCheckSchema struct {
 }
 
 type OverrideSchema struct {
+	TFO              *bool   `provider:"tfo,omitempty"`
+	MPTcp            *bool   `provider:"mptcp,omitempty"`
 	UDP              *bool   `provider:"udp,omitempty"`
+	UDPOverTCP       *bool   `provider:"udp-over-tcp,omitempty"`
 	Up               *string `provider:"up,omitempty"`
 	Down             *string `provider:"down,omitempty"`
 	DialerProxy      *string `provider:"dialer-proxy,omitempty"`
diff --git a/clash-meta-android/core/src/foss/golang/clash/adapter/provider/provider.go b/clash-meta-android/core/src/foss/golang/clash/adapter/provider/provider.go
index daef017c95..694eae436f 100644
--- a/clash-meta-android/core/src/foss/golang/clash/adapter/provider/provider.go
+++ b/clash-meta-android/core/src/foss/golang/clash/adapter/provider/provider.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"reflect"
 	"runtime"
 	"strings"
 	"time"
@@ -373,37 +374,23 @@ func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray
 					mapping["dialer-proxy"] = dialerProxy
 				}
 
-				if override.UDP != nil {
-					mapping["udp"] = *override.UDP
-				}
-				if override.Up != nil {
-					mapping["up"] = *override.Up
-				}
-				if override.Down != nil {
-					mapping["down"] = *override.Down
-				}
-				if override.DialerProxy != nil {
-					mapping["dialer-proxy"] = *override.DialerProxy
-				}
-				if override.SkipCertVerify != nil {
-					mapping["skip-cert-verify"] = *override.SkipCertVerify
-				}
-				if override.Interface != nil {
-					mapping["interface-name"] = *override.Interface
-				}
-				if override.RoutingMark != nil {
-					mapping["routing-mark"] = *override.RoutingMark
-				}
-				if override.IPVersion != nil {
-					mapping["ip-version"] = *override.IPVersion
-				}
-				if override.AdditionalPrefix != nil {
-					name := mapping["name"].(string)
-					mapping["name"] = *override.AdditionalPrefix + name
-				}
-				if override.AdditionalSuffix != nil {
-					name := mapping["name"].(string)
-					mapping["name"] = name + *override.AdditionalSuffix
+				val := reflect.ValueOf(override)
+				for i := 0; i < val.NumField(); i++ {
+					field := val.Field(i)
+					if field.IsNil() {
+						continue
+					}
+					fieldName := strings.Split(val.Type().Field(i).Tag.Get("provider"), ",")[0]
+					switch fieldName {
+					case "additional-prefix":
+						name := mapping["name"].(string)
+						mapping["name"] = *field.Interface().(*string) + name
+					case "additional-suffix":
+						name := mapping["name"].(string)
+						mapping["name"] = name + *field.Interface().(*string)
+					default:
+						mapping[fieldName] = field.Elem().Interface()
+					}
 				}
 
 				proxy, err := adapter.ParseProxy(mapping)
diff --git a/clash-meta-android/core/src/foss/golang/clash/common/utils/callback.go b/clash-meta-android/core/src/foss/golang/clash/common/utils/callback.go
new file mode 100644
index 0000000000..df950d3a81
--- /dev/null
+++ b/clash-meta-android/core/src/foss/golang/clash/common/utils/callback.go
@@ -0,0 +1,50 @@
+package utils
+
+import (
+	"io"
+	"sync"
+
+	list "github.com/bahlo/generic-list-go"
+)
+
+type Callback[T any] struct {
+	list  list.List[func(T)]
+	mutex sync.RWMutex
+}
+
+func NewCallback[T any]() *Callback[T] {
+	return &Callback[T]{}
+}
+
+func (c *Callback[T]) Register(item func(T)) io.Closer {
+	c.mutex.RLock()
+	defer c.mutex.RUnlock()
+	element := c.list.PushBack(item)
+	return &callbackCloser[T]{
+		element:  element,
+		callback: c,
+	}
+}
+
+func (c *Callback[T]) Emit(item T) {
+	c.mutex.RLock()
+	defer c.mutex.RUnlock()
+	for element := c.list.Front(); element != nil; element = element.Next() {
+		go element.Value(item)
+	}
+}
+
+type callbackCloser[T any] struct {
+	element  *list.Element[func(T)]
+	callback *Callback[T]
+	once     sync.Once
+}
+
+func (c *callbackCloser[T]) Close() error {
+	c.once.Do(func() {
+		c.callback.mutex.Lock()
+		defer c.callback.mutex.Unlock()
+		c.callback.list.Remove(c.element)
+	})
+	return nil
+}
diff --git a/clash-meta-android/core/src/foss/golang/clash/component/cidr/ipcidr_set.go b/clash-meta-android/core/src/foss/golang/clash/component/cidr/ipcidr_set.go
index 0cb55e3647..521fabab13 100644
--- a/clash-meta-android/core/src/foss/golang/clash/component/cidr/ipcidr_set.go
+++ b/clash-meta-android/core/src/foss/golang/clash/component/cidr/ipcidr_set.go
@@ -43,12 +43,12 @@ func (set *IpCidrSet) IsContainForString(ipString string) bool {
 }
 
 func (set *IpCidrSet) IsContain(ip netip.Addr) bool {
-	return set.toIPSet().Contains(ip.WithZone(""))
+	return set.ToIPSet().Contains(ip.WithZone(""))
 }
 
 func (set *IpCidrSet) Merge() error {
 	var b netipx.IPSetBuilder
-	b.AddSet(set.toIPSet())
+	b.AddSet(set.ToIPSet())
 	i, err := b.IPSet()
 	if err != nil {
 		return err
@@ -57,7 +57,9 @@ func (set *IpCidrSet) Merge() error {
 	return nil
 }
 
-func (set *IpCidrSet) toIPSet() *netipx.IPSet {
+// ToIPSet not safe convert to *netipx.IPSet
+// be careful, must be used after Merge
+func (set *IpCidrSet) ToIPSet() *netipx.IPSet {
 	return (*netipx.IPSet)(unsafe.Pointer(set))
 }
 
diff --git a/clash-meta-android/core/src/foss/golang/clash/component/dialer/dialer.go b/clash-meta-android/core/src/foss/golang/clash/component/dialer/dialer.go
index c21e638e4e..54a1aa6ac7 100644
--- a/clash-meta-android/core/src/foss/golang/clash/component/dialer/dialer.go
+++ b/clash-meta-android/core/src/foss/golang/clash/component/dialer/dialer.go
@@ -378,12 +378,12 @@ func (d Dialer) DialContext(ctx context.Context, network, address string) (net.C
 }
 
 func (d Dialer) ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error) {
-	opt := WithOption(d.Opt)
+	opt := d.Opt // make a copy
 	if rAddrPort.Addr().Unmap().IsLoopback() {
 		// avoid "The requested address is not valid in its context."
-		opt = WithInterface("")
+		WithInterface("")(&opt)
 	}
-	return ListenPacket(ctx, ParseNetwork(network, rAddrPort.Addr()), address, rAddrPort, opt)
+	return ListenPacket(ctx, ParseNetwork(network, rAddrPort.Addr()), address, rAddrPort, WithOption(opt))
 }
 
 func NewDialer(options ...Option) Dialer {
diff --git a/clash-meta-android/core/src/foss/golang/clash/component/iface/iface.go b/clash-meta-android/core/src/foss/golang/clash/component/iface/iface.go
index d543725a3d..272ee7377a 100644
--- a/clash-meta-android/core/src/foss/golang/clash/component/iface/iface.go
+++ b/clash-meta-android/core/src/foss/golang/clash/component/iface/iface.go
@@ -11,8 +11,9 @@ import (
 
 type Interface struct {
 	Index        int
+	MTU          int
 	Name         string
-	Addrs        []netip.Prefix
+	Addresses    []netip.Prefix
 	HardwareAddr net.HardwareAddr
 }
 
@@ -61,8 +62,9 @@ func Interfaces() (map[string]*Interface, error) {
 
 			r[iface.Name] = &Interface{
 				Index:        iface.Index,
+				MTU:          iface.MTU,
 				Name:         iface.Name,
-				Addrs:        ipNets,
+				Addresses:    ipNets,
 				HardwareAddr: iface.HardwareAddr,
 			}
 		}
@@ -92,7 +94,7 @@ func IsLocalIp(ip netip.Addr) (bool, error) {
 		return false, err
 	}
 	for _, iface := range ifaces {
-		for _, addr := range iface.Addrs {
+		for _, addr := range iface.Addresses {
 			if addr.Contains(ip) {
 				return true, nil
 			}
@@ -120,7 +122,7 @@ func (iface *Interface) PickIPv6Addr(destination netip.Addr) (netip.Prefix, erro
 func (iface *Interface) pickIPAddr(destination netip.Addr, accept func(addr netip.Prefix) bool) (netip.Prefix, error) {
 	var fallback netip.Prefix
 
-	for _, addr := range iface.Addrs {
+	for _, addr := range iface.Addresses {
 		if !accept(addr) {
 			continue
 		}
diff --git a/clash-meta-android/core/src/foss/golang/clash/component/process/process_linux.go b/clash-meta-android/core/src/foss/golang/clash/component/process/process_linux.go
index 4667104cc2..45c89e5a5a 100644
--- a/clash-meta-android/core/src/foss/golang/clash/component/process/process_linux.go
+++ b/clash-meta-android/core/src/foss/golang/clash/component/process/process_linux.go
@@ -209,7 +209,6 @@ func findPackageName(uid uint32) string {
 	})
 
 	if sharedPackage, loaded := packageManager.SharedPackageByID(uid % 100000); loaded {
-		fmt.Println(loaded)
 		return sharedPackage
 	}
 	if packageName, loaded := packageManager.PackageByID(uid % 100000); loaded {
diff --git a/clash-meta-android/core/src/foss/golang/clash/config/config.go b/clash-meta-android/core/src/foss/golang/clash/config/config.go
index 74a2053e33..5676f7aae4 100644
--- a/clash-meta-android/core/src/foss/golang/clash/config/config.go
+++ b/clash-meta-android/core/src/foss/golang/clash/config/config.go
@@ -212,6 +212,7 @@ type RawDNS struct {
 	IPv6Timeout           uint                                `yaml:"ipv6-timeout" json:"ipv6-timeout"`
 	UseHosts              bool                                `yaml:"use-hosts" json:"use-hosts"`
 	UseSystemHosts        bool                                `yaml:"use-system-hosts" json:"use-system-hosts"`
+	RespectRules          bool                                `yaml:"respect-rules" json:"respect-rules"`
 	NameServer            []string                            `yaml:"nameserver" json:"nameserver"`
 	Fallback              []string                            `yaml:"fallback" json:"fallback"`
 	FallbackFilter        RawFallbackFilter                   `yaml:"fallback-filter" json:"fallback-filter"`
@@ -245,31 +246,39 @@ type RawTun struct {
 	DNSHijack           []string   `yaml:"dns-hijack" json:"dns-hijack"`
 	AutoRoute           bool       `yaml:"auto-route" json:"auto-route"`
 	AutoDetectInterface bool       `yaml:"auto-detect-interface"`
-	RedirectToTun       []string   `yaml:"-" json:"-"`
 
 	MTU        uint32 `yaml:"mtu" json:"mtu,omitempty"`
 	GSO        bool   `yaml:"gso" json:"gso,omitempty"`
 	GSOMaxSize uint32 `yaml:"gso-max-size" json:"gso-max-size,omitempty"`
 	//Inet4Address           []netip.Prefix `yaml:"inet4-address" json:"inet4_address,omitempty"`
-	Inet6Address             []netip.Prefix `yaml:"inet6-address" json:"inet6_address,omitempty"`
-	StrictRoute              bool           `yaml:"strict-route" json:"strict_route,omitempty"`
+	Inet6Address           []netip.Prefix `yaml:"inet6-address" json:"inet6_address,omitempty"`
+	IPRoute2TableIndex     int            `yaml:"iproute2-table-index" json:"iproute2_table_index,omitempty"`
+	IPRoute2RuleIndex      int            `yaml:"iproute2-rule-index" json:"iproute2_rule_index,omitempty"`
+	AutoRedirect           bool           `yaml:"auto-redirect" json:"auto_redirect,omitempty"`
+	AutoRedirectInputMark  uint32         `yaml:"auto-redirect-input-mark" json:"auto_redirect_input_mark,omitempty"`
+	AutoRedirectOutputMark uint32         `yaml:"auto-redirect-output-mark" json:"auto_redirect_output_mark,omitempty"`
+	StrictRoute            bool           `yaml:"strict-route" json:"strict_route,omitempty"`
+	RouteAddress           []netip.Prefix `yaml:"route-address" json:"route_address,omitempty"`
+	RouteAddressSet        []string       `yaml:"route-address-set" json:"route_address_set,omitempty"`
+	RouteExcludeAddress    []netip.Prefix `yaml:"route-exclude-address" json:"route_exclude_address,omitempty"`
+	RouteExcludeAddressSet []string       `yaml:"route-exclude-address-set" json:"route_exclude_address_set,omitempty"`
+	IncludeInterface       []string       `yaml:"include-interface" json:"include-interface,omitempty"`
+	ExcludeInterface       []string       `yaml:"exclude-interface" json:"exclude-interface,omitempty"`
+	IncludeUID             []uint32       `yaml:"include-uid" json:"include_uid,omitempty"`
+	IncludeUIDRange        []string       `yaml:"include-uid-range" json:"include_uid_range,omitempty"`
+	ExcludeUID             []uint32       `yaml:"exclude-uid" json:"exclude_uid,omitempty"`
+	ExcludeUIDRange        []string       `yaml:"exclude-uid-range" json:"exclude_uid_range,omitempty"`
+	IncludeAndroidUser     []int          `yaml:"include-android-user" json:"include_android_user,omitempty"`
+	IncludePackage         []string       `yaml:"include-package" json:"include_package,omitempty"`
+	ExcludePackage         []string       `yaml:"exclude-package" json:"exclude_package,omitempty"`
+	EndpointIndependentNat bool           `yaml:"endpoint-independent-nat" json:"endpoint_independent_nat,omitempty"`
+	UDPTimeout             int64          `yaml:"udp-timeout" json:"udp_timeout,omitempty"`
+	FileDescriptor         int            `yaml:"file-descriptor" json:"file-descriptor"`
+
 	Inet4RouteAddress        []netip.Prefix `yaml:"inet4-route-address" json:"inet4_route_address,omitempty"`
 	Inet6RouteAddress        []netip.Prefix `yaml:"inet6-route-address" json:"inet6_route_address,omitempty"`
 	Inet4RouteExcludeAddress []netip.Prefix `yaml:"inet4-route-exclude-address" json:"inet4_route_exclude_address,omitempty"`
 	Inet6RouteExcludeAddress []netip.Prefix `yaml:"inet6-route-exclude-address" json:"inet6_route_exclude_address,omitempty"`
-	IncludeInterface         []string       `yaml:"include-interface" json:"include-interface,omitempty"`
-	ExcludeInterface         []string       `yaml:"exclude-interface" json:"exclude-interface,omitempty"`
-	IncludeUID               []uint32       `yaml:"include-uid" json:"include_uid,omitempty"`
-	IncludeUIDRange          []string       `yaml:"include-uid-range" json:"include_uid_range,omitempty"`
-	ExcludeUID               []uint32       `yaml:"exclude-uid" json:"exclude_uid,omitempty"`
-	ExcludeUIDRange          []string       `yaml:"exclude-uid-range" json:"exclude_uid_range,omitempty"`
-	IncludeAndroidUser       []int          `yaml:"include-android-user" json:"include_android_user,omitempty"`
-	IncludePackage           []string       `yaml:"include-package" json:"include_package,omitempty"`
-	ExcludePackage           []string       `yaml:"exclude-package" json:"exclude_package,omitempty"`
-	EndpointIndependentNat   bool           `yaml:"endpoint-independent-nat" json:"endpoint_independent_nat,omitempty"`
-	UDPTimeout               int64          `yaml:"udp-timeout" json:"udp_timeout,omitempty"`
-	FileDescriptor           int            `yaml:"file-descriptor" json:"file-descriptor"`
-	TableIndex               int            `yaml:"table-index" json:"table-index"`
 }
 
 type RawTuicServer struct {
@@ -563,13 +572,13 @@ func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
 	}
 	config.RuleProviders = ruleProviders
 
-	subRules, err := parseSubRules(rawCfg, proxies)
+	subRules, err := parseSubRules(rawCfg, proxies, ruleProviders)
 	if err != nil {
 		return nil, err
 	}
 	config.SubRules = subRules
 
-	rules, err := parseRules(rawCfg.Rule, proxies, subRules, "rules")
+	rules, err := parseRules(rawCfg.Rule, proxies, ruleProviders, subRules, "rules")
 	if err != nil {
 		return nil, err
 	}
@@ -665,7 +674,6 @@ func parseGeneral(cfg *RawConfig) (*General, error) {
 		updater.ExternalUIURL = cfg.ExternalUIURL
 	}
 
-	cfg.Tun.RedirectToTun = cfg.EBpf.RedirectToTun
 	return &General{
 		Inbound: Inbound{
 			Port:              cfg.Port,
@@ -844,6 +852,7 @@ func parseListeners(cfg *RawConfig) (listeners map[string]C.InboundListener, err
 }
 
 func parseRuleProviders(cfg *RawConfig) (ruleProviders map[string]providerTypes.RuleProvider, err error) {
+	RP.SetTunnel(T.Tunnel)
 	ruleProviders = map[string]providerTypes.RuleProvider{}
 	// parse rule provider
 	for name, mapping := range cfg.RuleProvider {
@@ -853,12 +862,11 @@ func parseRuleProviders(cfg *RawConfig) (ruleProviders map[string]providerTypes.
 		}
 
 		ruleProviders[name] = rp
-		RP.SetRuleProvider(rp)
 	}
 	return
 }
 
-func parseSubRules(cfg *RawConfig, proxies map[string]C.Proxy) (subRules map[string][]C.Rule, err error) {
+func parseSubRules(cfg *RawConfig, proxies map[string]C.Proxy, ruleProviders map[string]providerTypes.RuleProvider) (subRules map[string][]C.Rule, err error) {
 	subRules = map[string][]C.Rule{}
 	for name := range cfg.SubRules {
 		subRules[name] = make([]C.Rule, 0)
@@ -868,7 +876,7 @@ func parseSubRules(cfg *RawConfig, proxies map[string]C.Proxy) (subRules map[str
 			return nil, fmt.Errorf("sub-rule name is empty")
 		}
 		var rules []C.Rule
-		rules, err = parseRules(rawRules, proxies, subRules, fmt.Sprintf("sub-rules[%s]", name))
+		rules, err = parseRules(rawRules, proxies, ruleProviders, subRules, fmt.Sprintf("sub-rules[%s]", name))
 		if err != nil {
 			return nil, err
 		}
@@ -921,7 +929,7 @@ func verifySubRuleCircularReferences(n string, subRules map[string][]C.Rule, arr
 	return nil
 }
 
-func parseRules(rulesConfig []string, proxies map[string]C.Proxy, subRules map[string][]C.Rule, format string) ([]C.Rule, error) {
+func parseRules(rulesConfig []string, proxies map[string]C.Proxy, ruleProviders map[string]providerTypes.RuleProvider, subRules map[string][]C.Rule, format string) ([]C.Rule, error) {
 	var rules []C.Rule
 
 	// parse rules
@@ -970,6 +978,12 @@ func parseRules(rulesConfig []string, proxies map[string]C.Proxy, subRules map[s
 			return nil, fmt.Errorf("%s[%d] [%s] error: %s", format, idx, line, parseErr.Error())
 		}
 
+		for _, name := range parsed.ProviderNames() {
+			if _, ok := ruleProviders[name]; !ok {
+				return nil, fmt.Errorf("%s[%d] [%s] error: rule set [%s] not found", format, idx, line, name)
+			}
+		}
+
 		rules = append(rules, parsed)
 	}
 
@@ -1039,10 +1053,20 @@ func hostWithDefaultPort(host string, defPort string) (string, error) {
 	return net.JoinHostPort(hostname, port), nil
 }
 
-func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error) {
+func parseNameServer(servers []string, respectRules bool, preferH3 bool) ([]dns.NameServer, error) {
 	var nameservers []dns.NameServer
 
 	for idx, server := range servers {
+		if strings.HasPrefix(server, "dhcp://") {
+			nameservers = append(
+				nameservers,
+				dns.NameServer{
+					Net:  "dhcp",
+					Addr: server[len("dhcp://"):],
+				},
+			)
+			continue
+		}
 		server = parsePureDNSServer(server)
 		u, err := url.Parse(server)
 		if err != nil {
@@ -1085,9 +1109,6 @@ func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error)
 					}
 				}
 			}
-		case "dhcp":
-			addr = u.Host
-			dnsNetType = "dhcp" // UDP from DHCP
 		case "quic":
 			addr, err = hostWithDefaultPort(u.Host, "853")
 			dnsNetType = "quic" // DNS over QUIC
@@ -1114,6 +1135,10 @@ func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error)
 			return nil, fmt.Errorf("DNS NameServer[%d] format error: %s", idx, err.Error())
 		}
 
+		if respectRules && len(proxyName) == 0 {
+			proxyName = dns.RespectRules
+		}
+
 		nameservers = append(
 			nameservers,
 			dns.NameServer{
@@ -1130,7 +1155,7 @@ func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error)
 
 func init() {
 	dns.ParseNameServer = func(servers []string) ([]dns.NameServer, error) { // using by wireguard
-		return parseNameServer(servers, false)
+		return parseNameServer(servers, false, false)
 	}
 }
 
@@ -1156,7 +1181,8 @@ func parsePureDNSServer(server string) string {
 		}
 	}
 }
-func parseNameServerPolicy(nsPolicy *orderedmap.OrderedMap[string, any], ruleProviders map[string]providerTypes.RuleProvider, preferH3 bool) (*orderedmap.OrderedMap[string, []dns.NameServer], error) {
+
+func parseNameServerPolicy(nsPolicy *orderedmap.OrderedMap[string, any], ruleProviders map[string]providerTypes.RuleProvider, respectRules bool, preferH3 bool) (*orderedmap.OrderedMap[string, []dns.NameServer], error) {
 	policy := orderedmap.New[string, []dns.NameServer]()
 	updatedPolicy := orderedmap.New[string, any]()
 	re := regexp.MustCompile(`[a-zA-Z0-9\-]+\.[a-zA-Z]{2,}(\.[a-zA-Z]{2,})?`)
@@ -1202,7 +1228,7 @@ func parseNameServerPolicy(nsPolicy *orderedmap.OrderedMap[string, any], rulePro
 		if err != nil {
 			return nil, err
 		}
-		nameservers, err := parseNameServer(servers, preferH3)
+		nameservers, err := parseNameServer(servers, respectRules, preferH3)
 		if err != nil {
 			return nil, err
 		}
@@ -1296,6 +1322,10 @@ func parseDNS(rawCfg *RawConfig, hosts *trie.DomainTrie[resolver.HostValue], rul
 		return nil, fmt.Errorf("if DNS configuration is turned on, NameServer cannot be empty")
 	}
 
+	if cfg.RespectRules && len(cfg.ProxyServerNameserver) == 0 {
+		return nil, fmt.Errorf("if “respect-rules” is turned on, “proxy-server-nameserver” cannot be empty")
+	}
+
 	dnsCfg := &DNS{
 		Enable:         cfg.Enable,
 		Listen:         cfg.Listen,
@@ -1310,26 +1340,26 @@ func parseDNS(rawCfg *RawConfig, hosts *trie.DomainTrie[resolver.HostValue], rul
 		},
 	}
 	var err error
-	if dnsCfg.NameServer, err = parseNameServer(cfg.NameServer, cfg.PreferH3); err != nil {
+	if dnsCfg.NameServer, err = parseNameServer(cfg.NameServer, cfg.RespectRules, cfg.PreferH3); err != nil {
 		return nil, err
 	}
 
-	if dnsCfg.Fallback, err = parseNameServer(cfg.Fallback, cfg.PreferH3); err != nil {
+	if dnsCfg.Fallback, err = parseNameServer(cfg.Fallback, cfg.RespectRules, cfg.PreferH3); err != nil {
 		return nil, err
 	}
 
-	if dnsCfg.NameServerPolicy, err = parseNameServerPolicy(cfg.NameServerPolicy, ruleProviders, cfg.PreferH3); err != nil {
+	if dnsCfg.NameServerPolicy, err = parseNameServerPolicy(cfg.NameServerPolicy, ruleProviders, cfg.RespectRules, cfg.PreferH3); err != nil {
 		return nil, err
 	}
 
-	if dnsCfg.ProxyServerNameserver, err = parseNameServer(cfg.ProxyServerNameserver, cfg.PreferH3); err != nil {
+	if dnsCfg.ProxyServerNameserver, err = parseNameServer(cfg.ProxyServerNameserver, false, cfg.PreferH3); err != nil {
 		return nil, err
 	}
 
 	if len(cfg.DefaultNameserver) == 0 {
 		return nil, errors.New("default nameserver should have at least one nameserver")
 	}
-	if dnsCfg.DefaultNameserver, err = parseNameServer(cfg.DefaultNameserver, cfg.PreferH3); err != nil {
+	if dnsCfg.DefaultNameserver, err = parseNameServer(cfg.DefaultNameserver, false, cfg.PreferH3); err != nil {
 		return nil, err
 	}
 	// check default nameserver is pure ip addr
@@ -1446,31 +1476,39 @@ func parseTun(rawTun RawTun, general *General) error {
 		DNSHijack:           rawTun.DNSHijack,
 		AutoRoute:           rawTun.AutoRoute,
 		AutoDetectInterface: rawTun.AutoDetectInterface,
-		RedirectToTun:       rawTun.RedirectToTun,
 
-		MTU:                      rawTun.MTU,
-		GSO:                      rawTun.GSO,
-		GSOMaxSize:               rawTun.GSOMaxSize,
-		Inet4Address:             []netip.Prefix{tunAddressPrefix},
-		Inet6Address:             rawTun.Inet6Address,
-		StrictRoute:              rawTun.StrictRoute,
+		MTU:                    rawTun.MTU,
+		GSO:                    rawTun.GSO,
+		GSOMaxSize:             rawTun.GSOMaxSize,
+		Inet4Address:           []netip.Prefix{tunAddressPrefix},
+		Inet6Address:           rawTun.Inet6Address,
+		IPRoute2TableIndex:     rawTun.IPRoute2TableIndex,
+		IPRoute2RuleIndex:      rawTun.IPRoute2RuleIndex,
+		AutoRedirect:           rawTun.AutoRedirect,
+		AutoRedirectInputMark:  rawTun.AutoRedirectInputMark,
+		AutoRedirectOutputMark: rawTun.AutoRedirectOutputMark,
+		StrictRoute:            rawTun.StrictRoute,
+		RouteAddress:           rawTun.RouteAddress,
+		RouteAddressSet:        rawTun.RouteAddressSet,
+		RouteExcludeAddress:    rawTun.RouteExcludeAddress,
+		RouteExcludeAddressSet: rawTun.RouteExcludeAddressSet,
+		IncludeInterface:       rawTun.IncludeInterface,
+		ExcludeInterface:       rawTun.ExcludeInterface,
+		IncludeUID:             rawTun.IncludeUID,
+		IncludeUIDRange:        rawTun.IncludeUIDRange,
+		ExcludeUID:             rawTun.ExcludeUID,
+		ExcludeUIDRange:        rawTun.ExcludeUIDRange,
+		IncludeAndroidUser:     rawTun.IncludeAndroidUser,
+		IncludePackage:         rawTun.IncludePackage,
+		ExcludePackage:         rawTun.ExcludePackage,
+		EndpointIndependentNat: rawTun.EndpointIndependentNat,
+		UDPTimeout:             rawTun.UDPTimeout,
+		FileDescriptor:         rawTun.FileDescriptor,
+
 		Inet4RouteAddress:        rawTun.Inet4RouteAddress,
 		Inet6RouteAddress:        rawTun.Inet6RouteAddress,
 		Inet4RouteExcludeAddress: rawTun.Inet4RouteExcludeAddress,
 		Inet6RouteExcludeAddress: rawTun.Inet6RouteExcludeAddress,
-		IncludeInterface:         rawTun.IncludeInterface,
-		ExcludeInterface:         rawTun.ExcludeInterface,
-		IncludeUID:               rawTun.IncludeUID,
-		IncludeUIDRange:          rawTun.IncludeUIDRange,
-		ExcludeUID:               rawTun.ExcludeUID,
-		ExcludeUIDRange:          rawTun.ExcludeUIDRange,
-		IncludeAndroidUser:       rawTun.IncludeAndroidUser,
-		IncludePackage:           rawTun.IncludePackage,
-		ExcludePackage:           rawTun.ExcludePackage,
-		EndpointIndependentNat:   rawTun.EndpointIndependentNat,
-		UDPTimeout:               rawTun.UDPTimeout,
-		FileDescriptor:           rawTun.FileDescriptor,
-		TableIndex:               rawTun.TableIndex,
 	}
 
 	return nil
diff --git a/clash-meta-android/core/src/foss/golang/clash/constant/provider/interface.go b/clash-meta-android/core/src/foss/golang/clash/constant/provider/interface.go
index bb73d1bce2..f7dfc9cc60 100644
--- a/clash-meta-android/core/src/foss/golang/clash/constant/provider/interface.go
+++ b/clash-meta-android/core/src/foss/golang/clash/constant/provider/interface.go
@@ -84,7 +84,7 @@ type RuleProvider interface {
 	Match(*constant.Metadata) bool
 	ShouldResolveIP() bool
 	ShouldFindProcess() bool
-	AsRule(adaptor string) constant.Rule
+	Strategy() any
 }
 
 // Rule Behavior
@@ -127,3 +127,9 @@ func (rf RuleFormat) String() string {
 		return "Unknown"
 	}
 }
+
+type Tunnel interface {
+	Providers() map[string]ProxyProvider
+	RuleProviders() map[string]RuleProvider
+	RuleUpdateCallback() *utils.Callback[RuleProvider]
+}
diff --git a/clash-meta-android/core/src/foss/golang/clash/constant/rule.go b/clash-meta-android/core/src/foss/golang/clash/constant/rule.go
index 161c200a60..a91ee6cb07 100644
--- a/clash-meta-android/core/src/foss/golang/clash/constant/rule.go
+++ b/clash-meta-android/core/src/foss/golang/clash/constant/rule.go
@@ -116,4 +116,5 @@ type Rule interface {
 	Payload() string
 	ShouldResolveIP() bool
 	ShouldFindProcess() bool
+	ProviderNames() []string
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/client.go b/clash-meta-android/core/src/foss/golang/clash/dns/client.go
index a6f0a7d492..096b96a7f5 100644
--- a/clash-meta-android/core/src/foss/golang/clash/dns/client.go
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/client.go
@@ -5,28 +5,20 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net"
-	"net/netip"
 	"strings"
 
 	"github.com/metacubex/mihomo/component/ca"
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/resolver"
-	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 
-	"github.com/metacubex/randv2"
 	D "github.com/miekg/dns"
 )
 
 type client struct {
 	*D.Client
-	r            *Resolver
-	port         string
-	host         string
-	iface        string
-	proxyAdapter C.ProxyAdapter
-	proxyName    string
-	addr         string
+	port   string
+	host   string
+	dialer *dnsDialer
+	addr   string
 }
 
 var _ dnsClient = (*client)(nil)
@@ -49,38 +41,13 @@ func (c *client) Address() string {
 }
 
 func (c *client) ExchangeContext(ctx context.Context, m *D.Msg) (*D.Msg, error) {
-	var (
-		ip  netip.Addr
-		err error
-	)
-	if c.r == nil {
-		// a default ip dns
-		if ip, err = netip.ParseAddr(c.host); err != nil {
-			return nil, fmt.Errorf("dns %s not a valid ip", c.host)
-		}
-	} else {
-		ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
-		if err != nil {
-			return nil, fmt.Errorf("use default dns resolve failed: %w", err)
-		} else if len(ips) == 0 {
-			return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, c.host)
-		}
-		ip = ips[randv2.IntN(len(ips))]
-	}
-
 	network := "udp"
 	if strings.HasPrefix(c.Client.Net, "tcp") {
 		network = "tcp"
 	}
 
-	var options []dialer.Option
-	if c.iface != "" {
-		options = append(options, dialer.WithInterface(c.iface))
-	}
-
-	dialHandler := getDialHandler(c.r, c.proxyAdapter, c.proxyName, options...)
-	addr := net.JoinHostPort(ip.String(), c.port)
-	conn, err := dialHandler(ctx, network, addr)
+	addr := net.JoinHostPort(c.host, c.port)
+	conn, err := c.dialer.DialContext(ctx, network, addr)
 	if err != nil {
 		return nil, err
 	}
@@ -115,7 +82,7 @@ func (c *client) ExchangeContext(ctx context.Context, m *D.Msg) (*D.Msg, error)
 			tcpClient.Net = "tcp"
 			network = "tcp"
 			log.Debugln("[DNS] Truncated reply from %s:%s for %s over UDP, retrying over TCP", c.host, c.port, m.Question[0].String())
-			dConn.Conn, err = dialHandler(ctx, network, addr)
+			dConn.Conn, err = c.dialer.DialContext(ctx, network, addr)
 			if err != nil {
 				ch <- result{msg, err}
 				return
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/dialer.go b/clash-meta-android/core/src/foss/golang/clash/dns/dialer.go
new file mode 100644
index 0000000000..f4d9e128f8
--- /dev/null
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/dialer.go
@@ -0,0 +1,11 @@
+package dns
+
+// export functions from tunnel module
+
+import "github.com/metacubex/mihomo/tunnel"
+
+const RespectRules = tunnel.DnsRespectRules
+
+type dnsDialer = tunnel.DNSDialer
+
+var newDNSDialer = tunnel.NewDNSDialer
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/doh.go b/clash-meta-android/core/src/foss/golang/clash/dns/doh.go
index 09d311b585..54b8279657 100644
--- a/clash-meta-android/core/src/foss/golang/clash/dns/doh.go
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/doh.go
@@ -62,10 +62,8 @@ type dnsOverHTTPS struct {
 	quicConfig      *quic.Config
 	quicConfigGuard sync.Mutex
 	url             *url.URL
-	r               *Resolver
 	httpVersions    []C.HTTPVersion
-	proxyAdapter    C.ProxyAdapter
-	proxyName       string
+	dialer          *dnsDialer
 	addr            string
 }
 
@@ -85,11 +83,9 @@ func newDoHClient(urlString string, r *Resolver, preferH3 bool, params map[strin
 	}
 
 	doh := &dnsOverHTTPS{
-		url:          u,
-		addr:         u.String(),
-		r:            r,
-		proxyAdapter: proxyAdapter,
-		proxyName:    proxyName,
+		url:    u,
+		addr:   u.String(),
+		dialer: newDNSDialer(r, proxyAdapter, proxyName),
 		quicConfig: &quic.Config{
 			KeepAlivePeriod: QUICKeepAlivePeriod,
 			TokenStore:      newQUICTokenStore(),
@@ -388,13 +384,12 @@ func (doh *dnsOverHTTPS) createTransport(ctx context.Context) (t http.RoundTripp
 		nextProtos = append(nextProtos, string(v))
 	}
 	tlsConfig.NextProtos = nextProtos
-	dialContext := getDialHandler(doh.r, doh.proxyAdapter, doh.proxyName)
 
 	if slices.Contains(doh.httpVersions, C.HTTPVersion3) {
 		// First, we attempt to create an HTTP3 transport.  If the probe QUIC
 		// connection is established successfully, we'll be using HTTP3 for this
 		// upstream.
-		transportH3, err := doh.createTransportH3(ctx, tlsConfig, dialContext)
+		transportH3, err := doh.createTransportH3(ctx, tlsConfig)
 		if err == nil {
 			log.Debugln("[%s] using HTTP/3 for this upstream: QUIC was faster", doh.url.String())
 			return transportH3, nil
@@ -410,7 +405,7 @@ func (doh *dnsOverHTTPS) createTransport(ctx context.Context) (t http.RoundTripp
 	transport := &http.Transport{
 		TLSClientConfig:    tlsConfig,
 		DisableCompression: true,
-		DialContext:        dialContext,
+		DialContext:        doh.dialer.DialContext,
 		IdleConnTimeout:    transportDefaultIdleConnTimeout,
 		MaxConnsPerHost:    dohMaxConnsPerHost,
 		MaxIdleConns:       dohMaxIdleConns,
@@ -490,13 +485,12 @@ func (h *http3Transport) Close() (err error) {
 func (doh *dnsOverHTTPS) createTransportH3(
 	ctx context.Context,
 	tlsConfig *tls.Config,
-	dialContext dialHandler,
 ) (roundTripper http.RoundTripper, err error) {
 	if !doh.supportsH3() {
 		return nil, errors.New("HTTP3 support is not enabled")
 	}
 
-	addr, err := doh.probeH3(ctx, tlsConfig, dialContext)
+	addr, err := doh.probeH3(ctx, tlsConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -534,7 +528,7 @@ func (doh *dnsOverHTTPS) dialQuic(ctx context.Context, addr string, tlsCfg *tls.
 		IP:   net.ParseIP(ip),
 		Port: portInt,
 	}
-	conn, err := listenPacket(ctx, doh.proxyAdapter, doh.proxyName, "udp", addr, doh.r)
+	conn, err := doh.dialer.ListenPacket(ctx, "udp", addr)
 	if err != nil {
 		return nil, err
 	}
@@ -557,12 +551,11 @@ func (doh *dnsOverHTTPS) dialQuic(ctx context.Context, addr string, tlsCfg *tls.
 func (doh *dnsOverHTTPS) probeH3(
 	ctx context.Context,
 	tlsConfig *tls.Config,
-	dialContext dialHandler,
 ) (addr string, err error) {
 	// We're using bootstrapped address instead of what's passed to the function
 	// it does not create an actual connection, but it helps us determine
 	// what IP is actually reachable (when there are v4/v6 addresses).
-	rawConn, err := dialContext(ctx, "udp", doh.url.Host)
+	rawConn, err := doh.dialer.DialContext(ctx, "udp", doh.url.Host)
 	if err != nil {
 		return "", fmt.Errorf("failed to dial: %w", err)
 	}
@@ -592,7 +585,7 @@ func (doh *dnsOverHTTPS) probeH3(
 	chQuic := make(chan error, 1)
 	chTLS := make(chan error, 1)
 	go doh.probeQUIC(ctx, addr, probeTLSCfg, chQuic)
-	go doh.probeTLS(ctx, dialContext, probeTLSCfg, chTLS)
+	go doh.probeTLS(ctx, probeTLSCfg, chTLS)
 
 	select {
 	case quicErr := <-chQuic:
@@ -635,10 +628,10 @@ func (doh *dnsOverHTTPS) probeQUIC(ctx context.Context, addr string, tlsConfig *
 
 // probeTLS attempts to establish a TLS connection to the specified address. We
 // run probeQUIC and probeTLS in parallel and see which one is faster.
-func (doh *dnsOverHTTPS) probeTLS(ctx context.Context, dialContext dialHandler, tlsConfig *tls.Config, ch chan error) {
+func (doh *dnsOverHTTPS) probeTLS(ctx context.Context, tlsConfig *tls.Config, ch chan error) {
 	startTime := time.Now()
 
-	conn, err := doh.tlsDial(ctx, dialContext, "tcp", tlsConfig)
+	conn, err := doh.tlsDial(ctx, "tcp", tlsConfig)
 	if err != nil {
 		ch <- fmt.Errorf("opening TLS connection: %w", err)
 		return
@@ -694,10 +687,10 @@ func isHTTP3(client *http.Client) (ok bool) {
 
 // tlsDial is basically the same as tls.DialWithDialer, but we will call our own
 // dialContext function to get connection.
-func (doh *dnsOverHTTPS) tlsDial(ctx context.Context, dialContext dialHandler, network string, config *tls.Config) (*tls.Conn, error) {
+func (doh *dnsOverHTTPS) tlsDial(ctx context.Context, network string, config *tls.Config) (*tls.Conn, error) {
 	// We're using bootstrapped address instead of what's passed
 	// to the function.
-	rawConn, err := dialContext(ctx, network, doh.url.Host)
+	rawConn, err := doh.dialer.DialContext(ctx, network, doh.url.Host)
 	if err != nil {
 		return nil, err
 	}
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/doq.go b/clash-meta-android/core/src/foss/golang/clash/dns/doq.go
index 70b67c2a61..ad936f9575 100644
--- a/clash-meta-android/core/src/foss/golang/clash/dns/doq.go
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/doq.go
@@ -60,10 +60,8 @@ type dnsOverQUIC struct {
 	bytesPool      *sync.Pool
 	bytesPoolGuard sync.Mutex
 
-	addr         string
-	proxyAdapter C.ProxyAdapter
-	proxyName    string
-	r            *Resolver
+	addr   string
+	dialer *dnsDialer
 }
 
 // type check
@@ -72,10 +70,8 @@ var _ dnsClient = (*dnsOverQUIC)(nil)
 // newDoQ returns the DNS-over-QUIC Upstream.
 func newDoQ(resolver *Resolver, addr string, proxyAdapter C.ProxyAdapter, proxyName string) (dnsClient, error) {
 	doq := &dnsOverQUIC{
-		addr:         addr,
-		proxyAdapter: proxyAdapter,
-		proxyName:    proxyName,
-		r:            resolver,
+		addr:   addr,
+		dialer: newDNSDialer(resolver, proxyAdapter, proxyName),
 		quicConfig: &quic.Config{
 			KeepAlivePeriod: QUICKeepAlivePeriod,
 			TokenStore:      newQUICTokenStore(),
@@ -300,7 +296,7 @@ func (doq *dnsOverQUIC) openConnection(ctx context.Context) (conn quic.Connectio
 	// we're using bootstrapped address instead of what's passed to the function
 	// it does not create an actual connection, but it helps us determine
 	// what IP is actually reachable (when there're v4/v6 addresses).
-	rawConn, err := getDialHandler(doq.r, doq.proxyAdapter, doq.proxyName)(ctx, "udp", doq.addr)
+	rawConn, err := doq.dialer.DialContext(ctx, "udp", doq.addr)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open a QUIC connection: %w", err)
 	}
@@ -315,7 +311,7 @@ func (doq *dnsOverQUIC) openConnection(ctx context.Context) (conn quic.Connectio
 
 	p, err := strconv.Atoi(port)
 	udpAddr := net.UDPAddr{IP: net.ParseIP(ip), Port: p}
-	udp, err := listenPacket(ctx, doq.proxyAdapter, doq.proxyName, "udp", addr, doq.r)
+	udp, err := doq.dialer.ListenPacket(ctx, "udp", addr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/policy.go b/clash-meta-android/core/src/foss/golang/clash/dns/policy.go
index a58123e3dc..fc60401b01 100644
--- a/clash-meta-android/core/src/foss/golang/clash/dns/policy.go
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/policy.go
@@ -37,14 +37,17 @@ func (p geositePolicy) Match(domain string) []dnsClient {
 }
 
 type domainSetPolicy struct {
-	domainSetProvider provider.RuleProvider
-	dnsClients        []dnsClient
+	tunnel     provider.Tunnel
+	name       string
+	dnsClients []dnsClient
 }
 
 func (p domainSetPolicy) Match(domain string) []dnsClient {
-	metadata := &C.Metadata{Host: domain}
-	if ok := p.domainSetProvider.Match(metadata); ok {
-		return p.dnsClients
+	if ruleProvider, ok := p.tunnel.RuleProviders()[p.name]; ok {
+		metadata := &C.Metadata{Host: domain}
+		if ok := ruleProvider.Match(metadata); ok {
+			return p.dnsClients
+		}
 	}
 	return nil
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/resolver.go b/clash-meta-android/core/src/foss/golang/clash/dns/resolver.go
index 08de69adff..28ffec6f15 100644
--- a/clash-meta-android/core/src/foss/golang/clash/dns/resolver.go
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/resolver.go
@@ -414,7 +414,7 @@ type Config struct {
 	Pool           *fakeip.Pool
 	Hosts          *trie.DomainTrie[resolver.HostValue]
 	Policy         *orderedmap.OrderedMap[string, []NameServer]
-	RuleProviders  map[string]provider.RuleProvider
+	Tunnel         provider.Tunnel
 	CacheAlgorithm string
 }
 
@@ -502,11 +502,12 @@ func NewResolver(config Config) *Resolver {
 				key := temp[1]
 				switch prefix {
 				case "rule-set":
-					if p, ok := config.RuleProviders[key]; ok {
+					if _, ok := config.Tunnel.RuleProviders()[key]; ok {
 						log.Debugln("Adding rule-set policy: %s ", key)
 						insertPolicy(domainSetPolicy{
-							domainSetProvider: p,
-							dnsClients:        cacheTransform(nameserver),
+							tunnel:     config.Tunnel,
+							name:       key,
+							dnsClients: cacheTransform(nameserver),
 						})
 						continue
 					} else {
diff --git a/clash-meta-android/core/src/foss/golang/clash/dns/util.go b/clash-meta-android/core/src/foss/golang/clash/dns/util.go
index 516c63fb8d..e4ec5917cf 100644
--- a/clash-meta-android/core/src/foss/golang/clash/dns/util.go
+++ b/clash-meta-android/core/src/foss/golang/clash/dns/util.go
@@ -7,18 +7,14 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
-	"strconv"
 	"strings"
 	"time"
 
-	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/nnip"
 	"github.com/metacubex/mihomo/common/picker"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
-	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
-	"github.com/metacubex/mihomo/tunnel"
 
 	D "github.com/miekg/dns"
 	"github.com/samber/lo"
@@ -120,6 +116,11 @@ func transform(servers []NameServer, resolver *Resolver) []dnsClient {
 			continue
 		}
 
+		var options []dialer.Option
+		if s.Interface != "" {
+			options = append(options, dialer.WithInterface(s.Interface))
+		}
+
 		host, port, _ := net.SplitHostPort(s.Addr)
 		ret = append(ret, &client{
 			Client: &D.Client{
@@ -130,12 +131,9 @@ func transform(servers []NameServer, resolver *Resolver) []dnsClient {
 				UDPSize: 4096,
 				Timeout: 5 * time.Second,
 			},
-			port:         port,
-			host:         host,
-			iface:        s.Interface,
-			r:            resolver,
-			proxyAdapter: s.ProxyAdapter,
-			proxyName:    s.ProxyName,
+			port:   port,
+			host:   host,
+			dialer: newDNSDialer(resolver, s.ProxyAdapter, s.ProxyName, options...),
 		})
 	}
 	return ret
@@ -175,120 +173,6 @@ func msgToDomain(msg *D.Msg) string {
 	return ""
 }
 
-type dialHandler func(ctx context.Context, network, addr string) (net.Conn, error)
-
-func getDialHandler(r *Resolver, proxyAdapter C.ProxyAdapter, proxyName string, opts ...dialer.Option) dialHandler {
-	return func(ctx context.Context, network, addr string) (net.Conn, error) {
-		if len(proxyName) == 0 && proxyAdapter == nil {
-			opts = append(opts, dialer.WithResolver(r))
-			return dialer.DialContext(ctx, network, addr, opts...)
-		} else {
-			host, port, err := net.SplitHostPort(addr)
-			if err != nil {
-				return nil, err
-			}
-			uintPort, err := strconv.ParseUint(port, 10, 16)
-			if err != nil {
-				return nil, err
-			}
-			if proxyAdapter == nil {
-				var ok bool
-				proxyAdapter, ok = tunnel.Proxies()[proxyName]
-				if !ok {
-					opts = append(opts, dialer.WithInterface(proxyName))
-				}
-			}
-
-			if strings.Contains(network, "tcp") {
-				// tcp can resolve host by remote
-				metadata := &C.Metadata{
-					NetWork: C.TCP,
-					Host:    host,
-					DstPort: uint16(uintPort),
-				}
-				if proxyAdapter != nil {
-					if proxyAdapter.IsL3Protocol(metadata) { // L3 proxy should resolve domain before to avoid loopback
-						dstIP, err := resolver.ResolveIPWithResolver(ctx, host, r)
-						if err != nil {
-							return nil, err
-						}
-						metadata.Host = ""
-						metadata.DstIP = dstIP
-					}
-					return proxyAdapter.DialContext(ctx, metadata, opts...)
-				}
-				opts = append(opts, dialer.WithResolver(r))
-				return dialer.DialContext(ctx, network, addr, opts...)
-			} else {
-				// udp must resolve host first
-				dstIP, err := resolver.ResolveIPWithResolver(ctx, host, r)
-				if err != nil {
-					return nil, err
-				}
-				metadata := &C.Metadata{
-					NetWork: C.UDP,
-					Host:    "",
-					DstIP:   dstIP,
-					DstPort: uint16(uintPort),
-				}
-				if proxyAdapter == nil {
-					return dialer.DialContext(ctx, network, addr, opts...)
-				}
-
-				if !proxyAdapter.SupportUDP() {
-					return nil, fmt.Errorf("proxy adapter [%s] UDP is not supported", proxyAdapter)
-				}
-
-				packetConn, err := proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
-				if err != nil {
-					return nil, err
-				}
-
-				return N.NewBindPacketConn(packetConn, metadata.UDPAddr()), nil
-			}
-		}
-	}
-}
-
-func listenPacket(ctx context.Context, proxyAdapter C.ProxyAdapter, proxyName string, network string, addr string, r *Resolver, opts ...dialer.Option) (net.PacketConn, error) {
-	host, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-	uintPort, err := strconv.ParseUint(port, 10, 16)
-	if err != nil {
-		return nil, err
-	}
-	if proxyAdapter == nil {
-		var ok bool
-		proxyAdapter, ok = tunnel.Proxies()[proxyName]
-		if !ok {
-			opts = append(opts, dialer.WithInterface(proxyName))
-		}
-	}
-
-	// udp must resolve host first
-	dstIP, err := resolver.ResolveIPWithResolver(ctx, host, r)
-	if err != nil {
-		return nil, err
-	}
-	metadata := &C.Metadata{
-		NetWork: C.UDP,
-		Host:    "",
-		DstIP:   dstIP,
-		DstPort: uint16(uintPort),
-	}
-	if proxyAdapter == nil {
-		return dialer.NewDialer(opts...).ListenPacket(ctx, network, "", netip.AddrPortFrom(metadata.DstIP, metadata.DstPort))
-	}
-
-	if !proxyAdapter.SupportUDP() {
-		return nil, fmt.Errorf("proxy adapter [%s] UDP is not supported", proxyAdapter)
-	}
-
-	return proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
-}
-
 func batchExchange(ctx context.Context, clients []dnsClient, m *D.Msg) (msg *D.Msg, cache bool, err error) {
 	cache = true
 	fast, ctx := picker.WithTimeout[*D.Msg](ctx, resolver.DefaultDNSTimeout)
diff --git a/clash-meta-android/core/src/foss/golang/clash/docs/config.yaml b/clash-meta-android/core/src/foss/golang/clash/docs/config.yaml
index fe8501636e..9c51bc10b3 100644
--- a/clash-meta-android/core/src/foss/golang/clash/docs/config.yaml
+++ b/clash-meta-android/core/src/foss/golang/clash/docs/config.yaml
@@ -116,13 +116,25 @@ tun:
   # mtu: 9000 # 最大传输单元
   # gso: false # 启用通用分段卸载，仅支持 Linux
   # gso-max-size: 65536 # 通用分段卸载包的最大大小
+  auto-redirect: false # 自动配置 iptables 以重定向 TCP 连接。仅支持 Linux。带有 auto-redirect 的 auto-route 现在可以在路由器上按预期工作，无需干预。
   # strict-route: true # 将所有连接路由到 tun 来防止泄漏，但你的设备将无法其他设备被访问
-  inet4-route-address: # 启用 auto-route 时使用自定义路由而不是默认路由
+  route-address-set: # 将指定规则集中的目标 IP CIDR 规则添加到防火墙, 不匹配的流量将绕过路由, 仅支持 Linux，且需要 nftables，`auto-route` 和 `auto-redirect` 已启用。
+    - ruleset-1
+    - ruleset-2
+  route-exclude-address-set: # 将指定规则集中的目标 IP CIDR 规则添加到防火墙, 匹配的流量将绕过路由, 仅支持 Linux，且需要 nftables，`auto-route` 和 `auto-redirect` 已启用。
+    - ruleset-3
+    - ruleset-4
+  route-address: # 启用 auto-route 时使用自定义路由而不是默认路由
     - 0.0.0.0/1
     - 128.0.0.0/1
-  inet6-route-address: # 启用 auto-route 时使用自定义路由而不是默认路由
     - "::/1"
     - "8000::/1"
+  # inet4-route-address: # 启用 auto-route 时使用自定义路由而不是默认路由（旧写法）
+  #   - 0.0.0.0/1
+  #   - 128.0.0.0/1
+  # inet6-route-address: # 启用 auto-route 时使用自定义路由而不是默认路由（旧写法）
+  #   - "::/1"
+  #   - "8000::/1"
   # endpoint-independent-nat: false # 启用独立于端点的 NAT
   # include-interface: # 限制被路由的接口。默认不限制，与 `exclude-interface` 冲突
   #   - "lan0"
@@ -209,7 +221,7 @@ tunnels: # one line config
 dns:
   cache-algorithm: arc
   enable: false # 关闭将使用系统 DNS
-  prefer-h3: true # 开启 DoH 支持 HTTP/3，将并发尝试
+  prefer-h3: false # 是否开启 DoH 支持 HTTP/3，将并发尝试
   listen: 0.0.0.0:53 # 开启 DNS 服务器监听
   # ipv6: false # false 将返回 AAAA 的空结果
   # ipv6-timeout: 300 # 单位：ms，内部双栈并发时，向上游查询 AAAA 时，等待 AAAA 的时间，默认 100ms
@@ -227,6 +239,13 @@ dns:
 
   # use-hosts: true # 查询 hosts
 
+  # 配置后面的nameserver、fallback和nameserver-policy向dns服务器的连接过程是否遵守遵守rules规则
+  # 如果为false（默认值）则这三部分的dns服务器在未特别指定的情况下会直连
+  # 如果为true，将会按照rules的规则匹配链接方式（走代理或直连），如果有特别指定则任然以指定值为准
+  # 仅当proxy-server-nameserver非空时可以开启此选项, 强烈不建议和prefer-h3一起使用
+  # 此外，这三者配置中的dns服务器如果出现域名会采用default-nameserver配置项解析，也请确保正确配置default-nameserver
+  respect-rules: false
+
   # 配置不使用 fake-ip 的域名
   # fake-ip-filter:
   #   - '*.lan'
@@ -244,6 +263,7 @@ dns:
     - https://mozilla.cloudflare-dns.com/dns-query#DNS&h3=true # 指定策略组和使用 HTTP/3
     - dhcp://en0 # dns from dhcp
     - quic://dns.adguard.com:784 # DNS over QUIC
+    # - '8.8.8.8#RULES' # 效果同respect-rules，但仅对该服务器生效
     # - '8.8.8.8#en0' # 兼容指定 DNS 出口网卡
 
   # 当配置 fallback 时，会查询 nameserver 中返回的 IP 是否为 CN，非必要配置
@@ -720,6 +740,7 @@ proxies: # socks5
     # dialer-proxy: "ss1"
     # remote-dns-resolve: true # 强制 dns 远程解析，默认值为 false
     # dns: [ 1.1.1.1, 8.8.8.8 ] # 仅在 remote-dns-resolve 为 true 时生效
+    # refresh-server-ip-interval: 60 # 重新解析server ip的间隔，单位为秒，默认值为0即仅第一次链接时解析server域名，仅应在server域名对应的IP会发生变化时启用该选项（如家宽ddns）
     # 如果 peers 不为空，该段落中的 allowed-ips 不可为空；前面段落的 server,port,public-key,pre-shared-key 均会被忽略，但 private-key 会被保留且只能在顶层指定
     # peers:
     #   - server: 162.159.192.1
diff --git a/clash-meta-android/core/src/foss/golang/clash/go.mod b/clash-meta-android/core/src/foss/golang/clash/go.mod
index a6664b5909..4a96d14208 100644
--- a/clash-meta-android/core/src/foss/golang/clash/go.mod
+++ b/clash-meta-android/core/src/foss/golang/clash/go.mod
@@ -9,50 +9,50 @@ require (
 	github.com/cilium/ebpf v0.12.3
 	github.com/coreos/go-iptables v0.7.0
 	github.com/dlclark/regexp2 v1.11.0
-	github.com/go-chi/chi/v5 v5.0.12
+	github.com/go-chi/chi/v5 v5.0.14
 	github.com/go-chi/cors v1.2.1
 	github.com/go-chi/render v1.0.3
 	github.com/gobwas/ws v1.4.0
 	github.com/gofrs/uuid/v5 v5.2.0
-	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49
-	github.com/klauspost/cpuid/v2 v2.2.7
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6
+	github.com/klauspost/cpuid/v2 v2.2.8
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40
 	github.com/mdlayher/netlink v1.7.2
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759
-	github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e
 	github.com/metacubex/randv2 v0.2.0
 	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72
 	github.com/metacubex/sing-shadowsocks v0.2.6
 	github.com/metacubex/sing-shadowsocks2 v0.2.0
-	github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414
+	github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e
 	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f
-	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66
 	github.com/metacubex/utls v1.6.6
-	github.com/miekg/dns v1.1.59
+	github.com/miekg/dns v1.1.61
 	github.com/mroth/weightedrand/v2 v2.1.0
 	github.com/openacid/low v0.1.21
 	github.com/oschwald/maxminddb-golang v1.12.0
-	github.com/puzpuzpuz/xsync/v3 v3.1.0
+	github.com/puzpuzpuz/xsync/v3 v3.2.0
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a
-	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97
-	github.com/sagernet/sing v0.3.8
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a
+	github.com/sagernet/sing v0.5.0-alpha.10
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6
 	github.com/sagernet/sing-shadowtls v0.1.4
 	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e
 	github.com/samber/lo v1.39.0
-	github.com/shirou/gopsutil/v3 v3.24.4
+	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	github.com/wk8/go-ordered-map/v2 v2.1.8
 	go.uber.org/automaxprocs v1.5.3
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
-	golang.org/x/crypto v0.23.0
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
-	golang.org/x/net v0.25.0
+	golang.org/x/crypto v0.24.0
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
+	golang.org/x/net v0.26.0
 	golang.org/x/sync v0.7.0
-	golang.org/x/sys v0.20.0
-	google.golang.org/protobuf v1.34.1
+	golang.org/x/sys v0.21.0
+	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
 	lukechampine.com/blake3 v1.3.0
 )
@@ -92,6 +92,7 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
@@ -100,14 +101,14 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
 )
 
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1
+replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2
diff --git a/clash-meta-android/core/src/foss/golang/clash/go.sum b/clash-meta-android/core/src/foss/golang/clash/go.sum
index c75275bce0..29a5d385de 100644
--- a/clash-meta-android/core/src/foss/golang/clash/go.sum
+++ b/clash-meta-android/core/src/foss/golang/clash/go.sum
@@ -44,8 +44,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
-github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
+github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
@@ -69,7 +69,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -78,16 +77,16 @@ github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -104,30 +103,30 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22 h1:dKYoWnrB5bbCMoMQit4INUDKiDcjc0Azsm3GltYf9Pw=
-github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1 h1:7hDHLTmjgtRoAp59STwPQpe5Pinwi4cWex+FB3Ohvco=
-github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2 h1:N5tidgg/FRmkgPw/AjRwhLUinKDx/ODCSbvv9xqRoLM=
+github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
 github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
 github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
 github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414 h1:IPxTZgQV6fVUBS8tozLMSFPHV3imYc/NbuGfp0bLQq0=
-github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e h1:o+zohxPRo45P35fS9u1zfdBgr+L/7S0ObGU6YjbVBIc=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -150,8 +149,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
+github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -159,8 +158,10 @@ github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
@@ -171,12 +172,11 @@ github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2F
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
 github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
@@ -206,8 +206,8 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -222,18 +222,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -252,23 +252,21 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/clash-meta-android/core/src/foss/golang/clash/hub/executor/executor.go b/clash-meta-android/core/src/foss/golang/clash/hub/executor/executor.go
index 56e716326b..55c40b6d90 100644
--- a/clash-meta-android/core/src/foss/golang/clash/hub/executor/executor.go
+++ b/clash-meta-android/core/src/foss/golang/clash/hub/executor/executor.go
@@ -97,7 +97,7 @@ func ApplyConfig(cfg *config.Config, force bool) {
 	updateHosts(cfg.Hosts)
 	updateGeneral(cfg.General)
 	updateNTP(cfg.NTP)
-	updateDNS(cfg.DNS, cfg.RuleProviders, cfg.General.IPv6)
+	updateDNS(cfg.DNS, cfg.General.IPv6)
 	updateListeners(cfg.General, cfg.Listeners, force)
 	updateIPTables(cfg)
 	updateTun(cfg.General)
@@ -211,7 +211,7 @@ func updateNTP(c *config.NTP) {
 	}
 }
 
-func updateDNS(c *config.DNS, ruleProvider map[string]provider.RuleProvider, generalIPv6 bool) {
+func updateDNS(c *config.DNS, generalIPv6 bool) {
 	if !c.Enable {
 		resolver.DefaultResolver = nil
 		resolver.DefaultHostMapper = nil
@@ -237,7 +237,7 @@ func updateDNS(c *config.DNS, ruleProvider map[string]provider.RuleProvider, gen
 		Default:        c.DefaultNameserver,
 		Policy:         c.NameServerPolicy,
 		ProxyServer:    c.ProxyServerNameserver,
-		RuleProviders:  ruleProvider,
+		Tunnel:         tunnel.Tunnel,
 		CacheAlgorithm: c.CacheAlgorithm,
 	}
 
@@ -355,7 +355,7 @@ func updateTun(general *config.General) {
 		return
 	}
 	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
-	listener.ReCreateRedirToTun(general.Tun.RedirectToTun)
+	listener.ReCreateRedirToTun(general.EBpf.RedirectToTun)
 }
 
 func updateSniffer(sniffer *config.Sniffer) {
@@ -507,9 +507,7 @@ func updateIPTables(cfg *config.Config) {
 		inboundInterface = iptables.InboundInterface
 	}
 
-	if dialer.DefaultRoutingMark.Load() == 0 {
-		dialer.DefaultRoutingMark.Store(2158)
-	}
+	dialer.DefaultRoutingMark.CompareAndSwap(0, 2158)
 
 	err = tproxy.SetTProxyIPTables(inboundInterface, bypass, uint16(tProxyPort), DnsRedirect, dnsPort.Port())
 	if err != nil {
diff --git a/clash-meta-android/core/src/foss/golang/clash/hub/route/configs.go b/clash-meta-android/core/src/foss/golang/clash/hub/route/configs.go
index f2cf298ad3..17d858d47f 100644
--- a/clash-meta-android/core/src/foss/golang/clash/hub/route/configs.go
+++ b/clash-meta-android/core/src/foss/golang/clash/hub/route/configs.go
@@ -68,25 +68,34 @@ type tunSchema struct {
 	GSO        *bool   `yaml:"gso" json:"gso,omitempty"`
 	GSOMaxSize *uint32 `yaml:"gso-max-size" json:"gso-max-size,omitempty"`
 	//Inet4Address           *[]netip.Prefix `yaml:"inet4-address" json:"inet4-address,omitempty"`
-	Inet6Address             *[]netip.Prefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
-	StrictRoute              *bool           `yaml:"strict-route" json:"strict-route,omitempty"`
+	Inet6Address           *[]netip.Prefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
+	IPRoute2TableIndex     *int            `yaml:"iproute2-table-index" json:"iproute2_table_index,omitempty"`
+	IPRoute2RuleIndex      *int            `yaml:"iproute2-rule-index" json:"iproute2_rule_index,omitempty"`
+	AutoRedirect           *bool           `yaml:"auto-redirect" json:"auto_redirect,omitempty"`
+	AutoRedirectInputMark  *uint32         `yaml:"auto-redirect-input-mark" json:"auto_redirect_input_mark,omitempty"`
+	AutoRedirectOutputMark *uint32         `yaml:"auto-redirect-output-mark" json:"auto_redirect_output_mark,omitempty"`
+	StrictRoute            *bool           `yaml:"strict-route" json:"strict-route,omitempty"`
+	RouteAddress           *[]netip.Prefix `yaml:"route-address" json:"route_address,omitempty"`
+	RouteAddressSet        *[]string       `yaml:"route-address-set" json:"route_address_set,omitempty"`
+	RouteExcludeAddress    *[]netip.Prefix `yaml:"route-exclude-address" json:"route_exclude_address,omitempty"`
+	RouteExcludeAddressSet *[]string       `yaml:"route-exclude-address-set" json:"route_exclude_address_set,omitempty"`
+	IncludeInterface       *[]string       `yaml:"include-interface" json:"include-interface,omitempty"`
+	ExcludeInterface       *[]string       `yaml:"exclude-interface" json:"exclude-interface,omitempty"`
+	IncludeUID             *[]uint32       `yaml:"include-uid" json:"include-uid,omitempty"`
+	IncludeUIDRange        *[]string       `yaml:"include-uid-range" json:"include-uid-range,omitempty"`
+	ExcludeUID             *[]uint32       `yaml:"exclude-uid" json:"exclude-uid,omitempty"`
+	ExcludeUIDRange        *[]string       `yaml:"exclude-uid-range" json:"exclude-uid-range,omitempty"`
+	IncludeAndroidUser     *[]int          `yaml:"include-android-user" json:"include-android-user,omitempty"`
+	IncludePackage         *[]string       `yaml:"include-package" json:"include-package,omitempty"`
+	ExcludePackage         *[]string       `yaml:"exclude-package" json:"exclude-package,omitempty"`
+	EndpointIndependentNat *bool           `yaml:"endpoint-independent-nat" json:"endpoint-independent-nat,omitempty"`
+	UDPTimeout             *int64          `yaml:"udp-timeout" json:"udp-timeout,omitempty"`
+	FileDescriptor         *int            `yaml:"file-descriptor" json:"file-descriptor"`
+
 	Inet4RouteAddress        *[]netip.Prefix `yaml:"inet4-route-address" json:"inet4-route-address,omitempty"`
 	Inet6RouteAddress        *[]netip.Prefix `yaml:"inet6-route-address" json:"inet6-route-address,omitempty"`
 	Inet4RouteExcludeAddress *[]netip.Prefix `yaml:"inet4-route-exclude-address" json:"inet4-route-exclude-address,omitempty"`
 	Inet6RouteExcludeAddress *[]netip.Prefix `yaml:"inet6-route-exclude-address" json:"inet6-route-exclude-address,omitempty"`
-	IncludeInterface         *[]string       `yaml:"include-interface" json:"include-interface,omitempty"`
-	ExcludeInterface         *[]string       `yaml:"exclude-interface" json:"exclude-interface,omitempty"`
-	IncludeUID               *[]uint32       `yaml:"include-uid" json:"include-uid,omitempty"`
-	IncludeUIDRange          *[]string       `yaml:"include-uid-range" json:"include-uid-range,omitempty"`
-	ExcludeUID               *[]uint32       `yaml:"exclude-uid" json:"exclude-uid,omitempty"`
-	ExcludeUIDRange          *[]string       `yaml:"exclude-uid-range" json:"exclude-uid-range,omitempty"`
-	IncludeAndroidUser       *[]int          `yaml:"include-android-user" json:"include-android-user,omitempty"`
-	IncludePackage           *[]string       `yaml:"include-package" json:"include-package,omitempty"`
-	ExcludePackage           *[]string       `yaml:"exclude-package" json:"exclude-package,omitempty"`
-	EndpointIndependentNat   *bool           `yaml:"endpoint-independent-nat" json:"endpoint-independent-nat,omitempty"`
-	UDPTimeout               *int64          `yaml:"udp-timeout" json:"udp-timeout,omitempty"`
-	FileDescriptor           *int            `yaml:"file-descriptor" json:"file-descriptor"`
-	TableIndex               *int            `yaml:"table-index" json:"table-index"`
 }
 
 type tuicServerSchema struct {
@@ -157,6 +166,36 @@ func pointerOrDefaultTun(p *tunSchema, def LC.Tun) LC.Tun {
 		if p.Inet6Address != nil {
 			def.Inet6Address = *p.Inet6Address
 		}
+		if p.IPRoute2TableIndex != nil {
+			def.IPRoute2TableIndex = *p.IPRoute2TableIndex
+		}
+		if p.IPRoute2RuleIndex != nil {
+			def.IPRoute2RuleIndex = *p.IPRoute2RuleIndex
+		}
+		if p.AutoRedirect != nil {
+			def.AutoRedirect = *p.AutoRedirect
+		}
+		if p.AutoRedirectInputMark != nil {
+			def.AutoRedirectInputMark = *p.AutoRedirectInputMark
+		}
+		if p.AutoRedirectOutputMark != nil {
+			def.AutoRedirectOutputMark = *p.AutoRedirectOutputMark
+		}
+		if p.StrictRoute != nil {
+			def.StrictRoute = *p.StrictRoute
+		}
+		if p.RouteAddress != nil {
+			def.RouteAddress = *p.RouteAddress
+		}
+		if p.RouteAddressSet != nil {
+			def.RouteAddressSet = *p.RouteAddressSet
+		}
+		if p.RouteExcludeAddress != nil {
+			def.RouteExcludeAddress = *p.RouteExcludeAddress
+		}
+		if p.RouteExcludeAddressSet != nil {
+			def.RouteExcludeAddressSet = *p.RouteExcludeAddressSet
+		}
 		if p.Inet4RouteAddress != nil {
 			def.Inet4RouteAddress = *p.Inet4RouteAddress
 		}
@@ -205,9 +244,6 @@ func pointerOrDefaultTun(p *tunSchema, def LC.Tun) LC.Tun {
 		if p.FileDescriptor != nil {
 			def.FileDescriptor = *p.FileDescriptor
 		}
-		if p.TableIndex != nil {
-			def.TableIndex = *p.TableIndex
-		}
 	}
 	return def
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/config/tun.go b/clash-meta-android/core/src/foss/golang/clash/listener/config/tun.go
index 7467e4a6a7..cea22bfdc8 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/config/tun.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/config/tun.go
@@ -27,27 +27,36 @@ type Tun struct {
 	AutoDetectInterface bool       `yaml:"auto-detect-interface" json:"auto-detect-interface"`
 	RedirectToTun       []string   `yaml:"-" json:"-"`
 
-	MTU                      uint32         `yaml:"mtu" json:"mtu,omitempty"`
-	GSO                      bool           `yaml:"gso" json:"gso,omitempty"`
-	GSOMaxSize               uint32         `yaml:"gso-max-size" json:"gso-max-size,omitempty"`
-	Inet4Address             []netip.Prefix `yaml:"inet4-address" json:"inet4-address,omitempty"`
-	Inet6Address             []netip.Prefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
-	StrictRoute              bool           `yaml:"strict-route" json:"strict-route,omitempty"`
+	MTU                    uint32         `yaml:"mtu" json:"mtu,omitempty"`
+	GSO                    bool           `yaml:"gso" json:"gso,omitempty"`
+	GSOMaxSize             uint32         `yaml:"gso-max-size" json:"gso-max-size,omitempty"`
+	Inet4Address           []netip.Prefix `yaml:"inet4-address" json:"inet4-address,omitempty"`
+	Inet6Address           []netip.Prefix `yaml:"inet6-address" json:"inet6-address,omitempty"`
+	IPRoute2TableIndex     int            `yaml:"iproute2-table-index" json:"iproute2_table_index,omitempty"`
+	IPRoute2RuleIndex      int            `yaml:"iproute2-rule-index" json:"iproute2_rule_index,omitempty"`
+	AutoRedirect           bool           `yaml:"auto-redirect" json:"auto_redirect,omitempty"`
+	AutoRedirectInputMark  uint32         `yaml:"auto-redirect-input-mark" json:"auto_redirect_input_mark,omitempty"`
+	AutoRedirectOutputMark uint32         `yaml:"auto-redirect-output-mark" json:"auto_redirect_output_mark,omitempty"`
+	StrictRoute            bool           `yaml:"strict-route" json:"strict-route,omitempty"`
+	RouteAddress           []netip.Prefix `yaml:"route-address" json:"route_address,omitempty"`
+	RouteAddressSet        []string       `yaml:"route-address-set" json:"route_address_set,omitempty"`
+	RouteExcludeAddress    []netip.Prefix `yaml:"route-exclude-address" json:"route_exclude_address,omitempty"`
+	RouteExcludeAddressSet []string       `yaml:"route-exclude-address-set" json:"route_exclude_address_set,omitempty"`
+	IncludeInterface       []string       `yaml:"include-interface" json:"include-interface,omitempty"`
+	ExcludeInterface       []string       `yaml:"exclude-interface" json:"exclude-interface,omitempty"`
+	IncludeUID             []uint32       `yaml:"include-uid" json:"include-uid,omitempty"`
+	IncludeUIDRange        []string       `yaml:"include-uid-range" json:"include-uid-range,omitempty"`
+	ExcludeUID             []uint32       `yaml:"exclude-uid" json:"exclude-uid,omitempty"`
+	ExcludeUIDRange        []string       `yaml:"exclude-uid-range" json:"exclude-uid-range,omitempty"`
+	IncludeAndroidUser     []int          `yaml:"include-android-user" json:"include-android-user,omitempty"`
+	IncludePackage         []string       `yaml:"include-package" json:"include-package,omitempty"`
+	ExcludePackage         []string       `yaml:"exclude-package" json:"exclude-package,omitempty"`
+	EndpointIndependentNat bool           `yaml:"endpoint-independent-nat" json:"endpoint-independent-nat,omitempty"`
+	UDPTimeout             int64          `yaml:"udp-timeout" json:"udp-timeout,omitempty"`
+	FileDescriptor         int            `yaml:"file-descriptor" json:"file-descriptor"`
+
 	Inet4RouteAddress        []netip.Prefix `yaml:"inet4-route-address" json:"inet4-route-address,omitempty"`
 	Inet6RouteAddress        []netip.Prefix `yaml:"inet6-route-address" json:"inet6-route-address,omitempty"`
 	Inet4RouteExcludeAddress []netip.Prefix `yaml:"inet4-route-exclude-address" json:"inet4-route-exclude-address,omitempty"`
 	Inet6RouteExcludeAddress []netip.Prefix `yaml:"inet6-route-exclude-address" json:"inet6-route-exclude-address,omitempty"`
-	IncludeInterface         []string       `yaml:"include-interface" json:"include-interface,omitempty"`
-	ExcludeInterface         []string       `yaml:"exclude-interface" json:"exclude-interface,omitempty"`
-	IncludeUID               []uint32       `yaml:"include-uid" json:"include-uid,omitempty"`
-	IncludeUIDRange          []string       `yaml:"include-uid-range" json:"include-uid-range,omitempty"`
-	ExcludeUID               []uint32       `yaml:"exclude-uid" json:"exclude-uid,omitempty"`
-	ExcludeUIDRange          []string       `yaml:"exclude-uid-range" json:"exclude-uid-range,omitempty"`
-	IncludeAndroidUser       []int          `yaml:"include-android-user" json:"include-android-user,omitempty"`
-	IncludePackage           []string       `yaml:"include-package" json:"include-package,omitempty"`
-	ExcludePackage           []string       `yaml:"exclude-package" json:"exclude-package,omitempty"`
-	EndpointIndependentNat   bool           `yaml:"endpoint-independent-nat" json:"endpoint-independent-nat,omitempty"`
-	UDPTimeout               int64          `yaml:"udp-timeout" json:"udp-timeout,omitempty"`
-	FileDescriptor           int            `yaml:"file-descriptor" json:"file-descriptor"`
-	TableIndex               int            `yaml:"table-index" json:"table-index"`
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/inbound/tun.go b/clash-meta-android/core/src/foss/golang/clash/listener/inbound/tun.go
index 51747c4629..a950f80db2 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/inbound/tun.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/inbound/tun.go
@@ -18,29 +18,38 @@ type TunOption struct {
 	AutoRoute           bool     `inbound:"auto-route,omitempty"`
 	AutoDetectInterface bool     `inbound:"auto-detect-interface,omitempty"`
 
-	MTU                      uint32   `inbound:"mtu,omitempty"`
-	GSO                      bool     `inbound:"gso,omitempty"`
-	GSOMaxSize               uint32   `inbound:"gso-max-size,omitempty"`
-	Inet4Address             []string `inbound:"inet4_address,omitempty"`
-	Inet6Address             []string `inbound:"inet6_address,omitempty"`
-	StrictRoute              bool     `inbound:"strict_route,omitempty"`
+	MTU                    uint32   `inbound:"mtu,omitempty"`
+	GSO                    bool     `inbound:"gso,omitempty"`
+	GSOMaxSize             uint32   `inbound:"gso-max-size,omitempty"`
+	Inet4Address           []string `inbound:"inet4_address,omitempty"`
+	Inet6Address           []string `inbound:"inet6_address,omitempty"`
+	IPRoute2TableIndex     int      `inbound:"iproute2-table-index"`
+	IPRoute2RuleIndex      int      `inbound:"iproute2-rule-index"`
+	AutoRedirect           bool     `inbound:"auto-redirect"`
+	AutoRedirectInputMark  uint32   `inbound:"auto-redirect-input-mark"`
+	AutoRedirectOutputMark uint32   `inbound:"auto-redirect-output-mark"`
+	StrictRoute            bool     `inbound:"strict_route,omitempty"`
+	RouteAddress           []string `inbound:"route-address"`
+	RouteAddressSet        []string `inbound:"route-address-set"`
+	RouteExcludeAddress    []string `inbound:"route-exclude-address"`
+	RouteExcludeAddressSet []string `inbound:"route-exclude-address-set"`
+	IncludeInterface       []string `inbound:"include-interface,omitempty"`
+	ExcludeInterface       []string `inbound:"exclude-interface"`
+	IncludeUID             []uint32 `inbound:"include_uid,omitempty"`
+	IncludeUIDRange        []string `inbound:"include_uid_range,omitempty"`
+	ExcludeUID             []uint32 `inbound:"exclude_uid,omitempty"`
+	ExcludeUIDRange        []string `inbound:"exclude_uid_range,omitempty"`
+	IncludeAndroidUser     []int    `inbound:"include_android_user,omitempty"`
+	IncludePackage         []string `inbound:"include_package,omitempty"`
+	ExcludePackage         []string `inbound:"exclude_package,omitempty"`
+	EndpointIndependentNat bool     `inbound:"endpoint_independent_nat,omitempty"`
+	UDPTimeout             int64    `inbound:"udp_timeout,omitempty"`
+	FileDescriptor         int      `inbound:"file-descriptor,omitempty"`
+
 	Inet4RouteAddress        []string `inbound:"inet4_route_address,omitempty"`
 	Inet6RouteAddress        []string `inbound:"inet6_route_address,omitempty"`
 	Inet4RouteExcludeAddress []string `inbound:"inet4_route_exclude_address,omitempty"`
 	Inet6RouteExcludeAddress []string `inbound:"inet6_route_exclude_address,omitempty"`
-	IncludeInterface         []string `inbound:"include-interface,omitempty"`
-	ExcludeInterface         []string `inbound:"exclude-interface" json:"exclude-interface,omitempty"`
-	IncludeUID               []uint32 `inbound:"include_uid,omitempty"`
-	IncludeUIDRange          []string `inbound:"include_uid_range,omitempty"`
-	ExcludeUID               []uint32 `inbound:"exclude_uid,omitempty"`
-	ExcludeUIDRange          []string `inbound:"exclude_uid_range,omitempty"`
-	IncludeAndroidUser       []int    `inbound:"include_android_user,omitempty"`
-	IncludePackage           []string `inbound:"include_package,omitempty"`
-	ExcludePackage           []string `inbound:"exclude_package,omitempty"`
-	EndpointIndependentNat   bool     `inbound:"endpoint_independent_nat,omitempty"`
-	UDPTimeout               int64    `inbound:"udp_timeout,omitempty"`
-	FileDescriptor           int      `inbound:"file-descriptor,omitempty"`
-	TableIndex               int      `inbound:"table-index,omitempty"`
 }
 
 func (o TunOption) Equal(config C.InboundConfig) bool {
@@ -63,6 +72,16 @@ func NewTun(options *TunOption) (*Tun, error) {
 	if !exist {
 		return nil, errors.New("invalid tun stack")
 	}
+
+	routeAddress, err := LC.StringSliceToNetipPrefixSlice(options.RouteAddress)
+	if err != nil {
+		return nil, err
+	}
+	routeExcludeAddress, err := LC.StringSliceToNetipPrefixSlice(options.RouteExcludeAddress)
+	if err != nil {
+		return nil, err
+	}
+
 	inet4Address, err := LC.StringSliceToNetipPrefixSlice(options.Inet4Address)
 	if err != nil {
 		return nil, err
@@ -91,35 +110,44 @@ func NewTun(options *TunOption) (*Tun, error) {
 		Base:   base,
 		config: options,
 		tun: LC.Tun{
-			Enable:                   true,
-			Device:                   options.Device,
-			Stack:                    stack,
-			DNSHijack:                options.DNSHijack,
-			AutoRoute:                options.AutoRoute,
-			AutoDetectInterface:      options.AutoDetectInterface,
-			MTU:                      options.MTU,
-			GSO:                      options.GSO,
-			GSOMaxSize:               options.GSOMaxSize,
-			Inet4Address:             inet4Address,
-			Inet6Address:             inet6Address,
-			StrictRoute:              options.StrictRoute,
+			Enable:                 true,
+			Device:                 options.Device,
+			Stack:                  stack,
+			DNSHijack:              options.DNSHijack,
+			AutoRoute:              options.AutoRoute,
+			AutoDetectInterface:    options.AutoDetectInterface,
+			MTU:                    options.MTU,
+			GSO:                    options.GSO,
+			GSOMaxSize:             options.GSOMaxSize,
+			Inet4Address:           inet4Address,
+			Inet6Address:           inet6Address,
+			IPRoute2TableIndex:     options.IPRoute2TableIndex,
+			IPRoute2RuleIndex:      options.IPRoute2RuleIndex,
+			AutoRedirect:           options.AutoRedirect,
+			AutoRedirectInputMark:  options.AutoRedirectInputMark,
+			AutoRedirectOutputMark: options.AutoRedirectOutputMark,
+			StrictRoute:            options.StrictRoute,
+			RouteAddress:           routeAddress,
+			RouteAddressSet:        options.RouteAddressSet,
+			RouteExcludeAddress:    routeExcludeAddress,
+			RouteExcludeAddressSet: options.RouteExcludeAddressSet,
+			IncludeInterface:       options.IncludeInterface,
+			ExcludeInterface:       options.ExcludeInterface,
+			IncludeUID:             options.IncludeUID,
+			IncludeUIDRange:        options.IncludeUIDRange,
+			ExcludeUID:             options.ExcludeUID,
+			ExcludeUIDRange:        options.ExcludeUIDRange,
+			IncludeAndroidUser:     options.IncludeAndroidUser,
+			IncludePackage:         options.IncludePackage,
+			ExcludePackage:         options.ExcludePackage,
+			EndpointIndependentNat: options.EndpointIndependentNat,
+			UDPTimeout:             options.UDPTimeout,
+			FileDescriptor:         options.FileDescriptor,
+
 			Inet4RouteAddress:        inet4RouteAddress,
 			Inet6RouteAddress:        inet6RouteAddress,
 			Inet4RouteExcludeAddress: inet4RouteExcludeAddress,
 			Inet6RouteExcludeAddress: inet6RouteExcludeAddress,
-			IncludeInterface:         options.IncludeInterface,
-			ExcludeInterface:         options.ExcludeInterface,
-			IncludeUID:               options.IncludeUID,
-			IncludeUIDRange:          options.IncludeUIDRange,
-			ExcludeUID:               options.ExcludeUID,
-			ExcludeUIDRange:          options.ExcludeUIDRange,
-			IncludeAndroidUser:       options.IncludeAndroidUser,
-			IncludePackage:           options.IncludePackage,
-			ExcludePackage:           options.ExcludePackage,
-			EndpointIndependentNat:   options.EndpointIndependentNat,
-			UDPTimeout:               options.UDPTimeout,
-			FileDescriptor:           options.FileDescriptor,
-			TableIndex:               options.TableIndex,
 		},
 	}, nil
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/listener.go b/clash-meta-android/core/src/foss/golang/clash/listener/listener.go
index e35061882d..76860e0d43 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/listener.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/listener.go
@@ -820,11 +820,15 @@ func hasTunConfigChange(tunConf *LC.Tun) bool {
 		LastTunConf.MTU != tunConf.MTU ||
 		LastTunConf.GSO != tunConf.GSO ||
 		LastTunConf.GSOMaxSize != tunConf.GSOMaxSize ||
+		LastTunConf.IPRoute2TableIndex != tunConf.IPRoute2TableIndex ||
+		LastTunConf.IPRoute2RuleIndex != tunConf.IPRoute2RuleIndex ||
+		LastTunConf.AutoRedirect != tunConf.AutoRedirect ||
+		LastTunConf.AutoRedirectInputMark != tunConf.AutoRedirectInputMark ||
+		LastTunConf.AutoRedirectOutputMark != tunConf.AutoRedirectOutputMark ||
 		LastTunConf.StrictRoute != tunConf.StrictRoute ||
 		LastTunConf.EndpointIndependentNat != tunConf.EndpointIndependentNat ||
 		LastTunConf.UDPTimeout != tunConf.UDPTimeout ||
-		LastTunConf.FileDescriptor != tunConf.FileDescriptor ||
-		LastTunConf.TableIndex != tunConf.TableIndex {
+		LastTunConf.FileDescriptor != tunConf.FileDescriptor {
 		return true
 	}
 
@@ -836,6 +840,22 @@ func hasTunConfigChange(tunConf *LC.Tun) bool {
 		return tunConf.DNSHijack[i] < tunConf.DNSHijack[j]
 	})
 
+	sort.Slice(tunConf.RouteAddress, func(i, j int) bool {
+		return tunConf.RouteAddress[i].String() < tunConf.RouteAddress[j].String()
+	})
+
+	sort.Slice(tunConf.RouteAddressSet, func(i, j int) bool {
+		return tunConf.RouteAddressSet[i] < tunConf.RouteAddressSet[j]
+	})
+
+	sort.Slice(tunConf.RouteExcludeAddress, func(i, j int) bool {
+		return tunConf.RouteExcludeAddress[i].String() < tunConf.RouteExcludeAddress[j].String()
+	})
+
+	sort.Slice(tunConf.RouteExcludeAddressSet, func(i, j int) bool {
+		return tunConf.RouteExcludeAddressSet[i] < tunConf.RouteExcludeAddressSet[j]
+	})
+
 	sort.Slice(tunConf.Inet4Address, func(i, j int) bool {
 		return tunConf.Inet4Address[i].String() < tunConf.Inet4Address[j].String()
 	})
@@ -897,6 +917,10 @@ func hasTunConfigChange(tunConf *LC.Tun) bool {
 	})
 
 	if !slices.Equal(tunConf.DNSHijack, LastTunConf.DNSHijack) ||
+		!slices.Equal(tunConf.RouteAddress, LastTunConf.RouteAddress) ||
+		!slices.Equal(tunConf.RouteAddressSet, LastTunConf.RouteAddressSet) ||
+		!slices.Equal(tunConf.RouteExcludeAddress, LastTunConf.RouteExcludeAddress) ||
+		!slices.Equal(tunConf.RouteExcludeAddressSet, LastTunConf.RouteExcludeAddressSet) ||
 		!slices.Equal(tunConf.Inet4Address, LastTunConf.Inet4Address) ||
 		!slices.Equal(tunConf.Inet6Address, LastTunConf.Inet6Address) ||
 		!slices.Equal(tunConf.Inet4RouteAddress, LastTunConf.Inet4RouteAddress) ||
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/sing/sing.go b/clash-meta-android/core/src/foss/golang/clash/listener/sing/sing.go
index 4e31faeb78..10390e7326 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/sing/sing.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/sing/sing.go
@@ -198,6 +198,12 @@ func (h *ListenerHandler) NewError(ctx context.Context, err error) {
 	log.Warnln("%s listener get error: %+v", h.Type.String(), err)
 }
 
+func (h *ListenerHandler) TypeMutation(typ C.Type) *ListenerHandler {
+	handler := *h
+	handler.Type = typ
+	return &handler
+}
+
 func ShouldIgnorePacketError(err error) bool {
 	// ignore simple error
 	if E.IsTimeout(err) || E.IsClosed(err) || E.IsCanceled(err) {
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/dns.go b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/dns.go
index 42926732f4..505f16acc9 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/dns.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/dns.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/metacubex/mihomo/component/resolver"
+	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/listener/sing"
 	"github.com/metacubex/mihomo/log"
 
@@ -124,3 +125,9 @@ func (h *ListenerHandler) NewPacketConnection(ctx context.Context, conn network.
 	}
 	return h.ListenerHandler.NewPacketConnection(ctx, conn, metadata)
 }
+
+func (h *ListenerHandler) TypeMutation(typ C.Type) *ListenerHandler {
+	handle := *h
+	handle.ListenerHandler = h.ListenerHandler.TypeMutation(typ)
+	return &handle
+}
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/iface.go b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/iface.go
new file mode 100644
index 0000000000..cc14207824
--- /dev/null
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/iface.go
@@ -0,0 +1,70 @@
+package sing_tun
+
+import (
+	"errors"
+	"net/netip"
+
+	"github.com/metacubex/mihomo/component/iface"
+
+	"github.com/sagernet/sing/common/control"
+)
+
+type defaultInterfaceFinder struct{}
+
+var DefaultInterfaceFinder control.InterfaceFinder = (*defaultInterfaceFinder)(nil)
+
+func (f *defaultInterfaceFinder) Interfaces() []control.Interface {
+	ifaces, err := iface.Interfaces()
+	if err != nil {
+		return nil
+	}
+	interfaces := make([]control.Interface, 0, len(ifaces))
+	for _, _interface := range ifaces {
+		interfaces = append(interfaces, control.Interface(*_interface))
+	}
+
+	return interfaces
+}
+
+var errNoSuchInterface = errors.New("no such network interface")
+
+func (f *defaultInterfaceFinder) InterfaceIndexByName(name string) (int, error) {
+	ifaces, err := iface.Interfaces()
+	if err != nil {
+		return 0, err
+	}
+	for _, netInterface := range ifaces {
+		if netInterface.Name == name {
+			return netInterface.Index, nil
+		}
+	}
+	return 0, errNoSuchInterface
+}
+
+func (f *defaultInterfaceFinder) InterfaceNameByIndex(index int) (string, error) {
+	ifaces, err := iface.Interfaces()
+	if err != nil {
+		return "", err
+	}
+	for _, netInterface := range ifaces {
+		if netInterface.Index == index {
+			return netInterface.Name, nil
+		}
+	}
+	return "", errNoSuchInterface
+}
+
+func (f *defaultInterfaceFinder) InterfaceByAddr(addr netip.Addr) (*control.Interface, error) {
+	ifaces, err := iface.Interfaces()
+	if err != nil {
+		return nil, err
+	}
+	for _, netInterface := range ifaces {
+		for _, prefix := range netInterface.Addresses {
+			if prefix.Contains(addr) {
+				return (*control.Interface)(netInterface), nil
+			}
+		}
+	}
+	return nil, errNoSuchInterface
+}
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/redirect_linux.go b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/redirect_linux.go
new file mode 100644
index 0000000000..6ef6fc968a
--- /dev/null
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/redirect_linux.go
@@ -0,0 +1,3 @@
+package sing_tun
+
+const supportRedirect = true
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/redirect_stub.go b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/redirect_stub.go
new file mode 100644
index 0000000000..d711af3c70
--- /dev/null
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/redirect_stub.go
@@ -0,0 +1,5 @@
+//go:build !linux
+
+package sing_tun
+
+const supportRedirect = false
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/server.go b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/server.go
index a5edb77f63..e8c2ad286b 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/server.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/sing_tun/server.go
@@ -3,27 +3,33 @@ package sing_tun
 import (
 	"context"
 	"fmt"
+	"io"
 	"net"
 	"net/netip"
+	"os"
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/metacubex/mihomo/adapter/inbound"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/iface"
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/provider"
 	LC "github.com/metacubex/mihomo/listener/config"
 	"github.com/metacubex/mihomo/listener/sing"
 	"github.com/metacubex/mihomo/log"
 
 	tun "github.com/metacubex/sing-tun"
 	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/control"
 	E "github.com/sagernet/sing/common/exceptions"
 	F "github.com/sagernet/sing/common/format"
 	"github.com/sagernet/sing/common/ranges"
+
+	"go4.org/netipx"
+	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
 )
 
@@ -43,10 +49,21 @@ type Listener struct {
 	networkUpdateMonitor    tun.NetworkUpdateMonitor
 	defaultInterfaceMonitor tun.DefaultInterfaceMonitor
 	packageManager          tun.PackageManager
+	autoRedirect            tun.AutoRedirect
+	autoRedirectOutputMark  int32
+
+	ruleUpdateCallbackCloser io.Closer
+	ruleUpdateMutex          sync.Mutex
+	routeAddressMap          map[string]*netipx.IPSet
+	routeExcludeAddressMap   map[string]*netipx.IPSet
+	routeAddressSet          []*netipx.IPSet
+	routeExcludeAddressSet   []*netipx.IPSet
 
 	dnsServerIp []string
 }
 
+var emptyAddressSet = []*netipx.IPSet{{}}
+
 func CalculateInterfaceName(name string) (tunName string) {
 	if runtime.GOOS == "darwin" {
 		tunName = "utun"
@@ -110,14 +127,45 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 			inbound.WithSpecialRules(""),
 		}
 	}
+	ctx := context.TODO()
+	rpTunnel := tunnel.(provider.Tunnel)
 	if options.GSOMaxSize == 0 {
 		options.GSOMaxSize = 65536
 	}
+	if !supportRedirect {
+		options.AutoRedirect = false
+	}
 	tunName := options.Device
 	if tunName == "" || !checkTunName(tunName) {
 		tunName = CalculateInterfaceName(InterfaceName)
 		options.Device = tunName
 	}
+	routeAddress := options.RouteAddress
+	if len(options.Inet4RouteAddress) > 0 {
+		routeAddress = append(routeAddress, options.Inet4RouteAddress...)
+	}
+	if len(options.Inet6RouteAddress) > 0 {
+		routeAddress = append(routeAddress, options.Inet6RouteAddress...)
+	}
+	inet4RouteAddress := common.Filter(routeAddress, func(it netip.Prefix) bool {
+		return it.Addr().Is4()
+	})
+	inet6RouteAddress := common.Filter(routeAddress, func(it netip.Prefix) bool {
+		return it.Addr().Is6()
+	})
+	routeExcludeAddress := options.RouteExcludeAddress
+	if len(options.Inet4RouteExcludeAddress) > 0 {
+		routeExcludeAddress = append(routeExcludeAddress, options.Inet4RouteExcludeAddress...)
+	}
+	if len(options.Inet6RouteExcludeAddress) > 0 {
+		routeExcludeAddress = append(routeExcludeAddress, options.Inet6RouteExcludeAddress...)
+	}
+	inet4RouteExcludeAddress := common.Filter(routeExcludeAddress, func(it netip.Prefix) bool {
+		return it.Addr().Is4()
+	})
+	inet6RouteExcludeAddress := common.Filter(routeExcludeAddress, func(it netip.Prefix) bool {
+		return it.Addr().Is6()
+	})
 	tunMTU := options.MTU
 	if tunMTU == 0 {
 		tunMTU = 9000
@@ -128,9 +176,21 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 	} else {
 		udpTimeout = int64(sing.UDPTimeout.Seconds())
 	}
-	tableIndex := options.TableIndex
+	tableIndex := options.IPRoute2TableIndex
 	if tableIndex == 0 {
-		tableIndex = 2022
+		tableIndex = tun.DefaultIPRoute2TableIndex
+	}
+	ruleIndex := options.IPRoute2RuleIndex
+	if ruleIndex == 0 {
+		ruleIndex = tun.DefaultIPRoute2RuleIndex
+	}
+	inputMark := options.AutoRedirectInputMark
+	if inputMark == 0 {
+		inputMark = tun.DefaultAutoRedirectInputMark
+	}
+	outputMark := options.AutoRedirectOutputMark
+	if outputMark == 0 {
+		outputMark = tun.DefaultAutoRedirectOutputMark
 	}
 	includeUID := uidToRange(options.IncludeUID)
 	if len(options.IncludeUIDRange) > 0 {
@@ -202,6 +262,8 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 		}
 	}()
 
+	interfaceFinder := DefaultInterfaceFinder
+
 	networkUpdateMonitor, err := tun.NewNetworkUpdateMonitor(log.SingLogger)
 	if err != nil {
 		err = E.Cause(err, "create NetworkUpdateMonitor")
@@ -236,11 +298,15 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 		Inet4Address:             options.Inet4Address,
 		Inet6Address:             options.Inet6Address,
 		AutoRoute:                options.AutoRoute,
+		IPRoute2TableIndex:       tableIndex,
+		IPRoute2RuleIndex:        ruleIndex,
+		AutoRedirectInputMark:    inputMark,
+		AutoRedirectOutputMark:   outputMark,
 		StrictRoute:              options.StrictRoute,
-		Inet4RouteAddress:        options.Inet4RouteAddress,
-		Inet6RouteAddress:        options.Inet6RouteAddress,
-		Inet4RouteExcludeAddress: options.Inet4RouteExcludeAddress,
-		Inet6RouteExcludeAddress: options.Inet6RouteExcludeAddress,
+		Inet4RouteAddress:        inet4RouteAddress,
+		Inet6RouteAddress:        inet6RouteAddress,
+		Inet4RouteExcludeAddress: inet4RouteExcludeAddress,
+		Inet6RouteExcludeAddress: inet6RouteExcludeAddress,
 		IncludeInterface:         options.IncludeInterface,
 		ExcludeInterface:         options.ExcludeInterface,
 		IncludeUID:               includeUID,
@@ -250,7 +316,56 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 		ExcludePackage:           options.ExcludePackage,
 		FileDescriptor:           options.FileDescriptor,
 		InterfaceMonitor:         defaultInterfaceMonitor,
-		TableIndex:               tableIndex,
+	}
+
+	if options.AutoRedirect {
+		l.routeAddressMap = make(map[string]*netipx.IPSet)
+		l.routeExcludeAddressMap = make(map[string]*netipx.IPSet)
+
+		if !options.AutoRoute {
+			return nil, E.New("`auto-route` is required by `auto-redirect`")
+		}
+		disableNFTables, dErr := strconv.ParseBool(os.Getenv("DISABLE_NFTABLES"))
+		l.autoRedirect, err = tun.NewAutoRedirect(tun.AutoRedirectOptions{
+			TunOptions:             &tunOptions,
+			Context:                ctx,
+			Handler:                handler.TypeMutation(C.REDIR),
+			Logger:                 log.SingLogger,
+			NetworkMonitor:         networkUpdateMonitor,
+			InterfaceFinder:        interfaceFinder,
+			TableName:              "mihomo",
+			DisableNFTables:        dErr == nil && disableNFTables,
+			RouteAddressSet:        &l.routeAddressSet,
+			RouteExcludeAddressSet: &l.routeExcludeAddressSet,
+		})
+		if err != nil {
+			err = E.Cause(err, "initialize auto redirect")
+			return
+		}
+
+		var markMode bool
+		for _, routeAddressSet := range options.RouteAddressSet {
+			rp, loaded := rpTunnel.RuleProviders()[routeAddressSet]
+			if !loaded {
+				err = E.New("parse route-address-set: rule-set not found: ", routeAddressSet)
+				return
+			}
+			l.updateRule(rp, false, false)
+			markMode = true
+		}
+		for _, routeExcludeAddressSet := range options.RouteExcludeAddressSet {
+			rp, loaded := rpTunnel.RuleProviders()[routeExcludeAddressSet]
+			if !loaded {
+				err = E.New("parse route-exclude_address-set: rule-set not found: ", routeExcludeAddressSet)
+				return
+			}
+			l.updateRule(rp, true, false)
+			markMode = true
+		}
+		if markMode {
+			tunOptions.AutoRedirectMarkMode = true
+		}
+
 	}
 
 	err = l.buildAndroidRules(&tunOptions)
@@ -269,14 +384,14 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 	resolver.AddSystemDnsBlacklist(dnsServerIp...)
 
 	stackOptions := tun.StackOptions{
-		Context:                context.TODO(),
+		Context:                ctx,
 		Tun:                    tunIf,
 		TunOptions:             tunOptions,
 		EndpointIndependentNat: options.EndpointIndependentNat,
 		UDPTimeout:             udpTimeout,
 		Handler:                handler,
 		Logger:                 log.SingLogger,
-		InterfaceFinder:        control.DefaultInterfaceFinder(),
+		InterfaceFinder:        interfaceFinder,
 		EnforceBindInterface:   EnforceBindInterface,
 	}
 
@@ -299,13 +414,80 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 	}
 	l.tunStack = tunStack
 
+	if l.autoRedirect != nil {
+		if len(l.options.RouteAddressSet) > 0 && len(l.routeAddressSet) == 0 {
+			l.routeAddressSet = emptyAddressSet // without this we can't call UpdateRouteAddressSet after Start
+		}
+		if len(l.options.RouteExcludeAddressSet) > 0 && len(l.routeExcludeAddressSet) == 0 {
+			l.routeExcludeAddressSet = emptyAddressSet // without this we can't call UpdateRouteAddressSet after Start
+		}
+		err = l.autoRedirect.Start()
+		if err != nil {
+			err = E.Cause(err, "auto redirect")
+			return
+		}
+		if tunOptions.AutoRedirectMarkMode {
+			l.autoRedirectOutputMark = int32(outputMark)
+			dialer.DefaultRoutingMark.Store(l.autoRedirectOutputMark)
+			l.autoRedirect.UpdateRouteAddressSet()
+			l.ruleUpdateCallbackCloser = rpTunnel.RuleUpdateCallback().Register(l.ruleUpdateCallback)
+		}
+	}
+
 	//l.openAndroidHotspot(tunOptions)
 
-	l.addrStr = fmt.Sprintf("%s(%s,%s), mtu: %d, auto route: %v, ip stack: %s",
-		tunName, tunOptions.Inet4Address, tunOptions.Inet6Address, tunMTU, options.AutoRoute, options.Stack)
+	l.addrStr = fmt.Sprintf("%s(%s,%s), mtu: %d, auto route: %v, auto redir: %v, ip stack: %s",
+		tunName, tunOptions.Inet4Address, tunOptions.Inet6Address, tunMTU, options.AutoRoute, options.AutoRedirect, options.Stack)
 	return
 }
 
+func (l *Listener) ruleUpdateCallback(ruleProvider provider.RuleProvider) {
+	name := ruleProvider.Name()
+	if slices.Contains(l.options.RouteAddressSet, name) {
+		l.updateRule(ruleProvider, false, true)
+		return
+	}
+	if slices.Contains(l.options.RouteExcludeAddressSet, name) {
+		l.updateRule(ruleProvider, true, true)
+		return
+	}
+}
+
+type toIpCidr interface {
+	ToIpCidr() *netipx.IPSet
+}
+
+func (l *Listener) updateRule(ruleProvider provider.RuleProvider, exclude bool, update bool) {
+	l.ruleUpdateMutex.Lock()
+	defer l.ruleUpdateMutex.Unlock()
+	name := ruleProvider.Name()
+	switch rp := ruleProvider.Strategy().(type) {
+	case toIpCidr:
+		if !exclude {
+			ipCidr := rp.ToIpCidr()
+			if ipCidr != nil {
+				l.routeAddressMap[name] = ipCidr
+			} else {
+				delete(l.routeAddressMap, name)
+			}
+			l.routeAddressSet = maps.Values(l.routeAddressMap)
+		} else {
+			ipCidr := rp.ToIpCidr()
+			if ipCidr != nil {
+				l.routeExcludeAddressMap[name] = ipCidr
+			} else {
+				delete(l.routeExcludeAddressMap, name)
+			}
+			l.routeExcludeAddressSet = maps.Values(l.routeExcludeAddressMap)
+		}
+	default:
+		return
+	}
+	if update && l.autoRedirect != nil {
+		l.autoRedirect.UpdateRouteAddressSet()
+	}
+}
+
 func (l *Listener) FlushDefaultInterface() {
 	if l.options.AutoDetectInterface {
 		for _, destination := range []netip.Addr{netip.IPv4Unspecified(), netip.IPv6Unspecified(), netip.MustParseAddr("1.1.1.1")} {
@@ -347,11 +529,11 @@ func parseRange(uidRanges []ranges.Range[uint32], rangeList []string) ([]ranges.
 		}
 		var start, end uint64
 		var err error
-		start, err = strconv.ParseUint(uidRange[:subIndex], 10, 32)
+		start, err = strconv.ParseUint(uidRange[:subIndex], 0, 32)
 		if err != nil {
 			return nil, E.Cause(err, "parse range start")
 		}
-		end, err = strconv.ParseUint(uidRange[subIndex+1:], 10, 32)
+		end, err = strconv.ParseUint(uidRange[subIndex+1:], 0, 32)
 		if err != nil {
 			return nil, E.Cause(err, "parse range end")
 		}
@@ -363,9 +545,14 @@ func parseRange(uidRanges []ranges.Range[uint32], rangeList []string) ([]ranges.
 func (l *Listener) Close() error {
 	l.closed = true
 	resolver.RemoveSystemDnsBlacklist(l.dnsServerIp...)
+	if l.autoRedirectOutputMark != 0 {
+		dialer.DefaultRoutingMark.CompareAndSwap(l.autoRedirectOutputMark, 0)
+	}
 	return common.Close(
+		l.ruleUpdateCallbackCloser,
 		l.tunStack,
 		l.tunIf,
+		l.autoRedirect,
 		l.defaultInterfaceMonitor,
 		l.networkUpdateMonitor,
 		l.packageManager,
diff --git a/clash-meta-android/core/src/foss/golang/clash/listener/tproxy/tproxy_iptables.go b/clash-meta-android/core/src/foss/golang/clash/listener/tproxy/tproxy_iptables.go
index 6c6e2cc81f..bc26b125fd 100644
--- a/clash-meta-android/core/src/foss/golang/clash/listener/tproxy/tproxy_iptables.go
+++ b/clash-meta-android/core/src/foss/golang/clash/listener/tproxy/tproxy_iptables.go
@@ -119,9 +119,7 @@ func CleanupTProxyIPTables() {
 
 	log.Warnln("Cleanup tproxy linux iptables")
 
-	if int(dialer.DefaultRoutingMark.Load()) == 2158 {
-		dialer.DefaultRoutingMark.Store(0)
-	}
+	dialer.DefaultRoutingMark.CompareAndSwap(2158, 0)
 
 	if _, err := cmd.ExecCmd("iptables -t mangle -L mihomo_divert"); err != nil {
 		return
diff --git a/clash-meta-android/core/src/foss/golang/clash/rules/common/base.go b/clash-meta-android/core/src/foss/golang/clash/rules/common/base.go
index d912107c2e..670df1d969 100644
--- a/clash-meta-android/core/src/foss/golang/clash/rules/common/base.go
+++ b/clash-meta-android/core/src/foss/golang/clash/rules/common/base.go
@@ -20,6 +20,8 @@ func (b *Base) ShouldResolveIP() bool {
 	return false
 }
 
+func (b *Base) ProviderNames() []string { return nil }
+
 func HasNoResolve(params []string) bool {
 	for _, p := range params {
 		if p == noResolve {
diff --git a/clash-meta-android/core/src/foss/golang/clash/rules/logic/logic.go b/clash-meta-android/core/src/foss/golang/clash/rules/logic/logic.go
index af8c31a4bf..8c79cab537 100644
--- a/clash-meta-android/core/src/foss/golang/clash/rules/logic/logic.go
+++ b/clash-meta-android/core/src/foss/golang/clash/rules/logic/logic.go
@@ -2,12 +2,13 @@ package logic
 
 import (
 	"fmt"
-	list "github.com/bahlo/generic-list-go"
 	"regexp"
 	"strings"
 
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/rules/common"
+
+	list "github.com/bahlo/generic-list-go"
 )
 
 type Logic struct {
@@ -243,7 +244,7 @@ func matchSubRules(metadata *C.Metadata, name string, subRules map[string][]C.Ru
 	for _, rule := range subRules[name] {
 		if m, a := rule.Match(metadata); m {
 			if rule.RuleType() == C.SubRules {
-				matchSubRules(metadata, rule.Adapter(), subRules)
+				return matchSubRules(metadata, rule.Adapter(), subRules)
 			} else {
 				return m, a
 			}
@@ -298,3 +299,10 @@ func (logic *Logic) ShouldResolveIP() bool {
 func (logic *Logic) ShouldFindProcess() bool {
 	return logic.needProcess
 }
+
+func (logic *Logic) ProviderNames() (names []string) {
+	for _, rule := range logic.rules {
+		names = append(names, rule.ProviderNames()...)
+	}
+	return
+}
diff --git a/clash-meta-android/core/src/foss/golang/clash/rules/provider/ipcidr_strategy.go b/clash-meta-android/core/src/foss/golang/clash/rules/provider/ipcidr_strategy.go
index c93facd95e..d0545c7cc2 100644
--- a/clash-meta-android/core/src/foss/golang/clash/rules/provider/ipcidr_strategy.go
+++ b/clash-meta-android/core/src/foss/golang/clash/rules/provider/ipcidr_strategy.go
@@ -4,6 +4,8 @@ import (
 	"github.com/metacubex/mihomo/component/cidr"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
+
+	"go4.org/netipx"
 )
 
 type ipcidrStrategy struct {
@@ -52,6 +54,10 @@ func (i *ipcidrStrategy) FinishInsert() {
 	i.cidrSet.Merge()
 }
 
+func (i *ipcidrStrategy) ToIpCidr() *netipx.IPSet {
+	return i.cidrSet.ToIPSet()
+}
+
 func NewIPCidrStrategy() *ipcidrStrategy {
 	return &ipcidrStrategy{}
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/rules/provider/patch_android.go b/clash-meta-android/core/src/foss/golang/clash/rules/provider/patch_android.go
index 2bd5ffc874..7ef1df1b59 100644
--- a/clash-meta-android/core/src/foss/golang/clash/rules/provider/patch_android.go
+++ b/clash-meta-android/core/src/foss/golang/clash/rules/provider/patch_android.go
@@ -12,8 +12,8 @@ type UpdatableProvider interface {
 	UpdatedAt() time.Time
 }
 
-func (f *ruleSetProvider) UpdatedAt() time.Time {
-	return f.Fetcher.UpdatedAt
+func (rp *ruleSetProvider) UpdatedAt() time.Time {
+	return rp.Fetcher.UpdatedAt
 }
 
 func (rp *ruleSetProvider) Close() error {
diff --git a/clash-meta-android/core/src/foss/golang/clash/rules/provider/provider.go b/clash-meta-android/core/src/foss/golang/clash/rules/provider/provider.go
index adc2e44a29..6c03c6e5f3 100644
--- a/clash-meta-android/core/src/foss/golang/clash/rules/provider/provider.go
+++ b/clash-meta-android/core/src/foss/golang/clash/rules/provider/provider.go
@@ -4,23 +4,26 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"gopkg.in/yaml.v3"
 	"runtime"
 	"strings"
 	"time"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/metacubex/mihomo/common/pool"
 	"github.com/metacubex/mihomo/component/resource"
 	C "github.com/metacubex/mihomo/constant"
 	P "github.com/metacubex/mihomo/constant/provider"
 )
 
-var (
-	ruleProviders = map[string]P.RuleProvider{}
-)
+var tunnel P.Tunnel
+
+func SetTunnel(t P.Tunnel) {
+	tunnel = t
+}
 
 type ruleSetProvider struct {
-	*resource.Fetcher[any]
+	*resource.Fetcher[ruleStrategy]
 	behavior P.RuleBehavior
 	format   P.RuleFormat
 	strategy ruleStrategy
@@ -49,16 +52,6 @@ type ruleStrategy interface {
 	FinishInsert()
 }
 
-func RuleProviders() map[string]P.RuleProvider {
-	return ruleProviders
-}
-
-func SetRuleProvider(ruleProvider P.RuleProvider) {
-	if ruleProvider != nil {
-		ruleProviders[(ruleProvider).Name()] = ruleProvider
-	}
-}
-
 func (rp *ruleSetProvider) Type() P.ProviderType {
 	return P.Rule
 }
@@ -99,8 +92,8 @@ func (rp *ruleSetProvider) ShouldFindProcess() bool {
 	return rp.strategy.ShouldFindProcess()
 }
 
-func (rp *ruleSetProvider) AsRule(adaptor string) C.Rule {
-	panic("implement me")
+func (rp *ruleSetProvider) Strategy() any {
+	return rp.strategy
 }
 
 func (rp *ruleSetProvider) MarshalJSON() ([]byte, error) {
@@ -123,13 +116,15 @@ func NewRuleSetProvider(name string, behavior P.RuleBehavior, format P.RuleForma
 		format:   format,
 	}
 
-	onUpdate := func(elm interface{}) {
-		strategy := elm.(ruleStrategy)
+	onUpdate := func(strategy ruleStrategy) {
 		rp.strategy = strategy
+		tunnel.RuleUpdateCallback().Emit(rp)
 	}
 
 	rp.strategy = newStrategy(behavior, parse)
-	rp.Fetcher = resource.NewFetcher(name, interval, vehicle, func(bytes []byte) (any, error) { return rulesParse(bytes, newStrategy(behavior, parse), format) }, onUpdate)
+	rp.Fetcher = resource.NewFetcher(name, interval, vehicle, func(bytes []byte) (ruleStrategy, error) {
+		return rulesParse(bytes, newStrategy(behavior, parse), format)
+	}, onUpdate)
 
 	wrapper := &RuleSetProvider{
 		rp,
@@ -158,7 +153,7 @@ func newStrategy(behavior P.RuleBehavior, parse func(tp, payload, target string,
 
 var ErrNoPayload = errors.New("file must have a `payload` field")
 
-func rulesParse(buf []byte, strategy ruleStrategy, format P.RuleFormat) (any, error) {
+func rulesParse(buf []byte, strategy ruleStrategy, format P.RuleFormat) (ruleStrategy, error) {
 	strategy.Reset()
 
 	schema := &RulePayload{}
@@ -176,15 +171,14 @@ func rulesParse(buf []byte, strategy ruleStrategy, format P.RuleFormat) (any, er
 			line = buf[s : i+1]
 			s = i + 1
 		} else {
-			s = len(buf)              // stop loop in next step
-			if firstLineLength == 0 { // no head or only one line body
+			s = len(buf)                                      // stop loop in next step
+			if firstLineLength == 0 && format == P.YamlRule { // no head or only one line body
 				return nil, ErrNoPayload
 			}
 		}
 		var str string
 		switch format {
 		case P.TextRule:
-			firstLineLength = -1 // don't return ErrNoPayload when read last line
 			str = string(line)
 			str = strings.TrimSpace(str)
 			if len(str) == 0 {
diff --git a/clash-meta-android/core/src/foss/golang/clash/rules/provider/rule_set.go b/clash-meta-android/core/src/foss/golang/clash/rules/provider/rule_set.go
index 1d94018868..d85db80558 100644
--- a/clash-meta-android/core/src/foss/golang/clash/rules/provider/rule_set.go
+++ b/clash-meta-android/core/src/foss/golang/clash/rules/provider/rule_set.go
@@ -1,7 +1,6 @@
 package provider
 
 import (
-	"fmt"
 	C "github.com/metacubex/mihomo/constant"
 	P "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/rules/common"
@@ -11,13 +10,18 @@ type RuleSet struct {
 	*common.Base
 	ruleProviderName  string
 	adapter           string
-	ruleProvider      P.RuleProvider
 	noResolveIP       bool
 	shouldFindProcess bool
 }
 
 func (rs *RuleSet) ShouldFindProcess() bool {
-	return rs.shouldFindProcess || rs.getProviders().ShouldFindProcess()
+	if rs.shouldFindProcess {
+		return true
+	}
+	if provider, ok := rs.getProvider(); ok {
+		return provider.ShouldFindProcess()
+	}
+	return false
 }
 
 func (rs *RuleSet) RuleType() C.RuleType {
@@ -25,7 +29,10 @@ func (rs *RuleSet) RuleType() C.RuleType {
 }
 
 func (rs *RuleSet) Match(metadata *C.Metadata) (bool, string) {
-	return rs.getProviders().Match(metadata), rs.adapter
+	if provider, ok := rs.getProvider(); ok {
+		return provider.Match(metadata), rs.adapter
+	}
+	return false, ""
 }
 
 func (rs *RuleSet) Adapter() string {
@@ -33,31 +40,37 @@ func (rs *RuleSet) Adapter() string {
 }
 
 func (rs *RuleSet) Payload() string {
-	return rs.getProviders().Name()
+	if provider, ok := rs.getProvider(); ok {
+		return provider.Name()
+	}
+	return ""
 }
 
 func (rs *RuleSet) ShouldResolveIP() bool {
-	return !rs.noResolveIP && rs.getProviders().ShouldResolveIP()
-}
-func (rs *RuleSet) getProviders() P.RuleProvider {
-	if rs.ruleProvider == nil {
-		rp := RuleProviders()[rs.ruleProviderName]
-		rs.ruleProvider = rp
+	if rs.noResolveIP {
+		return false
 	}
+	if provider, ok := rs.getProvider(); ok {
+		return provider.ShouldResolveIP()
+	}
+	return false
+}
 
-	return rs.ruleProvider
+func (rs *RuleSet) ProviderNames() []string {
+	return []string{rs.ruleProviderName}
+}
+
+func (rs *RuleSet) getProvider() (P.RuleProvider, bool) {
+	pp, ok := tunnel.RuleProviders()[rs.ruleProviderName]
+	return pp, ok
 }
 
 func NewRuleSet(ruleProviderName string, adapter string, noResolveIP bool) (*RuleSet, error) {
-	rp, ok := RuleProviders()[ruleProviderName]
-	if !ok {
-		return nil, fmt.Errorf("rule set %s not found", ruleProviderName)
-	}
-	return &RuleSet{
+	rs := &RuleSet{
 		Base:             &common.Base{},
 		ruleProviderName: ruleProviderName,
 		adapter:          adapter,
-		ruleProvider:     rp,
 		noResolveIP:      noResolveIP,
-	}, nil
+	}
+	return rs, nil
 }
diff --git a/clash-meta-android/core/src/foss/golang/clash/tunnel/dns_dialer.go b/clash-meta-android/core/src/foss/golang/clash/tunnel/dns_dialer.go
new file mode 100644
index 0000000000..1839869b4a
--- /dev/null
+++ b/clash-meta-android/core/src/foss/golang/clash/tunnel/dns_dialer.go
@@ -0,0 +1,186 @@
+package tunnel
+
+// WARNING: all function in this file should only be using in dns module
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"strings"
+
+	N "github.com/metacubex/mihomo/common/net"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/resolver"
+	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/tunnel/statistic"
+)
+
+const DnsRespectRules = "RULES"
+
+type DNSDialer struct {
+	r            resolver.Resolver
+	proxyAdapter C.ProxyAdapter
+	proxyName    string
+	opts         []dialer.Option
+}
+
+func NewDNSDialer(r resolver.Resolver, proxyAdapter C.ProxyAdapter, proxyName string, opts ...dialer.Option) *DNSDialer {
+	return &DNSDialer{r: r, proxyAdapter: proxyAdapter, proxyName: proxyName, opts: opts}
+}
+
+func (d *DNSDialer) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
+	r := d.r
+	proxyName := d.proxyName
+	proxyAdapter := d.proxyAdapter
+	opts := d.opts
+	var rule C.Rule
+	metadata := &C.Metadata{
+		NetWork: C.TCP,
+		Type:    C.INNER,
+	}
+	err := metadata.SetRemoteAddress(addr) // tcp can resolve host by remote
+	if err != nil {
+		return nil, err
+	}
+	if !strings.Contains(network, "tcp") {
+		metadata.NetWork = C.UDP
+		if !metadata.Resolved() {
+			// udp must resolve host first
+			dstIP, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
+			if err != nil {
+				return nil, err
+			}
+			metadata.DstIP = dstIP
+		}
+	}
+
+	if proxyAdapter == nil && len(proxyName) != 0 {
+		if proxyName == DnsRespectRules {
+			if !metadata.Resolved() {
+				// resolve here before resolveMetadata to avoid its inner resolver.ResolveIP
+				dstIP, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
+				if err != nil {
+					return nil, err
+				}
+				metadata.DstIP = dstIP
+			}
+			proxyAdapter, rule, err = resolveMetadata(metadata)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			var ok bool
+			proxyAdapter, ok = Proxies()[proxyName]
+			if !ok {
+				opts = append(opts, dialer.WithInterface(proxyName))
+			}
+		}
+	}
+
+	if metadata.NetWork == C.TCP {
+		if proxyAdapter == nil {
+			opts = append(opts, dialer.WithResolver(r))
+			return dialer.DialContext(ctx, network, addr, opts...)
+		}
+
+		if proxyAdapter.IsL3Protocol(metadata) { // L3 proxy should resolve domain before to avoid loopback
+			if !metadata.Resolved() {
+				dstIP, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
+				if err != nil {
+					return nil, err
+				}
+				metadata.DstIP = dstIP
+			}
+			metadata.Host = "" // clear host to avoid double resolve in proxy
+		}
+
+		conn, err := proxyAdapter.DialContext(ctx, metadata, opts...)
+		if err != nil {
+			logMetadataErr(metadata, rule, proxyAdapter, err)
+			return nil, err
+		}
+		logMetadata(metadata, rule, conn)
+
+		conn = statistic.NewTCPTracker(conn, statistic.DefaultManager, metadata, rule, 0, 0, false)
+
+		return conn, nil
+	} else {
+		if proxyAdapter == nil {
+			return dialer.DialContext(ctx, network, metadata.AddrPort().String(), opts...)
+		}
+
+		if !proxyAdapter.SupportUDP() {
+			return nil, fmt.Errorf("proxy adapter [%s] UDP is not supported", proxyAdapter)
+		}
+
+		packetConn, err := proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
+		if err != nil {
+			logMetadataErr(metadata, rule, proxyAdapter, err)
+			return nil, err
+		}
+		logMetadata(metadata, rule, packetConn)
+
+		packetConn = statistic.NewUDPTracker(packetConn, statistic.DefaultManager, metadata, rule, 0, 0, false)
+
+		return N.NewBindPacketConn(packetConn, metadata.UDPAddr()), nil
+	}
+
+}
+
+func (d *DNSDialer) ListenPacket(ctx context.Context, network, addr string) (net.PacketConn, error) {
+	r := d.r
+	proxyAdapter := d.proxyAdapter
+	proxyName := d.proxyName
+	opts := d.opts
+	metadata := &C.Metadata{
+		NetWork: C.UDP,
+		Type:    C.INNER,
+	}
+	err := metadata.SetRemoteAddress(addr)
+	if err != nil {
+		return nil, err
+	}
+	if !metadata.Resolved() {
+		// udp must resolve host first
+		dstIP, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
+		if err != nil {
+			return nil, err
+		}
+		metadata.DstIP = dstIP
+	}
+
+	var rule C.Rule
+	if proxyAdapter == nil {
+		if proxyName == DnsRespectRules {
+			proxyAdapter, rule, err = resolveMetadata(metadata)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			var ok bool
+			proxyAdapter, ok = Proxies()[proxyName]
+			if !ok {
+				opts = append(opts, dialer.WithInterface(proxyName))
+			}
+		}
+	}
+
+	if proxyAdapter == nil {
+		return dialer.NewDialer(opts...).ListenPacket(ctx, network, "", metadata.AddrPort())
+	}
+
+	if !proxyAdapter.SupportUDP() {
+		return nil, fmt.Errorf("proxy adapter [%s] UDP is not supported", proxyAdapter)
+	}
+
+	packetConn, err := proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
+	if err != nil {
+		logMetadataErr(metadata, rule, proxyAdapter, err)
+		return nil, err
+	}
+	logMetadata(metadata, rule, packetConn)
+
+	packetConn = statistic.NewUDPTracker(packetConn, statistic.DefaultManager, metadata, rule, 0, 0, false)
+
+	return packetConn, nil
+}
diff --git a/clash-meta-android/core/src/foss/golang/clash/tunnel/tunnel.go b/clash-meta-android/core/src/foss/golang/clash/tunnel/tunnel.go
index 608ab2c5bd..1a6f104dc9 100644
--- a/clash-meta-android/core/src/foss/golang/clash/tunnel/tunnel.go
+++ b/clash-meta-android/core/src/foss/golang/clash/tunnel/tunnel.go
@@ -8,10 +8,12 @@ import (
 	"net/netip"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"sync"
 	"time"
 
 	N "github.com/metacubex/mihomo/common/net"
+	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/loopback"
 	"github.com/metacubex/mihomo/component/nat"
 	P "github.com/metacubex/mihomo/component/process"
@@ -49,11 +51,15 @@ var (
 	findProcessMode P.FindProcessMode
 
 	fakeIPRange netip.Prefix
+
+	ruleUpdateCallback = utils.NewCallback[provider.RuleProvider]()
 )
 
 type tunnel struct{}
 
-var Tunnel C.Tunnel = tunnel{}
+var Tunnel = tunnel{}
+var _ C.Tunnel = Tunnel
+var _ provider.Tunnel = Tunnel
 
 func (t tunnel) HandleTCPConn(conn net.Conn, metadata *C.Metadata) {
 	connCtx := icontext.NewConnContext(conn, metadata)
@@ -72,6 +78,18 @@ func (t tunnel) NatTable() C.NatTable {
 	return natTable
 }
 
+func (t tunnel) Providers() map[string]provider.ProxyProvider {
+	return providers
+}
+
+func (t tunnel) RuleProviders() map[string]provider.RuleProvider {
+	return ruleProviders
+}
+
+func (t tunnel) RuleUpdateCallback() *utils.Callback[provider.RuleProvider] {
+	return ruleUpdateCallback
+}
+
 func OnSuspend() {
 	status.Store(Suspend)
 }
@@ -386,43 +404,18 @@ func handleUDPConn(packet C.PacketAdapter) {
 		rawPc, err := retry(ctx, func(ctx context.Context) (C.PacketConn, error) {
 			return proxy.ListenPacketContext(ctx, metadata.Pure())
 		}, func(err error) {
-			if rule == nil {
-				log.Warnln(
-					"[UDP] dial %s %s --> %s error: %s",
-					proxy.Name(),
-					metadata.SourceDetail(),
-					metadata.RemoteAddress(),
-					err.Error(),
-				)
-			} else {
-				log.Warnln("[UDP] dial %s (match %s/%s) %s --> %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.SourceDetail(), metadata.RemoteAddress(), err.Error())
-			}
+			logMetadataErr(metadata, rule, proxy, err)
 		})
 		if err != nil {
 			return
 		}
+		logMetadata(metadata, rule, rawPc)
 
 		pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule, 0, 0, true)
 
-		switch true {
-		case metadata.SpecialProxy != "":
-			log.Infoln("[UDP] %s --> %s using %s", metadata.SourceDetail(), metadata.RemoteAddress(), metadata.SpecialProxy)
-		case rule != nil:
-			if rule.Payload() != "" {
-				log.Infoln("[UDP] %s --> %s match %s using %s", metadata.SourceDetail(), metadata.RemoteAddress(), fmt.Sprintf("%s(%s)", rule.RuleType().String(), rule.Payload()), rawPc.Chains().String())
-				if rawPc.Chains().Last() == "REJECT-DROP" {
-					pc.Close()
-					return
-				}
-			} else {
-				log.Infoln("[UDP] %s --> %s match %s using %s", metadata.SourceDetail(), metadata.RemoteAddress(), rule.Payload(), rawPc.Chains().String())
-			}
-		case mode == Global:
-			log.Infoln("[UDP] %s --> %s using GLOBAL", metadata.SourceDetail(), metadata.RemoteAddress())
-		case mode == Direct:
-			log.Infoln("[UDP] %s --> %s using DIRECT", metadata.SourceDetail(), metadata.RemoteAddress())
-		default:
-			log.Infoln("[UDP] %s --> %s doesn't match any rule using DIRECT", metadata.SourceDetail(), metadata.RemoteAddress())
+		if rawPc.Chains().Last() == "REJECT-DROP" {
+			pc.Close()
+			return
 		}
 
 		oAddrPort := metadata.AddrPort()
@@ -539,48 +532,18 @@ func handleTCPConn(connCtx C.ConnContext) {
 		}
 		return
 	}, func(err error) {
-		if rule == nil {
-			log.Warnln(
-				"[TCP] dial %s %s --> %s error: %s",
-				proxy.Name(),
-				metadata.SourceDetail(),
-				metadata.RemoteAddress(),
-				err.Error(),
-			)
-		} else {
-			log.Warnln("[TCP] dial %s (match %s/%s) %s --> %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.SourceDetail(), metadata.RemoteAddress(), err.Error())
-		}
+		logMetadataErr(metadata, rule, proxy, err)
 	})
 	if err != nil {
 		return
 	}
+	logMetadata(metadata, rule, remoteConn)
 
 	remoteConn = statistic.NewTCPTracker(remoteConn, statistic.DefaultManager, metadata, rule, 0, int64(peekLen), true)
 	defer func(remoteConn C.Conn) {
 		_ = remoteConn.Close()
 	}(remoteConn)
 
-	switch true {
-	case metadata.SpecialProxy != "":
-		log.Infoln("[TCP] %s --> %s using %s", metadata.SourceDetail(), metadata.RemoteAddress(), metadata.SpecialProxy)
-	case rule != nil:
-		if rule.Payload() != "" {
-			log.Infoln("[TCP] %s --> %s match %s using %s", metadata.SourceDetail(), metadata.RemoteAddress(), fmt.Sprintf("%s(%s)", rule.RuleType().String(), rule.Payload()), remoteConn.Chains().String())
-		} else {
-			log.Infoln("[TCP] %s --> %s match %s using %s", metadata.SourceDetail(), metadata.RemoteAddress(), rule.RuleType().String(), remoteConn.Chains().String())
-		}
-	case mode == Global:
-		log.Infoln("[TCP] %s --> %s using GLOBAL", metadata.SourceDetail(), metadata.RemoteAddress())
-	case mode == Direct:
-		log.Infoln("[TCP] %s --> %s using DIRECT", metadata.SourceDetail(), metadata.RemoteAddress())
-	default:
-		log.Infoln(
-			"[TCP] %s --> %s doesn't match any rule using DIRECT",
-			metadata.SourceDetail(),
-			metadata.RemoteAddress(),
-		)
-	}
-
 	_ = conn.SetReadDeadline(time.Now()) // stop unfinished peek
 	peekMutex.Lock()
 	defer peekMutex.Unlock()
@@ -588,6 +551,33 @@ func handleTCPConn(connCtx C.ConnContext) {
 	handleSocket(conn, remoteConn)
 }
 
+func logMetadataErr(metadata *C.Metadata, rule C.Rule, proxy C.ProxyAdapter, err error) {
+	if rule == nil {
+		log.Warnln("[%s] dial %s %s --> %s error: %s", strings.ToUpper(metadata.NetWork.String()), proxy.Name(), metadata.SourceDetail(), metadata.RemoteAddress(), err.Error())
+	} else {
+		log.Warnln("[%s] dial %s (match %s/%s) %s --> %s error: %s", strings.ToUpper(metadata.NetWork.String()), proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.SourceDetail(), metadata.RemoteAddress(), err.Error())
+	}
+}
+
+func logMetadata(metadata *C.Metadata, rule C.Rule, remoteConn C.Connection) {
+	switch {
+	case metadata.SpecialProxy != "":
+		log.Infoln("[%s] %s --> %s using %s", strings.ToUpper(metadata.NetWork.String()), metadata.SourceDetail(), metadata.RemoteAddress(), metadata.SpecialProxy)
+	case rule != nil:
+		if rule.Payload() != "" {
+			log.Infoln("[%s] %s --> %s match %s using %s", strings.ToUpper(metadata.NetWork.String()), metadata.SourceDetail(), metadata.RemoteAddress(), fmt.Sprintf("%s(%s)", rule.RuleType().String(), rule.Payload()), remoteConn.Chains().String())
+		} else {
+			log.Infoln("[%s] %s --> %s match %s using %s", strings.ToUpper(metadata.NetWork.String()), metadata.SourceDetail(), metadata.RemoteAddress(), rule.RuleType().String(), remoteConn.Chains().String())
+		}
+	case mode == Global:
+		log.Infoln("[%s] %s --> %s using GLOBAL", strings.ToUpper(metadata.NetWork.String()), metadata.SourceDetail(), metadata.RemoteAddress())
+	case mode == Direct:
+		log.Infoln("[%s] %s --> %s using DIRECT", strings.ToUpper(metadata.NetWork.String()), metadata.SourceDetail(), metadata.RemoteAddress())
+	default:
+		log.Infoln("[%s] %s --> %s doesn't match any rule using %s", strings.ToUpper(metadata.NetWork.String()), metadata.SourceDetail(), metadata.RemoteAddress(), remoteConn.Chains().Last())
+	}
+}
+
 func shouldResolveIP(rule C.Rule, metadata *C.Metadata) bool {
 	return rule.ShouldResolveIP() && metadata.Host != "" && !metadata.DstIP.IsValid()
 }
diff --git a/clash-meta-android/core/src/foss/golang/go.mod b/clash-meta-android/core/src/foss/golang/go.mod
index 7694c1dba9..8e8d0e9788 100644
--- a/clash-meta-android/core/src/foss/golang/go.mod
+++ b/clash-meta-android/core/src/foss/golang/go.mod
@@ -35,10 +35,10 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -47,17 +47,17 @@ require (
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
 	github.com/metacubex/mihomo v1.7.0 // indirect
-	github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22 // indirect
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
 	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
-	github.com/miekg/dns v1.1.59 // indirect
+	github.com/miekg/dns v1.1.61 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
@@ -65,18 +65,19 @@ require (
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
-	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
-	github.com/sagernet/sing v0.3.8 // indirect
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
+	github.com/sagernet/sing v0.5.0-alpha.10 // indirect
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
 	github.com/samber/lo v1.39.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.4 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -85,28 +86,28 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )
 
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1
+replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2
 
 replace cfa => ../../main/golang
 
diff --git a/clash-meta-android/core/src/foss/golang/go.sum b/clash-meta-android/core/src/foss/golang/go.sum
index 1cfaefffc9..206a150909 100644
--- a/clash-meta-android/core/src/foss/golang/go.sum
+++ b/clash-meta-android/core/src/foss/golang/go.sum
@@ -63,7 +63,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -72,16 +71,16 @@ github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -98,30 +97,30 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22 h1:dKYoWnrB5bbCMoMQit4INUDKiDcjc0Azsm3GltYf9Pw=
-github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1 h1:7hDHLTmjgtRoAp59STwPQpe5Pinwi4cWex+FB3Ohvco=
-github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2 h1:N5tidgg/FRmkgPw/AjRwhLUinKDx/ODCSbvv9xqRoLM=
+github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
 github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
 github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
 github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414 h1:IPxTZgQV6fVUBS8tozLMSFPHV3imYc/NbuGfp0bLQq0=
-github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e h1:o+zohxPRo45P35fS9u1zfdBgr+L/7S0ObGU6YjbVBIc=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -143,8 +142,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
+github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -152,8 +151,10 @@ github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
@@ -164,12 +165,11 @@ github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2F
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
 github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
@@ -199,8 +199,8 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -213,18 +213,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -243,23 +243,21 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
diff --git a/clash-meta-android/core/src/main/golang/go.mod b/clash-meta-android/core/src/main/golang/go.mod
index 57c23c4e00..d2676f4ff5 100644
--- a/clash-meta-android/core/src/main/golang/go.mod
+++ b/clash-meta-android/core/src/main/golang/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/dlclark/regexp2 v1.11.0
 	github.com/metacubex/mihomo v1.7.0
-	github.com/miekg/dns v1.1.59
+	github.com/miekg/dns v1.1.61
 	github.com/oschwald/maxminddb-golang v1.12.0
 	golang.org/x/sync v0.7.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -14,7 +14,7 @@ require (
 
 replace github.com/metacubex/mihomo => ../../foss/golang/clash
 
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1
+replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2
 
 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
@@ -43,10 +43,10 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -54,14 +54,14 @@ require (
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22 // indirect
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
 	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -70,18 +70,19 @@ require (
 	github.com/openacid/low v0.1.21 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
-	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
-	github.com/sagernet/sing v0.3.8 // indirect
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
+	github.com/sagernet/sing v0.5.0-alpha.10 // indirect
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
 	github.com/samber/lo v1.39.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.4 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -90,21 +91,21 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )
diff --git a/clash-meta-android/core/src/main/golang/go.sum b/clash-meta-android/core/src/main/golang/go.sum
index 1cfaefffc9..206a150909 100644
--- a/clash-meta-android/core/src/main/golang/go.sum
+++ b/clash-meta-android/core/src/main/golang/go.sum
@@ -63,7 +63,6 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -72,16 +71,16 @@ github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -98,30 +97,30 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22 h1:dKYoWnrB5bbCMoMQit4INUDKiDcjc0Azsm3GltYf9Pw=
-github.com/metacubex/quic-go v0.45.1-0.20240607133845-b24f02b35a22/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1 h1:7hDHLTmjgtRoAp59STwPQpe5Pinwi4cWex+FB3Ohvco=
-github.com/metacubex/sing v0.0.0-20240518125217-e63d65a914d1/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2 h1:N5tidgg/FRmkgPw/AjRwhLUinKDx/ODCSbvv9xqRoLM=
+github.com/metacubex/sing v0.0.0-20240617013425-3e3bd9dab6a2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
 github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
 github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
 github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414 h1:IPxTZgQV6fVUBS8tozLMSFPHV3imYc/NbuGfp0bLQq0=
-github.com/metacubex/sing-tun v0.2.7-0.20240521155100-e8316a45a414/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e h1:o+zohxPRo45P35fS9u1zfdBgr+L/7S0ObGU6YjbVBIc=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -143,8 +142,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
+github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -152,8 +151,10 @@ github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
@@ -164,12 +165,11 @@ github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2F
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
 github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
@@ -199,8 +199,8 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -213,18 +213,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -243,23 +243,21 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
diff --git a/clash-nyanpasu/backend/Cargo.lock b/clash-nyanpasu/backend/Cargo.lock
index 07c0c560f9..9e67132eae 100644
--- a/clash-nyanpasu/backend/Cargo.lock
+++ b/clash-nyanpasu/backend/Cargo.lock
@@ -895,6 +895,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "port_scanner",
+ "rand 0.8.5",
  "redb",
  "reqwest",
  "rfd",
@@ -5177,9 +5178,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.118"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
+checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
 dependencies = [
  "indexmap 2.2.6",
  "itoa 1.0.11",
diff --git a/clash-nyanpasu/backend/tauri/Cargo.toml b/clash-nyanpasu/backend/tauri/Cargo.toml
index b8001a51d3..f752c5fede 100644
--- a/clash-nyanpasu/backend/tauri/Cargo.toml
+++ b/clash-nyanpasu/backend/tauri/Cargo.toml
@@ -99,6 +99,7 @@ derive_builder = "0.20"
 test-log = { version = "0.2.16", features = ["trace"] }
 md-5 = "0.10.6"
 hex = "0.4"
+rand = "0.8"
 
 [target.'cfg(windows)'.dependencies]
 deelevate = "0.2.0"
diff --git a/clash-nyanpasu/backend/tauri/src/cmds.rs b/clash-nyanpasu/backend/tauri/src/cmds.rs
index 44114562b3..19d9ab5a9d 100644
--- a/clash-nyanpasu/backend/tauri/src/cmds.rs
+++ b/clash-nyanpasu/backend/tauri/src/cmds.rs
@@ -266,7 +266,7 @@ pub fn save_window_size_state() -> CmdResult<()> {
 
 #[tauri::command]
 pub async fn fetch_latest_core_versions() -> CmdResult<ManifestVersionLatest> {
-    let mut updater = updater::Updater::global().write().await; // It is intended to block here
+    let mut updater = updater::UpdaterManager::global().write().await; // It is intended to block here
     wrap_err!(updater.fetch_latest().await)?;
     Ok(updater.get_latest_versions())
 }
@@ -305,16 +305,26 @@ pub async fn collect_logs() -> CmdResult {
 }
 
 #[tauri::command]
-pub async fn update_core(core_type: nyanpasu::ClashCore) -> CmdResult {
+pub async fn update_core(core_type: nyanpasu::ClashCore) -> CmdResult<usize> {
     wrap_err!(
-        updater::Updater::global()
-            .read()
+        updater::UpdaterManager::global()
+            .write()
             .await
             .update_core(&core_type)
             .await
     )
 }
 
+#[tauri::command]
+pub async fn inspect_updater(updater_id: usize) -> CmdResult<updater::UpdaterSummary> {
+    let updater = wrap_err!(updater::UpdaterManager::global()
+        .read()
+        .await
+        .inspect_updater(updater_id)
+        .ok_or(anyhow::anyhow!("updater is not exist")))?;
+    Ok(updater)
+}
+
 #[tauri::command]
 pub async fn clash_api_get_proxy_delay(
     name: String,
diff --git a/clash-nyanpasu/backend/tauri/src/core/updater.rs b/clash-nyanpasu/backend/tauri/src/core/updater.rs
deleted file mode 100644
index f739ed1d7c..0000000000
--- a/clash-nyanpasu/backend/tauri/src/core/updater.rs
+++ /dev/null
@@ -1,384 +0,0 @@
-use std::{collections::HashMap, io::Cursor, path::Path, sync::OnceLock};
-
-use super::CoreManager;
-use crate::config::nyanpasu::ClashCore;
-use anyhow::{anyhow, Result};
-use gunzip::Decompressor;
-use log::{debug, warn};
-use runas::Command as RunasCommand;
-use serde::{Deserialize, Serialize};
-#[cfg(target_family = "unix")]
-use std::os::unix::fs::PermissionsExt;
-use tempfile::{tempdir, TempDir};
-use tokio::{join, sync::RwLock, task::spawn_blocking};
-use zip::ZipArchive;
-
-pub struct Updater {
-    manifest_version: ManifestVersion,
-    mirror: String,
-}
-
-impl Default for Updater {
-    fn default() -> Self {
-        Self {
-            manifest_version: ManifestVersion::default(),
-            mirror: "https://mirror.ghproxy.com/github.com".to_string(),
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct ManifestVersion {
-    manifest_version: u64,
-    latest: ManifestVersionLatest,
-    arch_template: ArchTemplate,
-    updated_at: String,
-}
-
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct ManifestVersionLatest {
-    mihomo: String,
-    mihomo_alpha: String,
-    clash_rs: String,
-    clash_premium: String,
-}
-
-#[derive(Deserialize, Serialize, Default, Clone, Debug)]
-pub struct ArchTemplate {
-    mihomo: HashMap<String, String>,
-    mihomo_alpha: HashMap<String, String>,
-    clash_rs: HashMap<String, String>,
-    clash_premium: HashMap<String, String>,
-}
-
-impl Default for ManifestVersion {
-    fn default() -> Self {
-        Self {
-            manifest_version: 0,
-            latest: ManifestVersionLatest::default(),
-            arch_template: ArchTemplate::default(),
-            updated_at: "".to_string(),
-        }
-    }
-}
-
-impl Default for ManifestVersionLatest {
-    fn default() -> Self {
-        Self {
-            mihomo: "".to_string(),
-            mihomo_alpha: "".to_string(),
-            clash_rs: "".to_string(),
-            clash_premium: "".to_string(),
-        }
-    }
-}
-
-fn get_arch() -> Result<&'static str> {
-    let env = {
-        let arch = std::env::consts::ARCH;
-        let os = std::env::consts::OS;
-        (arch, os)
-    };
-
-    match env {
-        ("x86_64", "macos") => Ok("darwin-x64"),
-        ("x86_64", "linux") => Ok("linux-amd64"),
-        ("x86_64", "windows") => Ok("windows-x86_64"),
-        ("aarch64", "macos") => Ok("darwin-arm64"),
-        ("aarch64", "linux") => Ok("linux-aarch64"),
-        // ("aarch64", "windows") => Ok("windows-arm64"),
-        _ => anyhow::bail!("unsupported platform"),
-    }
-}
-
-impl Updater {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn global() -> &'static RwLock<Self> {
-        static INSTANCE: OnceLock<RwLock<Updater>> = OnceLock::new();
-        INSTANCE.get_or_init(|| RwLock::new(Updater::new()))
-    }
-
-    pub fn get_latest_versions(&self) -> ManifestVersionLatest {
-        self.manifest_version.latest.clone()
-    }
-
-    pub async fn fetch_latest(&mut self) -> Result<()> {
-        let latest = get_latest_version_manifest(self.mirror.as_str());
-        let mihomo_alpha_version = self.get_mihomo_alpha_version();
-        let (latest, mihomo_alpha_version) = join!(latest, mihomo_alpha_version);
-        log::debug!("latest version: {:?}", latest);
-        self.manifest_version = latest?;
-        log::debug!("mihomo alpha version: {:?}", mihomo_alpha_version);
-        self.manifest_version.latest.mihomo_alpha = mihomo_alpha_version?;
-        Ok(())
-    }
-
-    async fn get_mihomo_alpha_version(&self) -> Result<String> {
-        let client = crate::utils::candy::get_reqwest_client()?;
-        let url = format!(
-            "{}/{}",
-            self.mirror.as_str(),
-            "MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt"
-        );
-        let res = client.get(url).send().await?;
-        let status_code = res.status();
-        if !status_code.is_success() {
-            anyhow::bail!(
-                "failed to get mihomo alpha version: response status is {}, expected 200",
-                status_code
-            );
-        }
-        Ok(res.text().await?.trim().to_string())
-    }
-
-    pub async fn update_core(&self, core_type: &ClashCore) -> Result<()> {
-        let current_core = crate::config::Config::verge()
-            .latest()
-            .clash_core
-            .clone()
-            .unwrap_or_default();
-        let tmp_dir = tempdir()?;
-        // 1. download core
-        debug!("downloading core");
-        let artifact = self.download_core(core_type, &tmp_dir).await?;
-        // 2. decompress core
-        debug!("decompressing core");
-        let core_type_ref = core_type.clone();
-        let tmp_dir_path = tmp_dir.path().to_owned();
-        let artifact_ref = artifact.clone();
-        spawn_blocking(move || {
-            decompress_and_set_permission(&core_type_ref, &tmp_dir_path, &artifact_ref)
-        })
-        .await??;
-        // 3. if core is used, close it
-        if current_core == *core_type {
-            tokio::task::spawn_blocking(move || CoreManager::global().stop_core()).await??;
-        }
-        // 4. replace core
-        #[cfg(target_os = "windows")]
-        let target_core = format!("{}.exe", core_type);
-        #[cfg(not(target_os = "windows"))]
-        let target_core = core_type.clone().to_string();
-        let core_dir = tauri::utils::platform::current_exe()?;
-        let core_dir = core_dir.parent().ok_or(anyhow!("failed to get core dir"))?;
-        let target_core = core_dir.join(target_core);
-        debug!("copying core to {:?}", target_core);
-        let tmp_core_path = tmp_dir.path().join(core_type.clone().to_string());
-        match std::fs::copy(tmp_core_path.clone(), target_core.clone()) {
-            Ok(_) => {}
-            Err(err) => {
-                warn!(
-                    "failed to copy core: {}, trying to use elevated permission to copy and override core",
-                    err
-                );
-                let mut target_core_str = target_core.to_str().unwrap().to_string();
-                if target_core_str.starts_with("\\\\?\\") {
-                    target_core_str = target_core_str[4..].to_string();
-                }
-                debug!("tmp core path: {:?}", tmp_core_path);
-                debug!("target core path: {:?}", target_core_str);
-                // 防止 UAC 弹窗堵塞主线程
-                let status_code = tokio::task::spawn_blocking(move || {
-                    #[cfg(target_os = "windows")]
-                    {
-                        RunasCommand::new("cmd")
-                            .args(&[
-                                "/C",
-                                "copy",
-                                "/Y",
-                                tmp_core_path.to_str().unwrap(),
-                                &target_core_str,
-                            ])
-                            .status()
-                    }
-                    #[cfg(not(target_os = "windows"))]
-                    {
-                        RunasCommand::new("cp")
-                            .args(&["-f", tmp_core_path.to_str().unwrap(), &target_core_str])
-                            .status()
-                    }
-                })
-                .await??;
-                if !status_code.success() {
-                    anyhow::bail!("failed to copy core: {}", status_code);
-                }
-            }
-        };
-
-        // 5. if core is used before, restart it
-        if current_core == *core_type {
-            CoreManager::global().run_core().await?;
-        }
-        Ok(())
-    }
-
-    async fn download_core(&self, core_type: &ClashCore, tmp_dir: &TempDir) -> Result<String> {
-        let arch = get_arch()?;
-        debug!("download core: {} in arch {}", core_type, arch);
-        let version_manifest = &self.manifest_version;
-        let (artifact, core_type_meta) = match core_type {
-            ClashCore::ClashPremium => (
-                version_manifest
-                    .arch_template
-                    .clash_premium
-                    .get(arch)
-                    .ok_or(anyhow!("invalid arch"))?
-                    .clone()
-                    .replace("{}", &version_manifest.latest.clash_premium),
-                CoreTypeMeta::ClashPremium(version_manifest.latest.clash_premium.clone()),
-            ),
-            ClashCore::Mihomo => (
-                version_manifest
-                    .arch_template
-                    .mihomo
-                    .get(arch)
-                    .ok_or(anyhow!("invalid arch"))?
-                    .clone()
-                    .replace("{}", &version_manifest.latest.mihomo),
-                CoreTypeMeta::Mihomo(version_manifest.latest.mihomo.clone()),
-            ),
-            ClashCore::MihomoAlpha => (
-                version_manifest
-                    .arch_template
-                    .mihomo_alpha
-                    .get(arch)
-                    .ok_or(anyhow!("invalid arch"))?
-                    .clone()
-                    .replace("{}", &version_manifest.latest.mihomo_alpha),
-                CoreTypeMeta::MihomoAlpha,
-            ),
-            ClashCore::ClashRs => (
-                version_manifest
-                    .arch_template
-                    .clash_rs
-                    .get(arch)
-                    .ok_or(anyhow!("invalid arch"))?
-                    .clone()
-                    .replace("{}", &version_manifest.latest.clash_rs),
-                CoreTypeMeta::ClashRs(version_manifest.latest.clash_rs.clone()),
-            ),
-        };
-        debug!("artifact: {}", artifact);
-        let url = format!(
-            "{}/{}",
-            &self.mirror,
-            get_download_path(core_type_meta, artifact.clone())
-        );
-        debug!("url: {}", url);
-        let file_path = tmp_dir.path().join(&artifact);
-        debug!("file path: {:?}", file_path);
-        let mut dst = std::fs::File::create(&file_path)?;
-
-        let client = crate::utils::candy::get_reqwest_client()?;
-        let res = client.get(url).send().await?;
-        let status_code = res.status();
-        if !status_code.is_success() {
-            anyhow::bail!(
-                "failed to download core: response status is {}, expected 200",
-                status_code
-            );
-        }
-        let mut buff = Cursor::new(res.bytes().await?);
-        std::io::copy(&mut buff, &mut dst)?;
-        Ok(artifact)
-    }
-}
-
-fn decompress_and_set_permission(
-    core_type: &ClashCore,
-    tmp_path: &Path,
-    fname: &str,
-) -> Result<()> {
-    let mut buff = Vec::<u8>::new();
-    let path = tmp_path.join(fname);
-    debug!("decompressing file: {:?}", path);
-    let mut tmp_file = std::fs::File::open(path)?;
-    debug!("file size: {}", tmp_file.metadata()?.len());
-    match fname {
-        fname if fname.ends_with(".gz") => {
-            debug!("decompressing gz file");
-            let mut decompressor = Decompressor::new(tmp_file, true);
-            std::io::copy(&mut decompressor, &mut buff)?;
-        }
-        fname if fname.ends_with(".zip") => {
-            debug!("decompressing zip file");
-            let mut archive = ZipArchive::new(tmp_file)?;
-            let len = archive.len();
-            for i in 0..len {
-                let mut file = archive.by_index(i)?;
-                let file_name = file.name();
-                debug!("Filename: {}", file.name());
-                // TODO: 在 enum 做点魔法
-                if file_name.contains("mihomo") || file_name.contains("clash") {
-                    debug!("extract file: {}", file_name);
-                    debug!("extract file size: {}", file.size());
-                    std::io::copy(&mut file, &mut buff)?;
-                    break;
-                }
-                if i == len - 1 {
-                    anyhow::bail!("failed to find core file in a zip archive");
-                }
-            }
-        }
-        _ => {
-            debug!("directly copying file");
-            std::io::copy(&mut tmp_file, &mut buff)?;
-        }
-    };
-    let tmp_core = tmp_path.join(core_type.clone().to_string());
-    debug!("writing core to {:?} ({} bytes)", tmp_core, buff.len());
-    let mut core_file = std::fs::File::create(&tmp_core)?;
-    std::io::copy(&mut buff.as_slice(), &mut core_file)?;
-    #[cfg(target_family = "unix")]
-    {
-        std::fs::set_permissions(&tmp_core, std::fs::Permissions::from_mode(0o755))?;
-    }
-    Ok(())
-}
-
-pub async fn get_latest_version_manifest(mirror: &str) -> Result<ManifestVersion> {
-    let url = format!(
-        "{}/LibNyanpasu/clash-nyanpasu/raw/main/manifest/version.json",
-        mirror
-    );
-    log::debug!("{}", url);
-    let client = crate::utils::candy::get_reqwest_client()?;
-    let res = client.get(url).send().await?;
-    let status_code = res.status();
-    if !status_code.is_success() {
-        anyhow::bail!(
-            "failed to get latest version manifest: response status is {}, expected 200",
-            status_code
-        );
-    }
-    Ok(res.json::<ManifestVersion>().await?)
-}
-
-enum CoreTypeMeta {
-    ClashPremium(String),
-    Mihomo(String),
-    MihomoAlpha,
-    ClashRs(String),
-}
-
-fn get_download_path(core_type: CoreTypeMeta, artifact: String) -> String {
-    match core_type {
-        CoreTypeMeta::Mihomo(tag) => {
-            format!("MetaCubeX/mihomo/releases/download/{}/{}", tag, artifact)
-        }
-        CoreTypeMeta::MihomoAlpha => format!(
-            "MetaCubeX/mihomo/releases/download/Prerelease-Alpha/{}",
-            artifact
-        ),
-        CoreTypeMeta::ClashRs(tag) => {
-            format!("Watfaq/clash-rs/releases/download/{}/{}", tag, artifact)
-        }
-        CoreTypeMeta::ClashPremium(tag) => format!(
-            "zhongfly/Clash-premium-backup/releases/download/{}/{}",
-            tag, artifact
-        ),
-    }
-}
diff --git a/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs b/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs
new file mode 100644
index 0000000000..d39225aa8a
--- /dev/null
+++ b/clash-nyanpasu/backend/tauri/src/core/updater/instance.rs
@@ -0,0 +1,341 @@
+use super::shared::{self, CoreTypeMeta};
+use crate::{
+    config::nyanpasu::ClashCore,
+    core::CoreManager,
+    utils::downloader::{DownloadStatus, Downloader, DownloaderBuilder, DownloaderState},
+};
+use anyhow::anyhow;
+use runas::Command as RunasCommand;
+use serde::Serialize;
+#[cfg(target_family = "unix")]
+use std::os::unix::fs::PermissionsExt;
+use std::sync::Arc;
+use tempfile::TempDir;
+use tokio::sync::Mutex;
+
+#[derive(Debug, Clone, Serialize, Default)]
+pub enum UpdaterState {
+    #[default]
+    Idle,
+    Downloading,
+    Decompressing,
+    Replacing,
+    Restarting,
+    Done,
+    Failed(String),
+}
+
+type DownloaderWithDynCallback = Downloader<Box<dyn Fn(DownloaderState) + Send + Sync>>;
+
+pub(super) struct Updater {
+    id: usize,
+    temp_dir: TempDir,
+    core_type: ClashCore,
+    artifact: String,
+    inner: parking_lot::RwLock<UpdaterInner>,
+    rx: Mutex<tokio::sync::mpsc::Receiver<DownloaderState>>,
+    downloader: Arc<DownloaderWithDynCallback>,
+}
+
+struct UpdaterInner {
+    state: UpdaterState,
+}
+
+#[derive(Debug, Serialize)]
+pub struct UpdaterSummary {
+    pub id: usize,
+    pub state: UpdaterState,
+    pub downloader: DownloadStatus,
+}
+
+pub(super) struct UpdaterBuilder {
+    client: Option<reqwest::Client>,
+    core_type: Option<ClashCore>,
+    mirror: Option<String>,
+    artifact: Option<String>,
+    tag: Option<CoreTypeMeta>,
+}
+
+impl UpdaterBuilder {
+    pub fn new() -> Self {
+        Self {
+            client: None,
+            core_type: None,
+            mirror: None,
+            artifact: None,
+            tag: None,
+        }
+    }
+
+    pub fn set_client(mut self, client: reqwest::Client) -> Self {
+        self.client = Some(client);
+        self
+    }
+
+    pub fn set_core_type(mut self, core_type: ClashCore) -> Self {
+        self.core_type = Some(core_type);
+        self
+    }
+
+    pub fn set_artifact(mut self, artifact: String) -> Self {
+        self.artifact = Some(artifact);
+        self
+    }
+
+    pub fn set_tag(mut self, tag: CoreTypeMeta) -> Self {
+        self.tag = Some(tag);
+        self
+    }
+
+    pub fn set_mirror(mut self, mirror: String) -> Self {
+        self.mirror = Some(mirror);
+        self
+    }
+
+    pub async fn build(self) -> anyhow::Result<Updater> {
+        let client = self.client.ok_or(anyhow::anyhow!("client is required"))?;
+        let core_type = self
+            .core_type
+            .ok_or(anyhow::anyhow!("core_type is required"))?;
+        let artifact = self
+            .artifact
+            .ok_or(anyhow::anyhow!("artifact is required"))?;
+        let tag = self.tag.ok_or(anyhow::anyhow!("tag is required"))?;
+        let mirror = self.mirror.ok_or(anyhow::anyhow!("mirror is required"))?;
+
+        let temp_dir = TempDir::new()?;
+        let inner = UpdaterInner {
+            state: UpdaterState::Idle,
+        };
+
+        // setup downloader
+        let download_path = shared::get_download_path(tag, &artifact);
+        let mut download_url = url::Url::parse("https://github.com")?;
+        download_url.set_path(&download_path);
+        let download_url = crate::utils::candy::parse_gh_url(&mirror, download_url.as_str())?;
+        let file = tokio::fs::File::create(temp_dir.path().join(&artifact)).await?;
+        let (tx, rx) = tokio::sync::mpsc::channel::<DownloaderState>(1);
+        let callback: Box<dyn Fn(DownloaderState) + Send + Sync> = Box::new(move |state| {
+            let tx = tx.clone();
+            tokio::spawn(async move {
+                if let Err(e) = tx.send(state).await {
+                    tracing::warn!("failed to send downloader state: {}", e);
+                }
+            });
+        });
+        let downloader = Arc::new(
+            DownloaderBuilder::new()
+                .set_client(client)
+                .set_url(download_url)?
+                .set_file(file)
+                .set_event_callback(callback)
+                .build()?,
+        );
+        Ok(Updater {
+            id: rand::random(),
+            temp_dir,
+            core_type,
+            inner: parking_lot::RwLock::new(inner),
+            artifact,
+            rx: Mutex::new(rx),
+            downloader,
+        })
+    }
+}
+
+impl Updater {
+    fn dispatch_state(&self, state: UpdaterState) {
+        let mut inner = self.inner.write();
+        inner.state = state;
+    }
+
+    async fn decompress_and_set_premission(&self) -> anyhow::Result<()> {
+        self.dispatch_state(UpdaterState::Decompressing);
+        let path = self.temp_dir.path().join(&self.artifact);
+        tracing::debug!("decompressing file: {:?}", path);
+        let mut tmp_file = std::fs::File::open(path)?;
+        tracing::debug!("file size: {}", tmp_file.metadata()?.len());
+        let artifact = self.artifact.clone();
+        let buff = tokio::task::spawn_blocking(move || {
+            let mut buff = Vec::<u8>::new();
+            match artifact {
+                fname if fname.ends_with(".gz") => {
+                    tracing::debug!("decompressing gz file");
+                    let mut decompressor = gunzip::Decompressor::new(tmp_file, true);
+                    std::io::copy(&mut decompressor, &mut buff)?;
+                }
+                fname if fname.ends_with(".zip") => {
+                    tracing::debug!("decompressing zip file");
+                    let mut archive = zip::ZipArchive::new(tmp_file)?;
+                    let len = archive.len();
+                    for i in 0..len {
+                        let mut file = archive.by_index(i)?;
+                        let file_name = file.name();
+                        tracing::debug!("Filename: {}", file.name());
+                        // TODO: 在 enum 做点魔法
+                        if file_name.contains("mihomo") || file_name.contains("clash") {
+                            tracing::debug!("extract file: {}", file_name);
+                            tracing::debug!("extract file size: {}", file.size());
+                            std::io::copy(&mut file, &mut buff)?;
+                            break;
+                        }
+                        if i == len - 1 {
+                            anyhow::bail!("failed to find core file in a zip archive");
+                        }
+                    }
+                }
+                _ => {
+                    tracing::debug!("directly copying file");
+                    std::io::copy(&mut tmp_file, &mut buff)?;
+                }
+            };
+            Ok::<_, anyhow::Error>(buff)
+        })
+        .await??;
+        let tmp_core = self.temp_dir.path().join(self.core_type.to_string());
+        tracing::debug!("writing core to {:?} ({} bytes)", tmp_core, buff.len());
+        let mut core_file = tokio::fs::File::create(&tmp_core).await?;
+        tokio::io::copy(&mut buff.as_slice(), &mut core_file).await?;
+        #[cfg(target_family = "unix")]
+        {
+            std::fs::set_permissions(&tmp_core, std::fs::Permissions::from_mode(0o755))?;
+        }
+        Ok(())
+    }
+
+    async fn replace_core(&self) -> anyhow::Result<()> {
+        self.dispatch_state(UpdaterState::Replacing);
+        let current_core = crate::config::Config::verge()
+            .latest()
+            .clash_core
+            .clone()
+            .unwrap_or_default();
+        if current_core == self.core_type {
+            tokio::task::spawn_blocking(move || CoreManager::global().stop_core()).await??;
+            return Ok(());
+        }
+        #[cfg(target_os = "windows")]
+        let target_core = format!("{}.exe", self.core_type);
+        #[cfg(not(target_os = "windows"))]
+        let target_core = self.core_type.clone().to_string();
+        let core_dir = tauri::utils::platform::current_exe()?;
+        let core_dir = core_dir.parent().ok_or(anyhow!("failed to get core dir"))?;
+        let target_core = core_dir.join(target_core);
+        tracing::debug!("copying core to {:?}", target_core);
+        let tmp_core_path = self.temp_dir.path().join(&self.artifact);
+        match tokio::fs::copy(tmp_core_path.clone(), target_core.clone()).await {
+            Ok(_) => {}
+            Err(err) => {
+                tracing::warn!(
+                    "failed to copy core: {}, trying to use elevated permission to copy and override core",
+                    err
+                );
+                let mut target_core_str = target_core.to_str().unwrap().to_string();
+                if target_core_str.starts_with("\\\\?\\") {
+                    target_core_str = target_core_str[4..].to_string();
+                }
+                tracing::debug!("tmp core path: {:?}", tmp_core_path);
+                tracing::debug!("target core path: {:?}", target_core_str);
+                // 防止 UAC 弹窗堵塞主线程
+                let status_code = tokio::task::spawn_blocking(move || {
+                    #[cfg(target_os = "windows")]
+                    {
+                        RunasCommand::new("cmd")
+                            .args(&[
+                                "/C",
+                                "copy",
+                                "/Y",
+                                tmp_core_path.to_str().unwrap(),
+                                &target_core_str,
+                            ])
+                            .status()
+                    }
+                    #[cfg(not(target_os = "windows"))]
+                    {
+                        RunasCommand::new("cp")
+                            .args(&["-f", tmp_core_path.to_str().unwrap(), &target_core_str])
+                            .status()
+                    }
+                })
+                .await??;
+                if !status_code.success() {
+                    anyhow::bail!("failed to copy core: {}", status_code);
+                }
+            }
+        };
+
+        if current_core == self.core_type {
+            self.dispatch_state(UpdaterState::Restarting);
+            CoreManager::global().run_core().await?;
+        }
+
+        Ok(())
+    }
+
+    pub async fn start(&self) {
+        {
+            let mut inner = self.inner.write();
+            if !matches!(inner.state, UpdaterState::Idle) {
+                return;
+            }
+            inner.state = UpdaterState::Downloading;
+        }
+        let downloader = self.downloader.clone();
+        tokio::spawn(async move {
+            if let Err(e) = downloader.start().await {
+                tracing::error!("failed to start downloader: {}", e);
+            }
+        });
+        let mut rx = self.rx.lock().await;
+        loop {
+            match rx.recv().await {
+                Some(state) => match state {
+                    DownloaderState::Downloading => {
+                        tracing::debug!("start to download core.");
+                        self.dispatch_state(UpdaterState::Downloading);
+                    }
+                    DownloaderState::Finished => {
+                        tracing::debug!("download finished and start to incoming update logic");
+                        if let Err(e) = self.decompress_and_set_premission().await {
+                            tracing::error!("failed to decompress and set permission: {}", e);
+                            self.dispatch_state(UpdaterState::Failed(e.to_string()));
+                            return;
+                        }
+                        if let Err(e) = self.replace_core().await {
+                            tracing::error!("failed to replace core: {}", e);
+                            self.dispatch_state(UpdaterState::Failed(e.to_string()));
+                            return;
+                        }
+                        self.dispatch_state(UpdaterState::Done);
+                        break;
+                    }
+                    DownloaderState::Failed(e) => {
+                        tracing::error!("download failed: {}", e);
+                        self.dispatch_state(UpdaterState::Failed(e));
+                        break;
+                    }
+                    _ => {
+                        tracing::debug!("downloader enter state: {:?}", state);
+                    }
+                },
+                None => {
+                    tracing::error!("downloader channel closed");
+                }
+            }
+        }
+    }
+
+    pub fn get_report(&self) -> UpdaterSummary {
+        UpdaterSummary {
+            id: self.id,
+            state: self.inner.read().state.clone(),
+            downloader: self.downloader.get_current_status(),
+        }
+    }
+
+    pub fn get_updater_id(&self) -> usize {
+        self.id
+    }
+}
+
+unsafe impl Send for Updater {}
diff --git a/clash-nyanpasu/backend/tauri/src/core/updater/mod.rs b/clash-nyanpasu/backend/tauri/src/core/updater/mod.rs
new file mode 100644
index 0000000000..30e2ca2dd3
--- /dev/null
+++ b/clash-nyanpasu/backend/tauri/src/core/updater/mod.rs
@@ -0,0 +1,258 @@
+use std::{
+    collections::HashMap,
+    sync::{Arc, OnceLock},
+};
+
+use crate::{config::nyanpasu::ClashCore, utils::candy::ReqwestSpeedTestExt};
+use anyhow::{anyhow, Result};
+use dashmap::DashMap;
+use serde::{Deserialize, Serialize};
+use shared::{get_arch, CoreTypeMeta};
+use tokio::{join, sync::RwLock};
+
+mod instance;
+mod shared;
+
+pub use instance::UpdaterSummary;
+
+pub struct UpdaterManager {
+    manifest_version: ManifestVersion,
+    client: reqwest::Client,
+    mirror: Arc<parking_lot::RwLock<Option<(String, u64)>>>,
+    instances: Arc<DashMap<usize, Arc<instance::Updater>>>,
+}
+
+impl Default for UpdaterManager {
+    fn default() -> Self {
+        Self {
+            manifest_version: ManifestVersion::default(),
+            client: crate::utils::candy::get_reqwest_client().unwrap(),
+            mirror: Arc::new(parking_lot::RwLock::new(None)),
+            instances: Arc::new(DashMap::new()),
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct ManifestVersion {
+    manifest_version: u64,
+    latest: ManifestVersionLatest,
+    arch_template: ArchTemplate,
+    updated_at: String,
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct ManifestVersionLatest {
+    mihomo: String,
+    mihomo_alpha: String,
+    clash_rs: String,
+    clash_premium: String,
+}
+
+#[derive(Deserialize, Serialize, Default, Clone, Debug)]
+pub struct ArchTemplate {
+    mihomo: HashMap<String, String>,
+    mihomo_alpha: HashMap<String, String>,
+    clash_rs: HashMap<String, String>,
+    clash_premium: HashMap<String, String>,
+}
+
+impl Default for ManifestVersion {
+    fn default() -> Self {
+        Self {
+            manifest_version: 0,
+            latest: ManifestVersionLatest::default(),
+            arch_template: ArchTemplate::default(),
+            updated_at: "".to_string(),
+        }
+    }
+}
+
+impl Default for ManifestVersionLatest {
+    fn default() -> Self {
+        Self {
+            mihomo: "".to_string(),
+            mihomo_alpha: "".to_string(),
+            clash_rs: "".to_string(),
+            clash_premium: "".to_string(),
+        }
+    }
+}
+
+impl ManifestVersion {
+    pub(self) fn get_matches(&self, core_type: &ClashCore) -> Option<(String, CoreTypeMeta)> {
+        let arch = get_arch().ok()?;
+        match core_type {
+            ClashCore::ClashPremium => Some((
+                self.arch_template
+                    .clash_premium
+                    .get(arch)?
+                    .clone()
+                    .replace("{}", &self.latest.clash_premium),
+                CoreTypeMeta::ClashPremium(self.latest.clash_premium.clone()),
+            )),
+            ClashCore::Mihomo => Some((
+                self.arch_template
+                    .mihomo
+                    .get(arch)?
+                    .clone()
+                    .replace("{}", &self.latest.mihomo),
+                CoreTypeMeta::Mihomo(self.latest.mihomo.clone()),
+            )),
+            ClashCore::MihomoAlpha => Some((
+                self.arch_template
+                    .mihomo_alpha
+                    .get(arch)?
+                    .clone()
+                    .replace("{}", &self.latest.mihomo_alpha),
+                CoreTypeMeta::MihomoAlpha,
+            )),
+            ClashCore::ClashRs => Some((
+                self.arch_template
+                    .clash_rs
+                    .get(arch)?
+                    .clone()
+                    .replace("{}", &self.latest.clash_rs),
+                CoreTypeMeta::ClashRs(self.latest.clash_rs.clone()),
+            )),
+        }
+    }
+}
+
+impl UpdaterManager {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn global() -> &'static RwLock<Self> {
+        static INSTANCE: OnceLock<RwLock<UpdaterManager>> = OnceLock::new();
+        INSTANCE.get_or_init(|| RwLock::new(UpdaterManager::new()))
+    }
+
+    pub fn get_latest_versions(&self) -> ManifestVersionLatest {
+        self.manifest_version.latest.clone()
+    }
+
+    pub fn get_mirror(&self) -> Option<String> {
+        self.mirror.read().clone().map(|(mirror, _)| mirror)
+    }
+
+    async fn get_latest_version_manifest(&self, mirror: &str) -> Result<ManifestVersion> {
+        let url = format!(
+            "{}/LibNyanpasu/clash-nyanpasu/raw/main/manifest/version.json",
+            mirror
+        );
+        log::debug!("{}", url);
+        let res = self.client.get(url).send().await?;
+        let status_code = res.status();
+        if !status_code.is_success() {
+            anyhow::bail!(
+                "failed to get latest version manifest: response status is {}, expected 200",
+                status_code
+            );
+        }
+        Ok(res.json::<ManifestVersion>().await?)
+    }
+
+    pub async fn fetch_latest(&mut self) -> Result<()> {
+        self.mirror_speed_test().await?;
+        let mirror = self.get_mirror().unwrap();
+        let latest = self.get_latest_version_manifest(&mirror);
+        let mihomo_alpha_version = self.get_mihomo_alpha_version();
+        let (latest, mihomo_alpha_version) = join!(latest, mihomo_alpha_version);
+        log::debug!("latest version: {:?}", latest);
+        self.manifest_version = latest?;
+        log::debug!("mihomo alpha version: {:?}", mihomo_alpha_version);
+        self.manifest_version.latest.mihomo_alpha = mihomo_alpha_version?;
+        Ok(())
+    }
+
+    // TODO: add user-spec mirror support
+    pub async fn mirror_speed_test(&self) -> Result<()> {
+        {
+            let mirror = self.mirror.read();
+            if let Some((_, timestamp)) = mirror.as_ref() {
+                if chrono::Utc::now().timestamp() - (*timestamp as i64) < 3600 {
+                    return Ok(());
+                }
+            }
+        }
+        let mirrors = crate::utils::candy::INTERNAL_MIRRORS;
+        let path = "https://github.com/LibNyanpasu/clash-nyanpasu/raw/main/manifest/version.json";
+        let client = crate::utils::candy::get_reqwest_client()?;
+        let results = client.mirror_speed_test(mirrors, path).await?;
+        let (fastest_mirror, speed) = results.first().ok_or(anyhow!("no mirrors found"))?;
+        if speed - 1.0 < 0.0001 {
+            anyhow::bail!("all mirrors are too slow");
+        }
+        tracing::debug!("fastest mirror: {}, speed: {}", fastest_mirror, speed);
+        {
+            let mut mirror = self.mirror.write();
+            *mirror = Some((
+                fastest_mirror.to_string(),
+                chrono::Utc::now().timestamp() as u64,
+            ));
+        }
+        Ok(())
+    }
+
+    async fn get_mihomo_alpha_version(&self) -> Result<String> {
+        self.mirror_speed_test().await?;
+        let mirror = self.get_mirror().unwrap();
+        let url = crate::utils::candy::parse_gh_url(
+            &mirror,
+            "MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt",
+        )?;
+        let res = self.client.get(url).send().await?;
+        let status_code = res.status();
+        if !status_code.is_success() {
+            anyhow::bail!(
+                "failed to get mihomo alpha version: response status is {}, expected 200",
+                status_code
+            );
+        }
+        Ok(res.text().await?.trim().to_string())
+    }
+
+    pub async fn update_core(&mut self, core_type: &ClashCore) -> Result<usize> {
+        self.mirror_speed_test().await?;
+        let (artifact, tag) = self
+            .manifest_version
+            .get_matches(core_type)
+            .ok_or(anyhow!("no matches found for core type: {:?}", core_type))?;
+        let mirror = self.get_mirror().unwrap();
+        let updater = Arc::new(
+            instance::UpdaterBuilder::new()
+                .set_client(self.client.clone())
+                .set_core_type(core_type.clone())
+                .set_mirror(mirror)
+                .set_artifact(artifact)
+                .set_tag(tag)
+                .build()
+                .await?,
+        );
+        let updater_ref = updater.clone();
+        let updater_id = updater.get_updater_id();
+        self.instances.insert(updater_id, updater);
+        tokio::spawn(async move {
+            updater_ref.start().await;
+        });
+        Ok(updater_id)
+    }
+
+    pub fn inspect_updater(&self, updater_id: usize) -> Option<UpdaterSummary> {
+        let updater = self.instances.get(&updater_id)?;
+        let report = updater.get_report();
+        if matches!(
+            report.state,
+            instance::UpdaterState::Done | instance::UpdaterState::Failed(_)
+        ) {
+            let map = self.instances.clone();
+            tokio::spawn(async move {
+                tokio::time::sleep(std::time::Duration::from_secs(5)).await;
+                map.remove(&updater_id);
+            });
+        }
+        Some(report)
+    }
+}
diff --git a/clash-nyanpasu/backend/tauri/src/core/updater/shared.rs b/clash-nyanpasu/backend/tauri/src/core/updater/shared.rs
new file mode 100644
index 0000000000..1c7b556030
--- /dev/null
+++ b/clash-nyanpasu/backend/tauri/src/core/updater/shared.rs
@@ -0,0 +1,43 @@
+pub(super) fn get_arch() -> anyhow::Result<&'static str> {
+    let env = {
+        let arch = std::env::consts::ARCH;
+        let os = std::env::consts::OS;
+        (arch, os)
+    };
+
+    match env {
+        ("x86_64", "macos") => Ok("darwin-x64"),
+        ("x86_64", "linux") => Ok("linux-amd64"),
+        ("x86_64", "windows") => Ok("windows-x86_64"),
+        ("aarch64", "macos") => Ok("darwin-arm64"),
+        ("aarch64", "linux") => Ok("linux-aarch64"),
+        // ("aarch64", "windows") => Ok("windows-arm64"),
+        _ => anyhow::bail!("unsupported platform"),
+    }
+}
+
+pub(super) enum CoreTypeMeta {
+    ClashPremium(String),
+    Mihomo(String),
+    MihomoAlpha,
+    ClashRs(String),
+}
+
+pub(super) fn get_download_path(core_type: CoreTypeMeta, artifact: &str) -> String {
+    match core_type {
+        CoreTypeMeta::Mihomo(tag) => {
+            format!("MetaCubeX/mihomo/releases/download/{}/{}", tag, artifact)
+        }
+        CoreTypeMeta::MihomoAlpha => format!(
+            "MetaCubeX/mihomo/releases/download/Prerelease-Alpha/{}",
+            artifact
+        ),
+        CoreTypeMeta::ClashRs(tag) => {
+            format!("Watfaq/clash-rs/releases/download/{}/{}", tag, artifact)
+        }
+        CoreTypeMeta::ClashPremium(tag) => format!(
+            "zhongfly/Clash-premium-backup/releases/download/{}/{}",
+            tag, artifact
+        ),
+    }
+}
diff --git a/clash-nyanpasu/backend/tauri/src/main.rs b/clash-nyanpasu/backend/tauri/src/main.rs
index 0c6856c361..ddbfc2e161 100644
--- a/clash-nyanpasu/backend/tauri/src/main.rs
+++ b/clash-nyanpasu/backend/tauri/src/main.rs
@@ -142,6 +142,7 @@ fn main() -> std::io::Result<()> {
             // updater
             cmds::fetch_latest_core_versions,
             cmds::update_core,
+            cmds::inspect_updater,
             cmds::get_core_version,
             // utils
             cmds::collect_logs,
diff --git a/clash-nyanpasu/backend/tauri/src/utils/candy.rs b/clash-nyanpasu/backend/tauri/src/utils/candy.rs
index 83dcf0ce04..2ec2adefd8 100644
--- a/clash-nyanpasu/backend/tauri/src/utils/candy.rs
+++ b/clash-nyanpasu/backend/tauri/src/utils/candy.rs
@@ -58,59 +58,68 @@ pub fn parse_gh_url(mirror: &str, path: &str) -> Result<Url, url::ParseError> {
     }
 }
 
-pub async fn mirror_speed_test<'a>(
-    mirrors: &'a [&'a str],
-    path: &'a str,
-) -> Result<Vec<(&'a str, f64)>> {
-    let client = reqwest::Client::builder()
-        .timeout(Duration::from_secs(3))
-        .user_agent(
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0",
-        )
-        .build()?;
+#[async_trait::async_trait]
+pub trait ReqwestSpeedTestExt {
+    async fn mirror_speed_test<'a>(
+        &self,
+        mirrors: &'a [&'a str],
+        path: &'a str,
+    ) -> Result<Vec<(&'a str, f64)>>;
+}
 
-    let results = futures::future::join_all(mirrors.iter().map(|&mirror| {
-        let client = &client;
-        async move {
-            let start = tokio::time::Instant::now();
-            // if mirror is github.com, we should use it directly
-            let url = parse_gh_url(mirror, path)?;
-            tracing::debug!("Testing {}", url.as_str());
-            let _ = client.get(url.as_str()).send().await; // warm up
-            let result = client
-                .get(url)
-                .send()
-                .await
-                .and_then(|response| response.error_for_status());
-            match result {
-                Ok(response) => {
-                    let content_length = response.content_length().unwrap_or(0) as f64;
-                    // should read all the response body to get the correct speed
-                    match response.bytes().await {
-                        Ok(_) => {
-                            let elapsed = start.elapsed().as_secs_f64();
-                            let speed = content_length / elapsed;
-                            Ok((mirror, speed))
-                        }
-                        Err(e) => {
-                            tracing::warn!("test mirror {} failed: {}", mirror, e);
-                            Ok((mirror, 0.0))
+#[async_trait::async_trait]
+impl ReqwestSpeedTestExt for reqwest::Client {
+    async fn mirror_speed_test<'a>(
+        &self,
+        mirrors: &'a [&'a str],
+        path: &'a str,
+    ) -> Result<Vec<(&'a str, f64)>> {
+        let results = futures::future::join_all(mirrors.iter().map(|&mirror| {
+            let client = self;
+            async move {
+                let start = tokio::time::Instant::now();
+                // if mirror is github.com, we should use it directly
+                let url = parse_gh_url(mirror, path)?;
+                tracing::debug!("Testing {}", url.as_str());
+                let _ =
+                    tokio::time::timeout(Duration::from_secs(3), client.get(url.as_str()).send())
+                        .await; // warm up
+                let result: Result<reqwest::Response, anyhow::Error> =
+                    tokio::time::timeout(Duration::from_secs(3), client.get(url).send())
+                        .await
+                        .map_err(anyhow::Error::msg)
+                        .and_then(|v| v.map_err(anyhow::Error::msg))
+                        .and_then(|v| v.error_for_status().map_err(anyhow::Error::msg));
+                match result {
+                    Ok(response) => {
+                        let content_length = response.content_length().unwrap_or(0) as f64;
+                        // should read all the response body to get the correct speed
+                        match response.bytes().await {
+                            Ok(_) => {
+                                let elapsed = start.elapsed().as_secs_f64();
+                                let speed = content_length / elapsed;
+                                Ok((mirror, speed))
+                            }
+                            Err(e) => {
+                                tracing::warn!("test mirror {} failed: {}", mirror, e);
+                                Ok((mirror, 0.0))
+                            }
                         }
                     }
-                }
-                Err(e) => {
-                    tracing::warn!("test mirror {} failed: {}", mirror, e);
-                    Ok((mirror, 0.0))
+                    Err(e) => {
+                        tracing::warn!("test mirror {} failed: {}", mirror, e);
+                        Ok((mirror, 0.0))
+                    }
                 }
             }
-        }
-    }))
-    .await;
-    let collected_result: Result<Vec<_>, anyhow::Error> = results.into_iter().collect();
-    let mut results = collected_result?;
-    results.sort_by(|a, b| b.1.partial_cmp(&a.1).unwrap());
+        }))
+        .await;
+        let collected_result: Result<Vec<_>, anyhow::Error> = results.into_iter().collect();
+        let mut results = collected_result?;
+        results.sort_by(|a, b| b.1.partial_cmp(&a.1).unwrap());
 
-    Ok(results)
+        Ok(results)
+    }
 }
 
 mod test {
@@ -119,12 +128,16 @@ mod test {
 
     #[tokio::test]
     async fn test_mirror_speed_test() {
-        let results = mirror_speed_test(
-            INTERNAL_MIRRORS,
-            "https://raw.githubusercontent.com/simonw/github-large-file-test/master/1.5mb.txt",
-        )
-        .await
-        .unwrap();
+        let client = reqwest::Client::builder().user_agent(
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"
+        ).build().unwrap();
+        let results = client
+            .mirror_speed_test(
+                INTERNAL_MIRRORS,
+                "https://raw.githubusercontent.com/simonw/github-large-file-test/master/1.5mb.txt",
+            )
+            .await
+            .unwrap();
         println!("{:?}", results);
         assert_eq!(results.len(), 5);
     }
diff --git a/clash-nyanpasu/backend/tauri/src/utils/downloader.rs b/clash-nyanpasu/backend/tauri/src/utils/downloader.rs
index 3511769386..d2f6c95f43 100644
--- a/clash-nyanpasu/backend/tauri/src/utils/downloader.rs
+++ b/clash-nyanpasu/backend/tauri/src/utils/downloader.rs
@@ -149,6 +149,7 @@ pub struct DownloadStatus {
 }
 
 #[derive(Debug, Serialize)]
+#[allow(private_interfaces)]
 pub struct ChunkStatus {
     pub state: ChunkThreadState,
     pub start: usize,
@@ -425,7 +426,7 @@ impl<F: Fn(DownloaderState)> Downloader<F> {
         Ok(())
     }
 
-    async fn start(&self) -> Result<(), DownloaderError> {
+    pub async fn start(&self) -> Result<(), DownloaderError> {
         let result = self.download().await;
         match result {
             Ok(_) => Ok(()),
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/providers.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/providers.tsx
index f69298d8af..2c4d3f7eb4 100644
--- a/clash-nyanpasu/frontend/nyanpasu/src/pages/providers.tsx
+++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/providers.tsx
@@ -29,7 +29,14 @@ export default function ProvidersPage() {
           <Grid container spacing={2}>
             {Object.entries(getProxiesProviders.data).map(
               ([name, provider]) => (
-                <Grid sm={12} md={6} lg={4} xl={3} key={name}>
+                <Grid
+                  key={name}
+                  className="w-full"
+                  sm={12}
+                  md={6}
+                  lg={4}
+                  xl={3}
+                >
                   <ProxiesProvider provider={provider} />
                 </Grid>
               ),
@@ -49,7 +56,7 @@ export default function ProvidersPage() {
         {getRulesProviders.data && (
           <Grid container spacing={2}>
             {Object.entries(getRulesProviders.data).map(([name, provider]) => (
-              <Grid sm={12} md={6} lg={4} xl={3} key={name}>
+              <Grid key={name} className="w-full" sm={12} md={6} lg={4} xl={3}>
                 <RulesProvider provider={provider} />
               </Grid>
             ))}
diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx
index f9f3da00d9..6488bc08c8 100644
--- a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx
+++ b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/index.tsx
@@ -54,14 +54,9 @@ export const BasePage: FC<Props> = ({
         <Header title={title} header={header} />
 
         <div className={`MDYBasePage-container ${full ? "no-padding" : ""}`}>
-          <section style={sectionStyleRef.current}>
-            <div
-              className="MDYBasePage-content"
-              style={contentStyleRef.current}
-            >
-              {children}
-            </div>
-          </section>
+          <div className="MDYBasePage-content" style={contentStyleRef.current}>
+            <section style={sectionStyleRef.current}>{children}</section>
+          </div>
         </div>
       </div>
     </BaseErrorBoundary>
diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss
index b5d0e8fa1a..ef1130c268 100644
--- a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss
+++ b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss
@@ -16,31 +16,28 @@
   }
 
   .MDYBasePage-container {
+    position: relative;
+    box-sizing: border-box;
+    flex: 1 1 100%;
+    width: 100%;
     height: 100%;
-    overflow: hidden;
+    overflow: auto;
+    background-color: var(--background-color);
     border-radius: var(--border-radius);
+    scrollbar-gutter: stable;
 
-    > section {
-      position: relative;
-      box-sizing: border-box;
-      flex: 1 1 100%;
-      width: 100%;
-      height: 100%;
-      overflow: auto;
-      background-color: var(--background-color);
-      scrollbar-gutter: stable;
-
-      .MDYBasePage-content {
+    .MDYBasePage-content {
+      > section {
         padding: 28px;
         margin: 0 auto;
       }
     }
 
     &.no-padding {
-      > section {
+      .MDYBasePage-content {
         overflow: visible;
 
-        .MDYBasePage-content {
+        > section {
           padding: 0;
         }
       }
diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json
index 57dc9eb2d8..7ee461e859 100644
--- a/clash-nyanpasu/package.json
+++ b/clash-nyanpasu/package.json
@@ -87,7 +87,7 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-n": "16.6.2",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-promise": "6.2.0",
+    "eslint-plugin-promise": "6.4.0",
     "eslint-plugin-react": "7.34.3",
     "lint-staged": "15.2.7",
     "npm-run-all2": "6.2.0",
diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml
index eab1ae2878..cdc149864b 100644
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -60,7 +60,7 @@ importers:
         version: 9.1.0(eslint@8.57.0)
       eslint-config-standard:
         specifier: 17.1.0
-        version: 17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0)
+        version: 17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.4.0(eslint@8.57.0))(eslint@8.57.0)
       eslint-import-resolver-alias:
         specifier: 1.1.2
         version: 1.1.2(eslint-plugin-import@2.29.1(eslint@8.57.0))
@@ -77,8 +77,8 @@ importers:
         specifier: 5.1.3
         version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.2)
       eslint-plugin-promise:
-        specifier: 6.2.0
-        version: 6.2.0(eslint@8.57.0)
+        specifier: 6.4.0
+        version: 6.4.0(eslint@8.57.0)
       eslint-plugin-react:
         specifier: 7.34.3
         version: 7.34.3(eslint@8.57.0)
@@ -3201,8 +3201,8 @@ packages:
       eslint-config-prettier:
         optional: true
 
-  eslint-plugin-promise@6.2.0:
-    resolution: {integrity: sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==}
+  eslint-plugin-promise@6.4.0:
+    resolution: {integrity: sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
@@ -8687,12 +8687,12 @@ snapshots:
     dependencies:
       eslint: 8.57.0
 
-  eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0):
+  eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.4.0(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
       eslint-plugin-import: 2.29.1(eslint@8.57.0)
       eslint-plugin-n: 16.6.2(eslint@8.57.0)
-      eslint-plugin-promise: 6.2.0(eslint@8.57.0)
+      eslint-plugin-promise: 6.4.0(eslint@8.57.0)
 
   eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.29.1(eslint@8.57.0)):
     dependencies:
@@ -8775,7 +8775,7 @@ snapshots:
     optionalDependencies:
       eslint-config-prettier: 9.1.0(eslint@8.57.0)
 
-  eslint-plugin-promise@6.2.0(eslint@8.57.0):
+  eslint-plugin-promise@6.4.0(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
 
diff --git a/clash-verge-rev/.github/workflows/alpha.yml b/clash-verge-rev/.github/workflows/alpha.yml
index b799e0e467..8cc9050ddd 100644
--- a/clash-verge-rev/.github/workflows/alpha.yml
+++ b/clash-verge-rev/.github/workflows/alpha.yml
@@ -171,9 +171,15 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: src-tauri
+          cache-all-crates: true
+          cache-on-failure: true
 
       - name: Install Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: tauri-cli
+          git: https://github.com/tauri-apps/tauri
+          branch: 1.x # `branch` and `commit` are also supported
 
       - name: Install Node
         uses: actions/setup-node@v4
diff --git a/clash-verge-rev/.github/workflows/release.yml b/clash-verge-rev/.github/workflows/release.yml
index 8f9ac8e0f7..619b17b359 100644
--- a/clash-verge-rev/.github/workflows/release.yml
+++ b/clash-verge-rev/.github/workflows/release.yml
@@ -161,7 +161,11 @@ jobs:
           workspaces: src-tauri
 
       - name: Install Tauri CLI
-        run: cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: tauri-cli
+          git: https://github.com/tauri-apps/tauri
+          branch: 1.x # `branch` and `commit` are also supported
 
       - name: Install Node
         uses: actions/setup-node@v4
diff --git a/clash-verge-rev/src-tauri/src/config/config.rs b/clash-verge-rev/src-tauri/src/config/config.rs
index 8664596419..bc074b2c38 100644
--- a/clash-verge-rev/src-tauri/src/config/config.rs
+++ b/clash-verge-rev/src-tauri/src/config/config.rs
@@ -1,5 +1,6 @@
 use super::{Draft, IClashTemp, IProfiles, IRuntime, IVerge};
 use crate::{
+    config::PrfItem,
     enhance,
     utils::{dirs, help},
 };
@@ -47,6 +48,22 @@ impl Config {
 
     /// 初始化订阅
     pub async fn init_config() -> Result<()> {
+        if Self::profiles()
+            .data()
+            .get_item(&"Merge".to_string())
+            .is_err()
+        {
+            let merge_item = PrfItem::from_merge(Some("Merge".to_string()))?;
+            Self::profiles().data().append_item(merge_item.clone())?;
+        }
+        if Self::profiles()
+            .data()
+            .get_item(&"Script".to_string())
+            .is_err()
+        {
+            let script_item = PrfItem::from_script(Some("Script".to_string()))?;
+            Self::profiles().data().append_item(script_item.clone())?;
+        }
         crate::log_err!(Self::generate().await);
         if let Err(err) = Self::generate_file(ConfigType::Run) {
             log::error!(target: "app", "{err}");
diff --git a/clash-verge-rev/src-tauri/src/config/prfitem.rs b/clash-verge-rev/src-tauri/src/config/prfitem.rs
index 32d846f77f..b5cfcf84b3 100644
--- a/clash-verge-rev/src-tauri/src/config/prfitem.rs
+++ b/clash-verge-rev/src-tauri/src/config/prfitem.rs
@@ -175,12 +175,12 @@ impl PrfItem {
         let mut groups = opt_ref.and_then(|o| o.groups.clone());
 
         if merge.is_none() {
-            let merge_item = PrfItem::from_merge()?;
+            let merge_item = PrfItem::from_merge(None)?;
             Config::profiles().data().append_item(merge_item.clone())?;
             merge = merge_item.uid;
         }
         if script.is_none() {
-            let script_item = PrfItem::from_script()?;
+            let script_item = PrfItem::from_script(None)?;
             Config::profiles().data().append_item(script_item.clone())?;
             script = script_item.uid;
         }
@@ -248,12 +248,12 @@ impl PrfItem {
         let mut builder = reqwest::ClientBuilder::new().use_rustls_tls().no_proxy();
 
         if merge.is_none() {
-            let merge_item = PrfItem::from_merge()?;
+            let merge_item = PrfItem::from_merge(None)?;
             Config::profiles().data().append_item(merge_item.clone())?;
             merge = merge_item.uid;
         }
         if script.is_none() {
-            let script_item = PrfItem::from_script()?;
+            let script_item = PrfItem::from_script(None)?;
             Config::profiles().data().append_item(script_item.clone())?;
             script = script_item.uid;
         }
@@ -426,12 +426,15 @@ impl PrfItem {
 
     /// ## Merge type (enhance)
     /// create the enhanced item by using `merge` rule
-    pub fn from_merge() -> Result<PrfItem> {
-        let uid = help::get_uid("m");
-        let file = format!("{uid}.yaml");
+    pub fn from_merge(uid: Option<String>) -> Result<PrfItem> {
+        let mut id = help::get_uid("m");
+        if let Some(uid) = uid {
+            id = uid;
+        }
+        let file = format!("{id}.yaml");
 
         Ok(PrfItem {
-            uid: Some(uid),
+            uid: Some(id),
             itype: Some("merge".into()),
             name: None,
             desc: None,
@@ -448,12 +451,15 @@ impl PrfItem {
 
     /// ## Script type (enhance)
     /// create the enhanced item by using javascript quick.js
-    pub fn from_script() -> Result<PrfItem> {
-        let uid = help::get_uid("s");
-        let file = format!("{uid}.js"); // js ext
+    pub fn from_script(uid: Option<String>) -> Result<PrfItem> {
+        let mut id = help::get_uid("s");
+        if let Some(uid) = uid {
+            id = uid;
+        }
+        let file = format!("{id}.js"); // js ext
 
         Ok(PrfItem {
-            uid: Some(uid),
+            uid: Some(id),
             itype: Some("script".into()),
             name: None,
             desc: None,
diff --git a/clash-verge-rev/src-tauri/src/config/verge.rs b/clash-verge-rev/src-tauri/src/config/verge.rs
index be454c5de4..a7f8827c8e 100644
--- a/clash-verge-rev/src-tauri/src/config/verge.rs
+++ b/clash-verge-rev/src-tauri/src/config/verge.rs
@@ -75,6 +75,9 @@ pub struct IVerge {
     /// enable proxy guard
     pub enable_proxy_guard: Option<bool>,
 
+    /// always use default bypass
+    pub use_default_bypass: Option<bool>,
+
     /// set system proxy bypass
     pub system_proxy_bypass: Option<String>,
 
@@ -235,6 +238,7 @@ impl IVerge {
             verge_port: Some(7899),
             verge_http_enabled: Some(true),
             enable_proxy_guard: Some(false),
+            use_default_bypass: Some(true),
             proxy_guard_duration: Some(30),
             auto_close_connection: Some(true),
             auto_check_update: Some(true),
@@ -297,6 +301,7 @@ impl IVerge {
         patch!(verge_http_enabled);
         patch!(enable_system_proxy);
         patch!(enable_proxy_guard);
+        patch!(use_default_bypass);
         patch!(system_proxy_bypass);
         patch!(proxy_guard_duration);
         patch!(proxy_auto_config);
diff --git a/clash-verge-rev/src-tauri/src/core/sysopt.rs b/clash-verge-rev/src-tauri/src/core/sysopt.rs
index a5a6a80608..35ed33a81c 100644
--- a/clash-verge-rev/src-tauri/src/core/sysopt.rs
+++ b/clash-verge-rev/src-tauri/src/core/sysopt.rs
@@ -42,8 +42,8 @@ static DEFAULT_BYPASS: &str =
     "127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,*.crashlytics.com,<local>";
 
 fn get_bypass() -> String {
-    let bypass = DEFAULT_BYPASS.to_string();
-
+    // let bypass = DEFAULT_BYPASS.to_string();
+    let use_default = Config::verge().latest().use_default_bypass.unwrap_or(true);
     let res = {
         let verge = Config::verge();
         let verge = verge.latest();
@@ -55,15 +55,23 @@ fn get_bypass() -> String {
     };
     #[cfg(target_os = "windows")]
     let bypass = if custom_bypass.is_empty() {
-        bypass
+        DEFAULT_BYPASS.to_string()
     } else {
-        format!("{};{}", bypass, custom_bypass)
+        if use_default {
+            format!("{};{}", DEFAULT_BYPASS, custom_bypass)
+        } else {
+            custom_bypass
+        }
     };
     #[cfg(not(target_os = "windows"))]
     let bypass = if custom_bypass.is_empty() {
-        bypass
+        DEFAULT_BYPASS.to_string()
     } else {
-        format!("{},{}", bypass, custom_bypass)
+        if use_default {
+            format!("{},{}", DEFAULT_BYPASS, custom_bypass)
+        } else {
+            custom_bypass
+        }
     };
 
     bypass
diff --git a/clash-verge-rev/src-tauri/src/enhance/mod.rs b/clash-verge-rev/src-tauri/src/enhance/mod.rs
index 9af9ebddc2..0ea77f5d2e 100644
--- a/clash-verge-rev/src-tauri/src/enhance/mod.rs
+++ b/clash-verge-rev/src-tauri/src/enhance/mod.rs
@@ -50,7 +50,16 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
     };
 
     // 从profiles里拿东西
-    let (mut config, merge_item, script_item, rules_item, proxies_item, groups_item) = {
+    let (
+        mut config,
+        merge_item,
+        script_item,
+        rules_item,
+        proxies_item,
+        groups_item,
+        global_merge,
+        global_script,
+    ) = {
         let profiles = Config::profiles();
         let profiles = profiles.latest();
 
@@ -96,7 +105,34 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
                 data: ChainType::Groups(SeqMap::default()),
             });
 
-        (current, merge, script, rules, proxies, groups)
+        let global_merge = profiles
+            .get_item(&"Merge".to_string())
+            .ok()
+            .and_then(<Option<ChainItem>>::from)
+            .unwrap_or_else(|| ChainItem {
+                uid: "Merge".into(),
+                data: ChainType::Merge(Mapping::new()),
+            });
+
+        let global_script = profiles
+            .get_item(&"Script".to_string())
+            .ok()
+            .and_then(<Option<ChainItem>>::from)
+            .unwrap_or_else(|| ChainItem {
+                uid: "Script".into(),
+                data: ChainType::Script(tmpl::ITEM_SCRIPT.into()),
+            });
+
+        (
+            current,
+            merge,
+            script,
+            rules,
+            proxies,
+            groups,
+            global_merge,
+            global_script,
+        )
     };
 
     let mut result_map = HashMap::new(); // 保存脚本日志
@@ -136,6 +172,27 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
         result_map.insert(script_item.uid, logs);
     }
 
+    // 全局Merge和Script
+    if let ChainType::Merge(merge) = global_merge.data {
+        exists_keys.extend(use_keys(&merge));
+        config = use_merge(merge, config.to_owned());
+    }
+
+    if let ChainType::Script(script) = global_script.data {
+        let mut logs = vec![];
+
+        match use_script(script, config.to_owned()) {
+            Ok((res_config, res_logs)) => {
+                exists_keys.extend(use_keys(&res_config));
+                config = res_config;
+                logs.extend(res_logs);
+            }
+            Err(err) => logs.push(("exception".into(), err.to_string())),
+        }
+
+        result_map.insert(global_script.uid, logs);
+    }
+
     // 合并默认的config
     for (key, value) in clash_config.into_iter() {
         if key.as_str() == Some("tun") {
diff --git a/clash-verge-rev/src/components/profile/profile-item.tsx b/clash-verge-rev/src/components/profile/profile-item.tsx
index 38868e5924..7feaab2e86 100644
--- a/clash-verge-rev/src/components/profile/profile-item.tsx
+++ b/clash-verge-rev/src/components/profile/profile-item.tsx
@@ -226,12 +226,12 @@ export const ProfileItem = (props: Props) => {
       disabled: option?.groups === null,
     },
     {
-      label: "Edit Merge",
+      label: "Extend Config",
       handler: onEditMerge,
       disabled: option?.merge === null,
     },
     {
-      label: "Edit Script",
+      label: "Extend Script",
       handler: onEditScript,
       disabled: option?.script === null,
     },
@@ -267,12 +267,12 @@ export const ProfileItem = (props: Props) => {
       disabled: option?.groups === null,
     },
     {
-      label: "Edit Merge",
+      label: "Extend Config",
       handler: onEditMerge,
       disabled: option?.merge === null,
     },
     {
-      label: "Edit Script",
+      label: "Extend Script",
       handler: onEditScript,
       disabled: option?.script === null,
     },
diff --git a/clash-verge-rev/src/components/profile/profile-more.tsx b/clash-verge-rev/src/components/profile/profile-more.tsx
new file mode 100644
index 0000000000..25e543ed7d
--- /dev/null
+++ b/clash-verge-rev/src/components/profile/profile-more.tsx
@@ -0,0 +1,188 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useLockFn } from "ahooks";
+import {
+  Box,
+  Badge,
+  Chip,
+  Typography,
+  MenuItem,
+  Menu,
+  IconButton,
+} from "@mui/material";
+import { FeaturedPlayListRounded } from "@mui/icons-material";
+import { viewProfile } from "@/services/cmds";
+import { Notice } from "@/components/base";
+import { EditorViewer } from "@/components/profile/editor-viewer";
+import { ProfileBox } from "./profile-box";
+import { LogViewer } from "./log-viewer";
+
+interface Props {
+  logInfo?: [string, string][];
+  id: "Merge" | "Script";
+  onChange?: (prev?: string, curr?: string) => void;
+}
+
+// profile enhanced item
+export const ProfileMore = (props: Props) => {
+  const { id, logInfo = [], onChange } = props;
+
+  const { t, i18n } = useTranslation();
+  const [anchorEl, setAnchorEl] = useState<any>(null);
+  const [position, setPosition] = useState({ left: 0, top: 0 });
+  const [fileOpen, setFileOpen] = useState(false);
+  const [logOpen, setLogOpen] = useState(false);
+
+  const onEditFile = () => {
+    setAnchorEl(null);
+    setFileOpen(true);
+  };
+
+  const onOpenFile = useLockFn(async () => {
+    setAnchorEl(null);
+    try {
+      await viewProfile(id);
+    } catch (err: any) {
+      Notice.error(err?.message || err.toString());
+    }
+  });
+
+  const fnWrapper = (fn: () => void) => () => {
+    setAnchorEl(null);
+    return fn();
+  };
+
+  const hasError = !!logInfo.find((e) => e[0] === "exception");
+
+  const itemMenu = [
+    { label: "Edit File", handler: onEditFile },
+    { label: "Open File", handler: onOpenFile },
+  ];
+
+  const boxStyle = {
+    height: 26,
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "space-between",
+    lineHeight: 1,
+  };
+
+  return (
+    <>
+      <ProfileBox
+        onDoubleClick={onEditFile}
+        onContextMenu={(event) => {
+          const { clientX, clientY } = event;
+          setPosition({ top: clientY, left: clientX });
+          setAnchorEl(event.currentTarget);
+          event.preventDefault();
+        }}
+      >
+        <Box
+          display="flex"
+          justifyContent="space-between"
+          alignItems="center"
+          mb={0.5}
+        >
+          <Typography
+            width="calc(100% - 52px)"
+            variant="h6"
+            component="h2"
+            noWrap
+            title={t(`Global ${id}`)}
+          >
+            {t(`Global ${id}`)}
+          </Typography>
+
+          <Chip
+            label={id}
+            color="primary"
+            size="small"
+            variant="outlined"
+            sx={{ height: 20, textTransform: "capitalize" }}
+          />
+        </Box>
+
+        <Box sx={boxStyle}>
+          {id === "Script" &&
+            (hasError ? (
+              <Badge color="error" variant="dot" overlap="circular">
+                <IconButton
+                  size="small"
+                  edge="start"
+                  color="error"
+                  title={t("Script Console")}
+                  onClick={() => setLogOpen(true)}
+                >
+                  <FeaturedPlayListRounded fontSize="inherit" />
+                </IconButton>
+              </Badge>
+            ) : (
+              <IconButton
+                size="small"
+                edge="start"
+                color="inherit"
+                title={t("Script Console")}
+                onClick={() => setLogOpen(true)}
+              >
+                <FeaturedPlayListRounded fontSize="inherit" />
+              </IconButton>
+            ))}
+        </Box>
+      </ProfileBox>
+
+      <Menu
+        open={!!anchorEl}
+        anchorEl={anchorEl}
+        onClose={() => setAnchorEl(null)}
+        anchorPosition={position}
+        anchorReference="anchorPosition"
+        transitionDuration={225}
+        MenuListProps={{ sx: { py: 0.5 } }}
+        onContextMenu={(e) => {
+          setAnchorEl(null);
+          e.preventDefault();
+        }}
+      >
+        {itemMenu
+          .filter((item: any) => item.show !== false)
+          .map((item) => (
+            <MenuItem
+              key={item.label}
+              onClick={item.handler}
+              sx={[
+                { minWidth: 120 },
+                (theme) => {
+                  return {
+                    color:
+                      item.label === "Delete"
+                        ? theme.palette.error.main
+                        : undefined,
+                  };
+                },
+              ]}
+              dense
+            >
+              {t(item.label)}
+            </MenuItem>
+          ))}
+      </Menu>
+
+      <EditorViewer
+        mode="profile"
+        property={id}
+        open={fileOpen}
+        language={id === "Merge" ? "yaml" : "javascript"}
+        schema={id === "Merge" ? "merge" : undefined}
+        onChange={onChange}
+        onClose={() => setFileOpen(false)}
+      />
+
+      <LogViewer
+        open={logOpen}
+        logInfo={logInfo}
+        onClose={() => setLogOpen(false)}
+      />
+    </>
+  );
+};
diff --git a/clash-verge-rev/src/components/setting/mods/sysproxy-viewer.tsx b/clash-verge-rev/src/components/setting/mods/sysproxy-viewer.tsx
index d5da90fb3a..8981477b1b 100644
--- a/clash-verge-rev/src/components/setting/mods/sysproxy-viewer.tsx
+++ b/clash-verge-rev/src/components/setting/mods/sysproxy-viewer.tsx
@@ -49,6 +49,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
     proxy_auto_config,
     pac_file_content,
     enable_proxy_guard,
+    use_default_bypass,
     system_proxy_bypass,
     proxy_guard_duration,
   } = verge ?? {};
@@ -57,6 +58,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
     guard: enable_proxy_guard,
     bypass: system_proxy_bypass,
     duration: proxy_guard_duration ?? 10,
+    use_default: use_default_bypass ?? true,
     pac: proxy_auto_config,
     pac_content: pac_file_content ?? DEFAULT_PAC,
   });
@@ -68,6 +70,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
         guard: enable_proxy_guard,
         bypass: system_proxy_bypass,
         duration: proxy_guard_duration ?? 10,
+        use_default: use_default_bypass ?? true,
         pac: proxy_auto_config,
         pac_content: pac_file_content ?? DEFAULT_PAC,
       });
@@ -97,6 +100,9 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
     if (value.pac !== proxy_auto_config) {
       patch.proxy_auto_config = value.pac;
     }
+    if (value.use_default !== use_default_bypass) {
+      patch.use_default_bypass = value.use_default;
+    }
     if (value.pac_content !== pac_file_content) {
       patch.pac_file_content = value.pac_content;
     }
@@ -197,6 +203,17 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
             }}
           />
         </ListItem>
+        {!value.pac && (
+          <ListItem sx={{ padding: "5px 2px" }}>
+            <ListItemText primary={t("Always use Default Bypass")} />
+            <Switch
+              edge="end"
+              disabled={!enabled}
+              checked={value.use_default}
+              onChange={(_, e) => setValue((v) => ({ ...v, use_default: e }))}
+            />
+          </ListItem>
+        )}
         {!value.pac && (
           <>
             <ListItemText primary={t("Proxy Bypass")} />
diff --git a/clash-verge-rev/src/locales/en.json b/clash-verge-rev/src/locales/en.json
index 38d8b8386d..1d5094e442 100644
--- a/clash-verge-rev/src/locales/en.json
+++ b/clash-verge-rev/src/locales/en.json
@@ -60,8 +60,10 @@
   "Add Append Rule": "Add Append Rule",
   "Delete Rule": "Delete Rule",
   "Edit Groups": "Edit Proxy Groups",
-  "Edit Merge": "Edit Merge",
-  "Edit Script": "Edit Script",
+  "Extend Config": "Extend Config",
+  "Extend Script": "Extend Script",
+  "Global Merge": "Global Extend Config",
+  "Global Script": "Global Extend Script",
   "Type": "Type",
   "Name": "Name",
   "Descriptions": "Descriptions",
@@ -151,6 +153,7 @@
   "Proxy Guard": "Proxy Guard",
   "Proxy Guard Info": "Enable to prevent other software from modifying the operating system's proxy settings",
   "Guard Duration": "Guard Duration",
+  "Always use Default Bypass": "Always use Default Bypass",
   "Proxy Bypass": "Proxy Bypass Settings: ",
   "Bypass": "Bypass: ",
   "Use PAC Mode": "Use PAC Mode",
diff --git a/clash-verge-rev/src/locales/fa.json b/clash-verge-rev/src/locales/fa.json
index c9bea1f911..3f85e28bcd 100644
--- a/clash-verge-rev/src/locales/fa.json
+++ b/clash-verge-rev/src/locales/fa.json
@@ -50,8 +50,10 @@
   "Expire Time": "زمان انقضا",
   "Create Profile": "ایجاد پروفایل",
   "Edit Profile": "ویرایش پروفایل",
-  "Edit Merge": "ادغام ویرایش",
-  "Edit Script": "ویرایش اسکریپت",
+  "Extend Config": "توسعه پیکربندی",
+  "Extend Script": "ادغام اسکریپت",
+  "Global Merge": "تنظیمات گسترده‌ی سراسری",
+  "Global Script": "اسکریپت گسترش سراسری",
   "Type": "نوع",
   "Name": "نام",
   "Descriptions": "توضیحات",
@@ -141,6 +143,7 @@
   "Proxy Guard": "محافظ پراکسی",
   "Proxy Guard Info": "امکان جلوگیری از نرم‌افزارهای دیگر از تغییر تنظیمات پروکسی سیستم عامل را فعال کنید",
   "Guard Duration": "مدت محافظت",
+  "Always use Default Bypass": "همیشه از دور زدن پیش‌فرض استفاده کنید",
   "Proxy Bypass": "دور زدن پراکسی: ",
   "Bypass": "دور زدن: ",
   "Use PAC Mode": "استفاده از حالت PAC",
diff --git a/clash-verge-rev/src/locales/ru.json b/clash-verge-rev/src/locales/ru.json
index dee452cd5b..95a604210e 100644
--- a/clash-verge-rev/src/locales/ru.json
+++ b/clash-verge-rev/src/locales/ru.json
@@ -50,8 +50,10 @@
   "Expire Time": "Время окончания",
   "Create Profile": "Создать профиль",
   "Edit Profile": "Изменить профиль",
-  "Edit Merge": "Изменить Merge.",
-  "Edit Script": "Изменить Script",
+  "Extend Config": "Изменить Merge.",
+  "Extend Script": "Изменить Script",
+  "Global Merge": "Глобальный расширенный Настройки",
+  "Global Script": "Глобальный расширенный скрипт",
   "Type": "Тип",
   "Name": "Название",
   "Descriptions": "Описания",
@@ -141,6 +143,7 @@
   "Proxy Guard": "Защита прокси",
   "Proxy Guard Info": "Включите эту функцию чтобы предотвратить изменение настроек прокси-сервера операционной системы другим программным обеспечением",
   "Guard Duration": "Период защиты",
+  "Always use Default Bypass": "Всегда использовать стандартное обходное решение",
   "Proxy Bypass": "Игнорирование прокси: ",
   "Bypass": "Игнорирование: ",
   "Use PAC Mode": "Используйте режим PAC",
diff --git a/clash-verge-rev/src/locales/zh.json b/clash-verge-rev/src/locales/zh.json
index 24042d76a9..ddd9b3c40e 100644
--- a/clash-verge-rev/src/locales/zh.json
+++ b/clash-verge-rev/src/locales/zh.json
@@ -50,8 +50,8 @@
   "Expire Time": "到期时间",
   "Create Profile": "新建配置",
   "Edit Profile": "编辑配置",
-  "Edit Proxies": "添加/删除 节点",
-  "Edit Rules": "添加/删除 规则",
+  "Edit Proxies": "编辑节点",
+  "Edit Rules": "编辑规则",
   "Rule Type": "规则类型",
   "Rule Content": "规则内容",
   "Proxy Policy": "代理策略",
@@ -59,9 +59,11 @@
   "Add Prepend Rule": "添加前置规则",
   "Add Append Rule": "添加后置规则",
   "Delete Rule": "删除规则",
-  "Edit Groups": "添加/删除 代理组",
-  "Edit Merge": "微调配置 (yaml)",
-  "Edit Script": "微调配置 (js)",
+  "Edit Groups": "编辑代理组",
+  "Extend Config": "扩展配置",
+  "Extend Script": "扩展脚本",
+  "Global Merge": "全局扩展配置",
+  "Global Script": "全局扩展脚本",
   "Type": "类型",
   "Name": "名称",
   "Descriptions": "描述",
@@ -151,6 +153,7 @@
   "Proxy Guard": "系统代理守卫",
   "Proxy Guard Info": "开启以防止其他软件修改操作系统的代理设置",
   "Guard Duration": "代理守卫间隔",
+  "Always use Default Bypass": "始终使用默认绕过",
   "Proxy Bypass": "代理绕过设置：",
   "Bypass": "当前绕过：",
   "Use PAC Mode": "使用PAC模式",
diff --git a/clash-verge-rev/src/pages/profiles.tsx b/clash-verge-rev/src/pages/profiles.tsx
index 9c641e6404..dedfbee9b4 100644
--- a/clash-verge-rev/src/pages/profiles.tsx
+++ b/clash-verge-rev/src/pages/profiles.tsx
@@ -41,6 +41,7 @@ import {
   ProfileViewer,
   ProfileViewerRef,
 } from "@/components/profile/profile-viewer";
+import { ProfileMore } from "@/components/profile/profile-more";
 import { ProfileItem } from "@/components/profile/profile-item";
 import { useProfiles } from "@/hooks/use-profiles";
 import { ConfigViewer } from "@/components/setting/mods/config-viewer";
@@ -49,6 +50,7 @@ import { BaseStyledTextField } from "@/components/base/base-styled-text-field";
 import { listen } from "@tauri-apps/api/event";
 import { readTextFile } from "@tauri-apps/api/fs";
 import { readText } from "@tauri-apps/api/clipboard";
+import { EditorViewer } from "@/components/profile/editor-viewer";
 
 const ProfilePage = () => {
   const { t } = useTranslation();
@@ -244,6 +246,12 @@ const ProfilePage = () => {
     if (text) setUrl(text);
   };
 
+  const mode = useThemeMode();
+  const islight = mode === "light" ? true : false;
+  const dividercolor = islight
+    ? "rgba(0, 0, 0, 0.06)"
+    : "rgba(255, 255, 255, 0.06)";
+
   return (
     <BasePage
       full
@@ -383,7 +391,38 @@ const ProfilePage = () => {
             </Grid>
           </Box>
         </DndContext>
+        <Divider
+          variant="middle"
+          flexItem
+          sx={{ width: `calc(100% - 32px)`, borderColor: dividercolor }}
+        ></Divider>
+        <Box sx={{ mt: 1.5 }}>
+          <Grid container spacing={{ xs: 1, lg: 1 }}>
+            <Grid item xs={12} sm={6} md={6} lg={6}>
+              <ProfileMore
+                id="Merge"
+                onChange={async (prev, curr) => {
+                  if (prev !== curr) {
+                    await onEnhance();
+                  }
+                }}
+              />
+            </Grid>
+            <Grid item xs={12} sm={6} md={6} lg={6}>
+              <ProfileMore
+                id="Script"
+                logInfo={chainLogs["Script"]}
+                onChange={async (prev, curr) => {
+                  if (prev !== curr) {
+                    await onEnhance();
+                  }
+                }}
+              />
+            </Grid>
+          </Grid>
+        </Box>
       </Box>
+
       <ProfileViewer ref={viewerRef} onChange={() => mutateProfiles()} />
       <ConfigViewer ref={configRef} />
     </BasePage>
diff --git a/clash-verge-rev/src/services/types.d.ts b/clash-verge-rev/src/services/types.d.ts
index b5fe361519..35a3f3c5cf 100644
--- a/clash-verge-rev/src/services/types.d.ts
+++ b/clash-verge-rev/src/services/types.d.ts
@@ -239,6 +239,7 @@ interface IVergeConfig {
   verge_socks_enabled?: boolean;
   verge_http_enabled?: boolean;
   enable_proxy_guard?: boolean;
+  use_default_bypass?: boolean;
   proxy_guard_duration?: number;
   system_proxy_bypass?: string;
   web_ui_list?: string[];
diff --git a/hysteria/app/cmd/server.go b/hysteria/app/cmd/server.go
index d2c9f4cf73..b45fb15135 100644
--- a/hysteria/app/cmd/server.go
+++ b/hysteria/app/cmd/server.go
@@ -34,7 +34,9 @@ import (
 	"github.com/apernet/hysteria/extras/v2/masq"
 	"github.com/apernet/hysteria/extras/v2/obfs"
 	"github.com/apernet/hysteria/extras/v2/outbounds"
+	"github.com/apernet/hysteria/extras/v2/sniff"
 	"github.com/apernet/hysteria/extras/v2/trafficlogger"
+	eUtils "github.com/apernet/hysteria/extras/v2/utils"
 )
 
 const (
@@ -64,6 +66,7 @@ type serverConfig struct {
 	UDPIdleTimeout        time.Duration               `mapstructure:"udpIdleTimeout"`
 	Auth                  serverConfigAuth            `mapstructure:"auth"`
 	Resolver              serverConfigResolver        `mapstructure:"resolver"`
+	Sniff                 serverConfigSniff           `mapstructure:"sniff"`
 	ACL                   serverConfigACL             `mapstructure:"acl"`
 	Outbounds             []serverConfigOutboundEntry `mapstructure:"outbounds"`
 	TrafficStats          serverConfigTrafficStats    `mapstructure:"trafficStats"`
@@ -179,6 +182,14 @@ type serverConfigResolver struct {
 	HTTPS serverConfigResolverHTTPS `mapstructure:"https"`
 }
 
+type serverConfigSniff struct {
+	Enable        bool          `mapstructure:"enable"`
+	Timeout       time.Duration `mapstructure:"timeout"`
+	RewriteDomain bool          `mapstructure:"rewriteDomain"`
+	TCPPorts      string        `mapstructure:"tcpPorts"`
+	UDPPorts      string        `mapstructure:"udpPorts"`
+}
+
 type serverConfigACL struct {
 	File              string        `mapstructure:"file"`
 	Inline            []string      `mapstructure:"inline"`
@@ -541,6 +552,29 @@ func serverConfigOutboundHTTPToOutbound(c serverConfigOutboundHTTP) (outbounds.P
 	return outbounds.NewHTTPOutbound(c.URL, c.Insecure)
 }
 
+func (c *serverConfig) fillRequestHook(hyConfig *server.Config) error {
+	if c.Sniff.Enable {
+		s := &sniff.Sniffer{
+			Timeout:       c.Sniff.Timeout,
+			RewriteDomain: c.Sniff.RewriteDomain,
+		}
+		if c.Sniff.TCPPorts != "" {
+			s.TCPPorts = eUtils.ParsePortUnion(c.Sniff.TCPPorts)
+			if s.TCPPorts == nil {
+				return configError{Field: "sniff.tcpPorts", Err: errors.New("invalid port union")}
+			}
+		}
+		if c.Sniff.UDPPorts != "" {
+			s.UDPPorts = eUtils.ParsePortUnion(c.Sniff.UDPPorts)
+			if s.UDPPorts == nil {
+				return configError{Field: "sniff.udpPorts", Err: errors.New("invalid port union")}
+			}
+		}
+		hyConfig.RequestHook = s
+	}
+	return nil
+}
+
 func (c *serverConfig) fillOutboundConfig(hyConfig *server.Config) error {
 	// Resolver, ACL, actual outbound are all implemented through the Outbound interface.
 	// Depending on the config, we build a chain like this:
@@ -821,6 +855,7 @@ func (c *serverConfig) Config() (*server.Config, error) {
 		c.fillConn,
 		c.fillTLSConfig,
 		c.fillQUICConfig,
+		c.fillRequestHook,
 		c.fillOutboundConfig,
 		c.fillBandwidthConfig,
 		c.fillIgnoreClientBandwidth,
diff --git a/hysteria/app/cmd/server_test.go b/hysteria/app/cmd/server_test.go
index d81a61a095..bb2d12a82c 100644
--- a/hysteria/app/cmd/server_test.go
+++ b/hysteria/app/cmd/server_test.go
@@ -111,6 +111,13 @@ func TestServerConfig(t *testing.T) {
 				Insecure: true,
 			},
 		},
+		Sniff: serverConfigSniff{
+			Enable:        true,
+			Timeout:       1 * time.Second,
+			RewriteDomain: true,
+			TCPPorts:      "80,443,1000-2000",
+			UDPPorts:      "443",
+		},
 		ACL: serverConfigACL{
 			File: "chnroute.txt",
 			Inline: []string{
diff --git a/hysteria/app/cmd/server_test.yaml b/hysteria/app/cmd/server_test.yaml
index 86a2dcf2ae..ff0bf52068 100644
--- a/hysteria/app/cmd/server_test.yaml
+++ b/hysteria/app/cmd/server_test.yaml
@@ -83,6 +83,13 @@ resolver:
     sni: real.stuff.net
     insecure: true
 
+sniff:
+  enable: true
+  timeout: 1s
+  rewriteDomain: true
+  tcpPorts: 80,443,1000-2000
+  udpPorts: 443
+
 acl:
   file: chnroute.txt
   inline:
diff --git a/hysteria/app/cmd/speedtest.go b/hysteria/app/cmd/speedtest.go
index 12d3a83718..f5c37fb81a 100644
--- a/hysteria/app/cmd/speedtest.go
+++ b/hysteria/app/cmd/speedtest.go
@@ -3,6 +3,9 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -68,11 +71,26 @@ func runSpeedtest(cmd *cobra.Command, args []string) {
 		zap.Bool("udpEnabled", info.UDPEnabled),
 		zap.Uint64("tx", info.Tx))
 
-	if !skipDownload {
-		runDownloadTest(c)
-	}
-	if !skipUpload {
-		runUploadTest(c)
+	signalChan := make(chan os.Signal, 1)
+	signal.Notify(signalChan, os.Interrupt, syscall.SIGTERM)
+	defer signal.Stop(signalChan)
+
+	runChan := make(chan struct{}, 1)
+	go func() {
+		if !skipDownload {
+			runDownloadTest(c)
+		}
+		if !skipUpload {
+			runUploadTest(c)
+		}
+		runChan <- struct{}{}
+	}()
+
+	select {
+	case <-signalChan:
+		logger.Info("received signal, shutting down gracefully")
+	case <-runChan:
+		logger.Info("speed test complete")
 	}
 }
 
diff --git a/hysteria/app/go.mod b/hysteria/app/go.mod
index bfc20b08b9..dfbea428ec 100644
--- a/hysteria/app/go.mod
+++ b/hysteria/app/go.mod
@@ -23,12 +23,14 @@ require (
 	github.com/txthinking/socks5 v0.0.0-20230325130024-4230056ae301
 	go.uber.org/zap v1.24.0
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
-	golang.org/x/sys v0.20.0
+	golang.org/x/sys v0.21.0
 )
 
 require (
+	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/apernet/quic-go v0.44.1-0.20240520215222-bb2e53664023 // indirect
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 // indirect
+	github.com/cloudflare/circl v1.3.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -40,6 +42,7 @@ require (
 	github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.1.1 // indirect
 	github.com/libdns/libdns v0.2.2 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -51,6 +54,7 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/refraction-networking/utls v1.6.6 // indirect
 	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
 	github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
@@ -66,13 +70,13 @@ require (
 	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.20.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/hysteria/app/go.sum b/hysteria/app/go.sum
index 550394f702..e1b80a594d 100644
--- a/hysteria/app/go.sum
+++ b/hysteria/app/go.sum
@@ -38,6 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f h1:uVh0qpEslrWjgzx9vOcyCqsOY3c9kofDZ1n+qaw35ZY=
 github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f/go.mod h1:xkkq9D4ygcldQQhKS/w9CadiCKwCngU7K9E3DaKahpM=
 github.com/apernet/quic-go v0.44.1-0.20240520215222-bb2e53664023 h1:UTrvVPt+GfeOeli9/3gvpCDz2Jd5UEn3YotfP0u/pok=
@@ -55,6 +57,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE=
+github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -164,6 +168,8 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.1.1 h1:t0wUqjowdm8ezddV5k0tLWVklVuvLJpoHeb4WBdydm0=
 github.com/klauspost/cpuid/v2 v2.1.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@@ -222,6 +228,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/refraction-networking/utls v1.6.6 h1:igFsYBUJPYM8Rno9xUuDoM5GQrVEqY4llzEXOkL43Ig=
+github.com/refraction-networking/utls v1.6.6/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
@@ -306,8 +314,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -455,8 +463,8 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -468,8 +476,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -526,8 +534,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/hysteria/core/go.mod b/hysteria/core/go.mod
index 66a89380b4..f35cc548a7 100644
--- a/hysteria/core/go.mod
+++ b/hysteria/core/go.mod
@@ -22,12 +22,12 @@ require (
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/hysteria/core/go.sum b/hysteria/core/go.sum
index a8e10c4b4e..1a133cbe60 100644
--- a/hysteria/core/go.sum
+++ b/hysteria/core/go.sum
@@ -47,8 +47,8 @@ go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
 go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
@@ -58,14 +58,14 @@ golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/hysteria/extras/go.mod b/hysteria/extras/go.mod
index 58304186fd..2d9fae7ec5 100644
--- a/hysteria/extras/go.mod
+++ b/hysteria/extras/go.mod
@@ -4,21 +4,25 @@ go 1.21
 
 require (
 	github.com/apernet/hysteria/core/v2 v2.0.0-00010101000000-000000000000
+	github.com/apernet/quic-go v0.44.1-0.20240520215222-bb2e53664023
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
 	github.com/hashicorp/golang-lru/v2 v2.0.5
 	github.com/miekg/dns v1.1.59
+	github.com/refraction-networking/utls v1.6.6
 	github.com/stretchr/testify v1.9.0
 	github.com/txthinking/socks5 v0.0.0-20230325130024-4230056ae301
-	golang.org/x/crypto v0.23.0
+	golang.org/x/crypto v0.24.0
 	golang.org/x/net v0.25.0
 	google.golang.org/protobuf v1.34.1
 )
 
 require (
-	github.com/apernet/quic-go v0.44.1-0.20240520215222-bb2e53664023 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/cloudflare/circl v1.3.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
@@ -30,9 +34,9 @@ require (
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
diff --git a/hysteria/extras/go.sum b/hysteria/extras/go.sum
index 5d931d7793..74dceb5690 100644
--- a/hysteria/extras/go.sum
+++ b/hysteria/extras/go.sum
@@ -1,3 +1,5 @@
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/apernet/quic-go v0.44.1-0.20240520215222-bb2e53664023 h1:UTrvVPt+GfeOeli9/3gvpCDz2Jd5UEn3YotfP0u/pok=
 github.com/apernet/quic-go v0.44.1-0.20240520215222-bb2e53664023/go.mod h1:UkcG7+34BM+bbH2RFVKtHQp3mR7h8yJHx4z95lZ7sx4=
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 h1:4NNbNM2Iq/k57qEu7WfL67UrbPq1uFWxW4qODCohi+0=
@@ -5,6 +7,8 @@ github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE=
+github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -22,6 +26,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe
 github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4=
 github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -39,6 +45,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/refraction-networking/utls v1.6.6 h1:igFsYBUJPYM8Rno9xUuDoM5GQrVEqY4llzEXOkL43Ig=
+github.com/refraction-networking/utls v1.6.6/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -58,8 +66,8 @@ go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -84,8 +92,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -93,16 +101,16 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
diff --git a/hysteria/extras/sniff/.mockery.yaml b/hysteria/extras/sniff/.mockery.yaml
new file mode 100644
index 0000000000..c866d1da1c
--- /dev/null
+++ b/hysteria/extras/sniff/.mockery.yaml
@@ -0,0 +1,12 @@
+with-expecter: true
+dir: .
+outpkg: sniff
+packages:
+  github.com/apernet/quic-go:
+    interfaces:
+      Stream:
+        config:
+          mockname: mockStream
+          replace-type: # internal package alias dirty fix
+            - github.com/apernet/quic-go/internal/protocol=github.com/apernet/quic-go
+            - github.com/apernet/quic-go/internal/qerr=github.com/apernet/quic-go
diff --git a/hysteria/extras/sniff/internal/quic/LICENSE b/hysteria/extras/sniff/internal/quic/LICENSE
new file mode 100644
index 0000000000..43970c4103
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/LICENSE
@@ -0,0 +1,31 @@
+Author:: Cuong Manh Le <cuong.manhle.vn@gmail.com>
+Copyright:: Copyright (c) 2023, Cuong Manh Le
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of the @organization@ nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LE MANH CUONG
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/hysteria/extras/sniff/internal/quic/README.md b/hysteria/extras/sniff/internal/quic/README.md
new file mode 100644
index 0000000000..8f3a5e2a66
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/README.md
@@ -0,0 +1 @@
+The code here is from https://github.com/cuonglm/quicsni with various modifications.
\ No newline at end of file
diff --git a/hysteria/extras/sniff/internal/quic/header.go b/hysteria/extras/sniff/internal/quic/header.go
new file mode 100644
index 0000000000..c1a5e7c4c8
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/header.go
@@ -0,0 +1,105 @@
+package quic
+
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"io"
+
+	"github.com/apernet/quic-go/quicvarint"
+)
+
+// The Header represents a QUIC header.
+type Header struct {
+	Type             uint8
+	Version          uint32
+	SrcConnectionID  []byte
+	DestConnectionID []byte
+	Length           int64
+	Token            []byte
+}
+
+// ParseInitialHeader parses the initial packet of a QUIC connection,
+// return the initial header and number of bytes read so far.
+func ParseInitialHeader(data []byte) (*Header, int64, error) {
+	br := bytes.NewReader(data)
+	hdr, err := parseLongHeader(br)
+	if err != nil {
+		return nil, 0, err
+	}
+	n := int64(len(data) - br.Len())
+	return hdr, n, nil
+}
+
+func parseLongHeader(b *bytes.Reader) (*Header, error) {
+	typeByte, err := b.ReadByte()
+	if err != nil {
+		return nil, err
+	}
+	h := &Header{}
+	ver, err := beUint32(b)
+	if err != nil {
+		return nil, err
+	}
+	h.Version = ver
+	if h.Version != 0 && typeByte&0x40 == 0 {
+		return nil, errors.New("not a QUIC packet")
+	}
+	destConnIDLen, err := b.ReadByte()
+	if err != nil {
+		return nil, err
+	}
+	h.DestConnectionID = make([]byte, int(destConnIDLen))
+	if err := readConnectionID(b, h.DestConnectionID); err != nil {
+		return nil, err
+	}
+	srcConnIDLen, err := b.ReadByte()
+	if err != nil {
+		return nil, err
+	}
+	h.SrcConnectionID = make([]byte, int(srcConnIDLen))
+	if err := readConnectionID(b, h.SrcConnectionID); err != nil {
+		return nil, err
+	}
+
+	initialPacketType := byte(0b00)
+	if h.Version == V2 {
+		initialPacketType = 0b01
+	}
+	if (typeByte >> 4 & 0b11) == initialPacketType {
+		tokenLen, err := quicvarint.Read(b)
+		if err != nil {
+			return nil, err
+		}
+		if tokenLen > uint64(b.Len()) {
+			return nil, io.EOF
+		}
+		h.Token = make([]byte, tokenLen)
+		if _, err := io.ReadFull(b, h.Token); err != nil {
+			return nil, err
+		}
+	}
+
+	pl, err := quicvarint.Read(b)
+	if err != nil {
+		return nil, err
+	}
+	h.Length = int64(pl)
+	return h, err
+}
+
+func readConnectionID(r io.Reader, cid []byte) error {
+	_, err := io.ReadFull(r, cid)
+	if err == io.ErrUnexpectedEOF {
+		return io.EOF
+	}
+	return nil
+}
+
+func beUint32(r io.Reader) (uint32, error) {
+	b := make([]byte, 4)
+	if _, err := io.ReadFull(r, b); err != nil {
+		return 0, err
+	}
+	return binary.BigEndian.Uint32(b), nil
+}
diff --git a/hysteria/extras/sniff/internal/quic/packet_protector.go b/hysteria/extras/sniff/internal/quic/packet_protector.go
new file mode 100644
index 0000000000..42de841134
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/packet_protector.go
@@ -0,0 +1,193 @@
+package quic
+
+import (
+	"crypto"
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/sha256"
+	"crypto/tls"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"hash"
+
+	"golang.org/x/crypto/chacha20"
+	"golang.org/x/crypto/chacha20poly1305"
+	"golang.org/x/crypto/cryptobyte"
+	"golang.org/x/crypto/hkdf"
+)
+
+// NewProtectionKey creates a new ProtectionKey.
+func NewProtectionKey(suite uint16, secret []byte, v uint32) (*ProtectionKey, error) {
+	return newProtectionKey(suite, secret, v)
+}
+
+// NewInitialProtectionKey is like NewProtectionKey, but the returned protection key
+// is used for encrypt/decrypt Initial Packet only.
+//
+// See: https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-initial-secrets
+func NewInitialProtectionKey(secret []byte, v uint32) (*ProtectionKey, error) {
+	return NewProtectionKey(tls.TLS_AES_128_GCM_SHA256, secret, v)
+}
+
+// NewPacketProtector creates a new PacketProtector.
+func NewPacketProtector(key *ProtectionKey) *PacketProtector {
+	return &PacketProtector{key: key}
+}
+
+// PacketProtector is used for protecting a QUIC packet.
+//
+// See: https://www.rfc-editor.org/rfc/rfc9001.html#name-packet-protection
+type PacketProtector struct {
+	key *ProtectionKey
+}
+
+// UnProtect decrypts a QUIC packet.
+func (pp *PacketProtector) UnProtect(packet []byte, pnOffset, pnMax int64) ([]byte, error) {
+	if isLongHeader(packet[0]) && int64(len(packet)) < pnOffset+4+16 {
+		return nil, errors.New("packet with long header is too small")
+	}
+
+	// https://www.rfc-editor.org/rfc/rfc9001.html#name-header-protection-sample
+	sampleOffset := pnOffset + 4
+	sample := packet[sampleOffset : sampleOffset+16]
+
+	// https://www.rfc-editor.org/rfc/rfc9001.html#name-header-protection-applicati
+	mask := pp.key.headerProtection(sample)
+	if isLongHeader(packet[0]) {
+		// Long header: 4 bits masked
+		packet[0] ^= mask[0] & 0x0f
+	} else {
+		// Short header: 5 bits masked
+		packet[0] ^= mask[0] & 0x1f
+	}
+
+	pnLen := packet[0]&0x3 + 1
+	pn := int64(0)
+	for i := uint8(0); i < pnLen; i++ {
+		packet[pnOffset:][i] ^= mask[1+i]
+		pn = (pn << 8) | int64(packet[pnOffset:][i])
+	}
+	pn = decodePacketNumber(pnMax, pn, pnLen)
+	hdr := packet[:pnOffset+int64(pnLen)]
+	payload := packet[pnOffset:][pnLen:]
+	dec, err := pp.key.aead.Open(payload[:0], pp.key.nonce(pn), payload, hdr)
+	if err != nil {
+		return nil, fmt.Errorf("decryption failed: %w", err)
+	}
+	return dec, nil
+}
+
+// ProtectionKey is the key used to protect a QUIC packet.
+type ProtectionKey struct {
+	aead             cipher.AEAD
+	headerProtection func(sample []byte) (mask []byte)
+	iv               []byte
+}
+
+// https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-aead-usage
+//
+// "The 62 bits of the reconstructed QUIC packet number in network byte order are
+// left-padded with zeros to the size of the IV. The exclusive OR of the padded
+// packet number and the IV forms the AEAD nonce."
+func (pk *ProtectionKey) nonce(pn int64) []byte {
+	nonce := make([]byte, len(pk.iv))
+	binary.BigEndian.PutUint64(nonce[len(nonce)-8:], uint64(pn))
+	for i := range pk.iv {
+		nonce[i] ^= pk.iv[i]
+	}
+	return nonce
+}
+
+func newProtectionKey(suite uint16, secret []byte, v uint32) (*ProtectionKey, error) {
+	switch suite {
+	case tls.TLS_AES_128_GCM_SHA256:
+		key := hkdfExpandLabel(crypto.SHA256.New, secret, keyLabel(v), nil, 16)
+		c, err := aes.NewCipher(key)
+		if err != nil {
+			panic(err)
+		}
+		aead, err := cipher.NewGCM(c)
+		if err != nil {
+			panic(err)
+		}
+		iv := hkdfExpandLabel(crypto.SHA256.New, secret, ivLabel(v), nil, aead.NonceSize())
+		hpKey := hkdfExpandLabel(crypto.SHA256.New, secret, headerProtectionLabel(v), nil, 16)
+		hp, err := aes.NewCipher(hpKey)
+		if err != nil {
+			panic(err)
+		}
+		k := &ProtectionKey{}
+		k.aead = aead
+		// https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-aes-based-header-protection
+		k.headerProtection = func(sample []byte) []byte {
+			mask := make([]byte, hp.BlockSize())
+			hp.Encrypt(mask, sample)
+			return mask
+		}
+		k.iv = iv
+		return k, nil
+	case tls.TLS_CHACHA20_POLY1305_SHA256:
+		key := hkdfExpandLabel(crypto.SHA256.New, secret, keyLabel(v), nil, chacha20poly1305.KeySize)
+		aead, err := chacha20poly1305.New(key)
+		if err != nil {
+			return nil, err
+		}
+		iv := hkdfExpandLabel(crypto.SHA256.New, secret, ivLabel(v), nil, aead.NonceSize())
+		hpKey := hkdfExpandLabel(sha256.New, secret, headerProtectionLabel(v), nil, chacha20.KeySize)
+		k := &ProtectionKey{}
+		k.aead = aead
+		// https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-chacha20-based-header-prote
+		k.headerProtection = func(sample []byte) []byte {
+			nonce := sample[4:16]
+			c, err := chacha20.NewUnauthenticatedCipher(hpKey, nonce)
+			if err != nil {
+				panic(err)
+			}
+			c.SetCounter(binary.LittleEndian.Uint32(sample[:4]))
+			mask := make([]byte, 5)
+			c.XORKeyStream(mask, mask)
+			return mask
+		}
+		k.iv = iv
+		return k, nil
+	}
+	return nil, errors.New("not supported cipher suite")
+}
+
+// decodePacketNumber decode the packet number after header protection removed.
+//
+// See: https://datatracker.ietf.org/doc/html/draft-ietf-quic-transport-32#section-appendix.a
+func decodePacketNumber(largest, truncated int64, nbits uint8) int64 {
+	expected := largest + 1
+	win := int64(1 << (nbits * 8))
+	hwin := win / 2
+	mask := win - 1
+	candidate := (expected &^ mask) | truncated
+	switch {
+	case candidate <= expected-hwin && candidate < (1<<62)-win:
+		return candidate + win
+	case candidate > expected+hwin && candidate >= win:
+		return candidate - win
+	}
+	return candidate
+}
+
+// Copied from crypto/tls/key_schedule.go.
+func hkdfExpandLabel(hash func() hash.Hash, secret []byte, label string, context []byte, length int) []byte {
+	var hkdfLabel cryptobyte.Builder
+	hkdfLabel.AddUint16(uint16(length))
+	hkdfLabel.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) {
+		b.AddBytes([]byte("tls13 "))
+		b.AddBytes([]byte(label))
+	})
+	hkdfLabel.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) {
+		b.AddBytes(context)
+	})
+	out := make([]byte, length)
+	n, err := hkdf.Expand(hash, secret, hkdfLabel.BytesOrPanic()).Read(out)
+	if err != nil || n != length {
+		panic("quic: HKDF-Expand-Label invocation failed unexpectedly")
+	}
+	return out
+}
diff --git a/hysteria/extras/sniff/internal/quic/packet_protector_test.go b/hysteria/extras/sniff/internal/quic/packet_protector_test.go
new file mode 100644
index 0000000000..bc355d2186
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/packet_protector_test.go
@@ -0,0 +1,94 @@
+package quic
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/tls"
+	"encoding/hex"
+	"strings"
+	"testing"
+	"unicode"
+
+	"golang.org/x/crypto/hkdf"
+)
+
+func TestInitialPacketProtector_UnProtect(t *testing.T) {
+	// https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-server-initial
+	protect := mustHexDecodeString(`
+			c7ff0000200008f067a5502a4262b500 4075fb12ff07823a5d24534d906ce4c7
+			6782a2167e3479c0f7f6395dc2c91676 302fe6d70bb7cbeb117b4ddb7d173498
+			44fd61dae200b8338e1b932976b61d91 e64a02e9e0ee72e3a6f63aba4ceeeec5
+			be2f24f2d86027572943533846caa13e 6f163fb257473d0eda5047360fd4a47e
+			fd8142fafc0f76
+		`)
+	unProtect := mustHexDecodeString(`
+			02000000000600405a020000560303ee fce7f7b37ba1d1632e96677825ddf739
+			88cfc79825df566dc5430b9a045a1200 130100002e00330024001d00209d3c94
+			0d89690b84d08a60993c144eca684d10 81287c834d5311bcf32bb9da1a002b00
+			020304
+		`)
+
+	connID := mustHexDecodeString(`8394c8f03e515708`)
+
+	packet := append([]byte{}, protect...)
+	hdr, offset, err := ParseInitialHeader(packet)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	initialSecret := hkdf.Extract(crypto.SHA256.New, connID, getSalt(hdr.Version))
+	serverSecret := hkdfExpandLabel(crypto.SHA256.New, initialSecret, "server in", []byte{}, crypto.SHA256.Size())
+	key, err := NewInitialProtectionKey(serverSecret, hdr.Version)
+	if err != nil {
+		t.Fatal(err)
+	}
+	pp := NewPacketProtector(key)
+	got, err := pp.UnProtect(protect, offset, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(got, unProtect) {
+		t.Error("UnProtect returns wrong result")
+	}
+}
+
+func TestPacketProtectorShortHeader_UnProtect(t *testing.T) {
+	// https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-chacha20-poly1305-short-hea
+	protect := mustHexDecodeString(`4cfe4189655e5cd55c41f69080575d7999c25a5bfb`)
+	unProtect := mustHexDecodeString(`01`)
+	hdr := mustHexDecodeString(`4200bff4`)
+
+	secret := mustHexDecodeString(`9ac312a7f877468ebe69422748ad00a1 5443f18203a07d6060f688f30f21632b`)
+	k, err := NewProtectionKey(tls.TLS_CHACHA20_POLY1305_SHA256, secret, V1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pnLen := int(hdr[0]&0x03) + 1
+	offset := len(hdr) - pnLen
+	pp := NewPacketProtector(k)
+	got, err := pp.UnProtect(protect, int64(offset), 654360564)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(got, unProtect) {
+		t.Error("UnProtect returns wrong result")
+	}
+}
+
+func mustHexDecodeString(s string) []byte {
+	b, err := hex.DecodeString(normalizeHex(s))
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
+
+func normalizeHex(s string) string {
+	return strings.Map(func(c rune) rune {
+		if unicode.IsSpace(c) {
+			return -1
+		}
+		return c
+	}, s)
+}
diff --git a/hysteria/extras/sniff/internal/quic/payload.go b/hysteria/extras/sniff/internal/quic/payload.go
new file mode 100644
index 0000000000..453b714a4c
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/payload.go
@@ -0,0 +1,122 @@
+package quic
+
+import (
+	"bytes"
+	"crypto"
+	"errors"
+	"fmt"
+	"io"
+	"sort"
+
+	"github.com/apernet/quic-go/quicvarint"
+	"golang.org/x/crypto/hkdf"
+)
+
+func ReadCryptoPayload(packet []byte) ([]byte, error) {
+	hdr, offset, err := ParseInitialHeader(packet)
+	if err != nil {
+		return nil, err
+	}
+	// Some sanity checks
+	if hdr.Version != V1 && hdr.Version != V2 {
+		return nil, fmt.Errorf("unsupported version: %x", hdr.Version)
+	}
+	if offset == 0 || hdr.Length == 0 {
+		return nil, errors.New("invalid packet")
+	}
+
+	initialSecret := hkdf.Extract(crypto.SHA256.New, hdr.DestConnectionID, getSalt(hdr.Version))
+	clientSecret := hkdfExpandLabel(crypto.SHA256.New, initialSecret, "client in", []byte{}, crypto.SHA256.Size())
+	key, err := NewInitialProtectionKey(clientSecret, hdr.Version)
+	if err != nil {
+		return nil, fmt.Errorf("NewInitialProtectionKey: %w", err)
+	}
+	pp := NewPacketProtector(key)
+	// https://datatracker.ietf.org/doc/html/draft-ietf-quic-tls-32#name-client-initial
+	//
+	// "The unprotected header includes the connection ID and a 4-byte packet number encoding for a packet number of 2"
+	if int64(len(packet)) < offset+hdr.Length {
+		return nil, fmt.Errorf("packet is too short: %d < %d", len(packet), offset+hdr.Length)
+	}
+	unProtectedPayload, err := pp.UnProtect(packet[:offset+hdr.Length], offset, 2)
+	if err != nil {
+		return nil, err
+	}
+	frs, err := extractCryptoFrames(bytes.NewReader(unProtectedPayload))
+	if err != nil {
+		return nil, err
+	}
+	data := assembleCryptoFrames(frs)
+	if data == nil {
+		return nil, errors.New("unable to assemble crypto frames")
+	}
+	return data, nil
+}
+
+const (
+	paddingFrameType = 0x00
+	pingFrameType    = 0x01
+	cryptoFrameType  = 0x06
+)
+
+type cryptoFrame struct {
+	Offset int64
+	Data   []byte
+}
+
+func extractCryptoFrames(r *bytes.Reader) ([]cryptoFrame, error) {
+	var frames []cryptoFrame
+	for r.Len() > 0 {
+		typ, err := quicvarint.Read(r)
+		if err != nil {
+			return nil, err
+		}
+		if typ == paddingFrameType || typ == pingFrameType {
+			continue
+		}
+		if typ != cryptoFrameType {
+			return nil, fmt.Errorf("encountered unexpected frame type: %d", typ)
+		}
+		var frame cryptoFrame
+		offset, err := quicvarint.Read(r)
+		if err != nil {
+			return nil, err
+		}
+		frame.Offset = int64(offset)
+		dataLen, err := quicvarint.Read(r)
+		if err != nil {
+			return nil, err
+		}
+		frame.Data = make([]byte, dataLen)
+		if _, err := io.ReadFull(r, frame.Data); err != nil {
+			return nil, err
+		}
+		frames = append(frames, frame)
+	}
+	return frames, nil
+}
+
+// assembleCryptoFrames assembles multiple crypto frames into a single slice (if possible).
+// It returns an error if the frames cannot be assembled. This can happen if the frames are not contiguous.
+func assembleCryptoFrames(frames []cryptoFrame) []byte {
+	if len(frames) == 0 {
+		return nil
+	}
+	if len(frames) == 1 {
+		return frames[0].Data
+	}
+	// sort the frames by offset
+	sort.Slice(frames, func(i, j int) bool { return frames[i].Offset < frames[j].Offset })
+	// check if the frames are contiguous
+	for i := 1; i < len(frames); i++ {
+		if frames[i].Offset != frames[i-1].Offset+int64(len(frames[i-1].Data)) {
+			return nil
+		}
+	}
+	// concatenate the frames
+	data := make([]byte, frames[len(frames)-1].Offset+int64(len(frames[len(frames)-1].Data)))
+	for _, frame := range frames {
+		copy(data[frame.Offset:], frame.Data)
+	}
+	return data
+}
diff --git a/hysteria/extras/sniff/internal/quic/quic.go b/hysteria/extras/sniff/internal/quic/quic.go
new file mode 100644
index 0000000000..1cfa103867
--- /dev/null
+++ b/hysteria/extras/sniff/internal/quic/quic.go
@@ -0,0 +1,59 @@
+package quic
+
+const (
+	V1 uint32 = 0x1
+	V2 uint32 = 0x6b3343cf
+
+	hkdfLabelKeyV1 = "quic key"
+	hkdfLabelKeyV2 = "quicv2 key"
+	hkdfLabelIVV1  = "quic iv"
+	hkdfLabelIVV2  = "quicv2 iv"
+	hkdfLabelHPV1  = "quic hp"
+	hkdfLabelHPV2  = "quicv2 hp"
+)
+
+var (
+	quicSaltOld = []byte{0xaf, 0xbf, 0xec, 0x28, 0x99, 0x93, 0xd2, 0x4c, 0x9e, 0x97, 0x86, 0xf1, 0x9c, 0x61, 0x11, 0xe0, 0x43, 0x90, 0xa8, 0x99}
+	// https://www.rfc-editor.org/rfc/rfc9001.html#name-initial-secrets
+	quicSaltV1 = []byte{0x38, 0x76, 0x2c, 0xf7, 0xf5, 0x59, 0x34, 0xb3, 0x4d, 0x17, 0x9a, 0xe6, 0xa4, 0xc8, 0x0c, 0xad, 0xcc, 0xbb, 0x7f, 0x0a}
+	// https://www.ietf.org/archive/id/draft-ietf-quic-v2-10.html#name-initial-salt-2
+	quicSaltV2 = []byte{0x0d, 0xed, 0xe3, 0xde, 0xf7, 0x00, 0xa6, 0xdb, 0x81, 0x93, 0x81, 0xbe, 0x6e, 0x26, 0x9d, 0xcb, 0xf9, 0xbd, 0x2e, 0xd9}
+)
+
+// isLongHeader reports whether b is the first byte of a long header packet.
+func isLongHeader(b byte) bool {
+	return b&0x80 > 0
+}
+
+func getSalt(v uint32) []byte {
+	switch v {
+	case V1:
+		return quicSaltV1
+	case V2:
+		return quicSaltV2
+	}
+	return quicSaltOld
+}
+
+func keyLabel(v uint32) string {
+	kl := hkdfLabelKeyV1
+	if v == V2 {
+		kl = hkdfLabelKeyV2
+	}
+	return kl
+}
+
+func ivLabel(v uint32) string {
+	ivl := hkdfLabelIVV1
+	if v == V2 {
+		ivl = hkdfLabelIVV2
+	}
+	return ivl
+}
+
+func headerProtectionLabel(v uint32) string {
+	if v == V2 {
+		return hkdfLabelHPV2
+	}
+	return hkdfLabelHPV1
+}
diff --git a/hysteria/extras/sniff/mock_Stream.go b/hysteria/extras/sniff/mock_Stream.go
new file mode 100644
index 0000000000..8b21e953b9
--- /dev/null
+++ b/hysteria/extras/sniff/mock_Stream.go
@@ -0,0 +1,492 @@
+// Code generated by mockery v2.43.0. DO NOT EDIT.
+
+package sniff
+
+import (
+	context "context"
+
+	qerr "github.com/apernet/quic-go"
+	mock "github.com/stretchr/testify/mock"
+
+	time "time"
+)
+
+// mockStream is an autogenerated mock type for the Stream type
+type mockStream struct {
+	mock.Mock
+}
+
+type mockStream_Expecter struct {
+	mock *mock.Mock
+}
+
+func (_m *mockStream) EXPECT() *mockStream_Expecter {
+	return &mockStream_Expecter{mock: &_m.Mock}
+}
+
+// CancelRead provides a mock function with given fields: _a0
+func (_m *mockStream) CancelRead(_a0 qerr.StreamErrorCode) {
+	_m.Called(_a0)
+}
+
+// mockStream_CancelRead_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CancelRead'
+type mockStream_CancelRead_Call struct {
+	*mock.Call
+}
+
+// CancelRead is a helper method to define mock.On call
+//   - _a0 qerr.StreamErrorCode
+func (_e *mockStream_Expecter) CancelRead(_a0 interface{}) *mockStream_CancelRead_Call {
+	return &mockStream_CancelRead_Call{Call: _e.mock.On("CancelRead", _a0)}
+}
+
+func (_c *mockStream_CancelRead_Call) Run(run func(_a0 qerr.StreamErrorCode)) *mockStream_CancelRead_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(qerr.StreamErrorCode))
+	})
+	return _c
+}
+
+func (_c *mockStream_CancelRead_Call) Return() *mockStream_CancelRead_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *mockStream_CancelRead_Call) RunAndReturn(run func(qerr.StreamErrorCode)) *mockStream_CancelRead_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// CancelWrite provides a mock function with given fields: _a0
+func (_m *mockStream) CancelWrite(_a0 qerr.StreamErrorCode) {
+	_m.Called(_a0)
+}
+
+// mockStream_CancelWrite_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CancelWrite'
+type mockStream_CancelWrite_Call struct {
+	*mock.Call
+}
+
+// CancelWrite is a helper method to define mock.On call
+//   - _a0 qerr.StreamErrorCode
+func (_e *mockStream_Expecter) CancelWrite(_a0 interface{}) *mockStream_CancelWrite_Call {
+	return &mockStream_CancelWrite_Call{Call: _e.mock.On("CancelWrite", _a0)}
+}
+
+func (_c *mockStream_CancelWrite_Call) Run(run func(_a0 qerr.StreamErrorCode)) *mockStream_CancelWrite_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(qerr.StreamErrorCode))
+	})
+	return _c
+}
+
+func (_c *mockStream_CancelWrite_Call) Return() *mockStream_CancelWrite_Call {
+	_c.Call.Return()
+	return _c
+}
+
+func (_c *mockStream_CancelWrite_Call) RunAndReturn(run func(qerr.StreamErrorCode)) *mockStream_CancelWrite_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Close provides a mock function with given fields:
+func (_m *mockStream) Close() error {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func() error); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// mockStream_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close'
+type mockStream_Close_Call struct {
+	*mock.Call
+}
+
+// Close is a helper method to define mock.On call
+func (_e *mockStream_Expecter) Close() *mockStream_Close_Call {
+	return &mockStream_Close_Call{Call: _e.mock.On("Close")}
+}
+
+func (_c *mockStream_Close_Call) Run(run func()) *mockStream_Close_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *mockStream_Close_Call) Return(_a0 error) *mockStream_Close_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *mockStream_Close_Call) RunAndReturn(run func() error) *mockStream_Close_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Context provides a mock function with given fields:
+func (_m *mockStream) Context() context.Context {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Context")
+	}
+
+	var r0 context.Context
+	if rf, ok := ret.Get(0).(func() context.Context); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(context.Context)
+		}
+	}
+
+	return r0
+}
+
+// mockStream_Context_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Context'
+type mockStream_Context_Call struct {
+	*mock.Call
+}
+
+// Context is a helper method to define mock.On call
+func (_e *mockStream_Expecter) Context() *mockStream_Context_Call {
+	return &mockStream_Context_Call{Call: _e.mock.On("Context")}
+}
+
+func (_c *mockStream_Context_Call) Run(run func()) *mockStream_Context_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *mockStream_Context_Call) Return(_a0 context.Context) *mockStream_Context_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *mockStream_Context_Call) RunAndReturn(run func() context.Context) *mockStream_Context_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Read provides a mock function with given fields: p
+func (_m *mockStream) Read(p []byte) (int, error) {
+	ret := _m.Called(p)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Read")
+	}
+
+	var r0 int
+	var r1 error
+	if rf, ok := ret.Get(0).(func([]byte) (int, error)); ok {
+		return rf(p)
+	}
+	if rf, ok := ret.Get(0).(func([]byte) int); ok {
+		r0 = rf(p)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	if rf, ok := ret.Get(1).(func([]byte) error); ok {
+		r1 = rf(p)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// mockStream_Read_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Read'
+type mockStream_Read_Call struct {
+	*mock.Call
+}
+
+// Read is a helper method to define mock.On call
+//   - p []byte
+func (_e *mockStream_Expecter) Read(p interface{}) *mockStream_Read_Call {
+	return &mockStream_Read_Call{Call: _e.mock.On("Read", p)}
+}
+
+func (_c *mockStream_Read_Call) Run(run func(p []byte)) *mockStream_Read_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].([]byte))
+	})
+	return _c
+}
+
+func (_c *mockStream_Read_Call) Return(n int, err error) *mockStream_Read_Call {
+	_c.Call.Return(n, err)
+	return _c
+}
+
+func (_c *mockStream_Read_Call) RunAndReturn(run func([]byte) (int, error)) *mockStream_Read_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SetDeadline provides a mock function with given fields: t
+func (_m *mockStream) SetDeadline(t time.Time) error {
+	ret := _m.Called(t)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SetDeadline")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(time.Time) error); ok {
+		r0 = rf(t)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// mockStream_SetDeadline_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetDeadline'
+type mockStream_SetDeadline_Call struct {
+	*mock.Call
+}
+
+// SetDeadline is a helper method to define mock.On call
+//   - t time.Time
+func (_e *mockStream_Expecter) SetDeadline(t interface{}) *mockStream_SetDeadline_Call {
+	return &mockStream_SetDeadline_Call{Call: _e.mock.On("SetDeadline", t)}
+}
+
+func (_c *mockStream_SetDeadline_Call) Run(run func(t time.Time)) *mockStream_SetDeadline_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(time.Time))
+	})
+	return _c
+}
+
+func (_c *mockStream_SetDeadline_Call) Return(_a0 error) *mockStream_SetDeadline_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *mockStream_SetDeadline_Call) RunAndReturn(run func(time.Time) error) *mockStream_SetDeadline_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SetReadDeadline provides a mock function with given fields: t
+func (_m *mockStream) SetReadDeadline(t time.Time) error {
+	ret := _m.Called(t)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SetReadDeadline")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(time.Time) error); ok {
+		r0 = rf(t)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// mockStream_SetReadDeadline_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetReadDeadline'
+type mockStream_SetReadDeadline_Call struct {
+	*mock.Call
+}
+
+// SetReadDeadline is a helper method to define mock.On call
+//   - t time.Time
+func (_e *mockStream_Expecter) SetReadDeadline(t interface{}) *mockStream_SetReadDeadline_Call {
+	return &mockStream_SetReadDeadline_Call{Call: _e.mock.On("SetReadDeadline", t)}
+}
+
+func (_c *mockStream_SetReadDeadline_Call) Run(run func(t time.Time)) *mockStream_SetReadDeadline_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(time.Time))
+	})
+	return _c
+}
+
+func (_c *mockStream_SetReadDeadline_Call) Return(_a0 error) *mockStream_SetReadDeadline_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *mockStream_SetReadDeadline_Call) RunAndReturn(run func(time.Time) error) *mockStream_SetReadDeadline_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// SetWriteDeadline provides a mock function with given fields: t
+func (_m *mockStream) SetWriteDeadline(t time.Time) error {
+	ret := _m.Called(t)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SetWriteDeadline")
+	}
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(time.Time) error); ok {
+		r0 = rf(t)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// mockStream_SetWriteDeadline_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetWriteDeadline'
+type mockStream_SetWriteDeadline_Call struct {
+	*mock.Call
+}
+
+// SetWriteDeadline is a helper method to define mock.On call
+//   - t time.Time
+func (_e *mockStream_Expecter) SetWriteDeadline(t interface{}) *mockStream_SetWriteDeadline_Call {
+	return &mockStream_SetWriteDeadline_Call{Call: _e.mock.On("SetWriteDeadline", t)}
+}
+
+func (_c *mockStream_SetWriteDeadline_Call) Run(run func(t time.Time)) *mockStream_SetWriteDeadline_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(time.Time))
+	})
+	return _c
+}
+
+func (_c *mockStream_SetWriteDeadline_Call) Return(_a0 error) *mockStream_SetWriteDeadline_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *mockStream_SetWriteDeadline_Call) RunAndReturn(run func(time.Time) error) *mockStream_SetWriteDeadline_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// StreamID provides a mock function with given fields:
+func (_m *mockStream) StreamID() qerr.StreamID {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for StreamID")
+	}
+
+	var r0 qerr.StreamID
+	if rf, ok := ret.Get(0).(func() qerr.StreamID); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(qerr.StreamID)
+	}
+
+	return r0
+}
+
+// mockStream_StreamID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'StreamID'
+type mockStream_StreamID_Call struct {
+	*mock.Call
+}
+
+// StreamID is a helper method to define mock.On call
+func (_e *mockStream_Expecter) StreamID() *mockStream_StreamID_Call {
+	return &mockStream_StreamID_Call{Call: _e.mock.On("StreamID")}
+}
+
+func (_c *mockStream_StreamID_Call) Run(run func()) *mockStream_StreamID_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *mockStream_StreamID_Call) Return(_a0 qerr.StreamID) *mockStream_StreamID_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *mockStream_StreamID_Call) RunAndReturn(run func() qerr.StreamID) *mockStream_StreamID_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// Write provides a mock function with given fields: p
+func (_m *mockStream) Write(p []byte) (int, error) {
+	ret := _m.Called(p)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Write")
+	}
+
+	var r0 int
+	var r1 error
+	if rf, ok := ret.Get(0).(func([]byte) (int, error)); ok {
+		return rf(p)
+	}
+	if rf, ok := ret.Get(0).(func([]byte) int); ok {
+		r0 = rf(p)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	if rf, ok := ret.Get(1).(func([]byte) error); ok {
+		r1 = rf(p)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// mockStream_Write_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Write'
+type mockStream_Write_Call struct {
+	*mock.Call
+}
+
+// Write is a helper method to define mock.On call
+//   - p []byte
+func (_e *mockStream_Expecter) Write(p interface{}) *mockStream_Write_Call {
+	return &mockStream_Write_Call{Call: _e.mock.On("Write", p)}
+}
+
+func (_c *mockStream_Write_Call) Run(run func(p []byte)) *mockStream_Write_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].([]byte))
+	})
+	return _c
+}
+
+func (_c *mockStream_Write_Call) Return(n int, err error) *mockStream_Write_Call {
+	_c.Call.Return(n, err)
+	return _c
+}
+
+func (_c *mockStream_Write_Call) RunAndReturn(run func([]byte) (int, error)) *mockStream_Write_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// newMockStream creates a new instance of mockStream. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func newMockStream(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *mockStream {
+	mock := &mockStream{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/hysteria/extras/sniff/sniff.go b/hysteria/extras/sniff/sniff.go
new file mode 100644
index 0000000000..e0c94d44f6
--- /dev/null
+++ b/hysteria/extras/sniff/sniff.go
@@ -0,0 +1,193 @@
+package sniff
+
+import (
+	"bufio"
+	"io"
+	"net"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/apernet/quic-go"
+	utls "github.com/refraction-networking/utls"
+
+	"github.com/apernet/hysteria/core/v2/server"
+	quicInternal "github.com/apernet/hysteria/extras/v2/sniff/internal/quic"
+	"github.com/apernet/hysteria/extras/v2/utils"
+)
+
+const (
+	sniffDefaultTimeout = 4 * time.Second
+)
+
+var _ server.RequestHook = (*Sniffer)(nil)
+
+// Sniffer is a server core RequestHook that performs packet inspection and possibly
+// rewrites the request address based on what's in the protocol header.
+// This is mainly for inbounds that inherently cannot get domain information (e.g. TUN),
+// in which case sniffing can restore the domains and apply ACLs correctly.
+// Currently supports HTTP, HTTPS (TLS) and QUIC.
+type Sniffer struct {
+	Timeout       time.Duration
+	RewriteDomain bool // Whether to rewrite the address even when it's already a domain
+	TCPPorts      utils.PortUnion
+	UDPPorts      utils.PortUnion
+}
+
+func (h *Sniffer) isDomain(addr string) bool {
+	host, _, err := net.SplitHostPort(addr)
+	if err != nil {
+		return false
+	}
+	return net.ParseIP(host) == nil
+}
+
+func (h *Sniffer) isHTTP(buf []byte) bool {
+	if len(buf) < 3 {
+		return false
+	}
+	// First 3 bytes should be English letters (whatever HTTP method)
+	for _, b := range buf[:3] {
+		if (b < 'A' || b > 'Z') && (b < 'a' || b > 'z') {
+			return false
+		}
+	}
+	return true
+}
+
+func (h *Sniffer) isTLS(buf []byte) bool {
+	if len(buf) < 3 {
+		return false
+	}
+	return buf[0] >= 0x16 && buf[0] <= 0x17 &&
+		buf[1] == 0x03 && buf[2] <= 0x09
+}
+
+func (h *Sniffer) Check(isUDP bool, reqAddr string) bool {
+	// @ means it's internal (e.g. speed test)
+	if strings.HasPrefix(reqAddr, "@") {
+		return false
+	}
+	host, port, err := net.SplitHostPort(reqAddr)
+	if err != nil {
+		return false
+	}
+	if !h.RewriteDomain && net.ParseIP(host) == nil {
+		// Is a domain and domain rewriting is disabled
+		return false
+	}
+	portNum, err := strconv.Atoi(port)
+	if err != nil {
+		return false
+	}
+	if isUDP {
+		return h.UDPPorts == nil || h.UDPPorts.Contains(uint16(portNum))
+	} else {
+		return h.TCPPorts == nil || h.TCPPorts.Contains(uint16(portNum))
+	}
+}
+
+func (h *Sniffer) TCP(stream quic.Stream, reqAddr *string) ([]byte, error) {
+	var err error
+	if h.Timeout == 0 {
+		err = stream.SetReadDeadline(time.Now().Add(sniffDefaultTimeout))
+	} else {
+		err = stream.SetReadDeadline(time.Now().Add(h.Timeout))
+	}
+	if err != nil {
+		return nil, err
+	}
+	// Make sure to reset the deadline after sniffing
+	defer stream.SetReadDeadline(time.Time{})
+	// Read 3 bytes to determine the protocol
+	pre := make([]byte, 3)
+	n, err := io.ReadFull(stream, pre)
+	if err != nil {
+		// Not enough within the timeout, just return what we have
+		return pre[:n], nil
+	}
+	if h.isHTTP(pre) {
+		// HTTP
+		tr := &teeReader{Stream: stream, Pre: pre}
+		req, _ := http.ReadRequest(bufio.NewReader(tr))
+		if req != nil && req.Host != "" {
+			_, port, err := net.SplitHostPort(*reqAddr)
+			if err != nil {
+				return nil, err
+			}
+			*reqAddr = net.JoinHostPort(req.Host, port)
+		}
+		return tr.Buffer(), nil
+	} else if h.isTLS(pre) {
+		// TLS
+		// Need to read 2 more bytes (content length)
+		pre = append(pre, make([]byte, 2)...)
+		n, err = io.ReadFull(stream, pre[3:])
+		if err != nil {
+			// Not enough within the timeout, just return what we have
+			return pre[:3+n], nil
+		}
+		contentLength := int(pre[3])<<8 | int(pre[4])
+		pre = append(pre, make([]byte, contentLength)...)
+		n, err = io.ReadFull(stream, pre[5:])
+		if err != nil {
+			// Not enough within the timeout, just return what we have
+			return pre[:5+n], nil
+		}
+		clientHello := utls.UnmarshalClientHello(pre[5:])
+		if clientHello != nil && clientHello.ServerName != "" {
+			_, port, err := net.SplitHostPort(*reqAddr)
+			if err != nil {
+				return nil, err
+			}
+			*reqAddr = net.JoinHostPort(clientHello.ServerName, port)
+		}
+		return pre, nil
+	} else {
+		// Unrecognized protocol, just return what we have
+		return pre, nil
+	}
+}
+
+func (h *Sniffer) UDP(data []byte, reqAddr *string) error {
+	pl, err := quicInternal.ReadCryptoPayload(data)
+	if err != nil || len(pl) < 4 || pl[0] != 0x01 {
+		// Unrecognized protocol, incomplete payload or not a client hello
+		return nil
+	}
+	clientHello := utls.UnmarshalClientHello(pl)
+	if clientHello != nil && clientHello.ServerName != "" {
+		_, port, err := net.SplitHostPort(*reqAddr)
+		if err != nil {
+			return err
+		}
+		*reqAddr = net.JoinHostPort(clientHello.ServerName, port)
+	}
+	return nil
+}
+
+type teeReader struct {
+	Stream quic.Stream
+	Pre    []byte
+
+	buf []byte
+}
+
+func (c *teeReader) Read(b []byte) (n int, err error) {
+	if len(c.Pre) > 0 {
+		n = copy(b, c.Pre)
+		c.Pre = c.Pre[n:]
+		c.buf = append(c.buf, b[:n]...)
+		return n, nil
+	}
+	n, err = c.Stream.Read(b)
+	if n > 0 {
+		c.buf = append(c.buf, b[:n]...)
+	}
+	return n, err
+}
+
+func (c *teeReader) Buffer() []byte {
+	return append(c.Pre, c.buf...)
+}
diff --git a/hysteria/extras/sniff/sniff_test.go b/hysteria/extras/sniff/sniff_test.go
new file mode 100644
index 0000000000..a22784ef11
--- /dev/null
+++ b/hysteria/extras/sniff/sniff_test.go
@@ -0,0 +1,135 @@
+package sniff
+
+import (
+	"encoding/base64"
+	"io"
+	"testing"
+	"time"
+
+	"github.com/apernet/hysteria/extras/v2/utils"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+func TestSnifferCheck(t *testing.T) {
+	sniffer := &Sniffer{
+		Timeout:       1 * time.Second,
+		RewriteDomain: false,
+		TCPPorts:      nil, // nil = all
+		UDPPorts:      nil, // nil = all
+	}
+
+	assert.True(t, sniffer.Check(false, "1.1.1.1:80"))
+	assert.False(t, sniffer.Check(false, "example.com:443"))
+
+	sniffer.RewriteDomain = true
+	assert.True(t, sniffer.Check(false, "example.com:443"))
+
+	sniffer.TCPPorts = []utils.PortRange{{80, 80}}
+	assert.True(t, sniffer.Check(false, "google.com:80"))
+	assert.False(t, sniffer.Check(false, "google.com:443"))
+
+	sniffer.UDPPorts = []utils.PortRange{{443, 443}}
+	assert.True(t, sniffer.Check(true, "google.com:443"))
+	assert.False(t, sniffer.Check(true, "google.com:80"))
+}
+
+func TestSnifferTCP(t *testing.T) {
+	sniffer := &Sniffer{
+		Timeout:       1 * time.Second,
+		RewriteDomain: false,
+	}
+
+	buf := &[]byte{}
+
+	// Test HTTP
+	*buf = []byte("POST /hello HTTP/1.1\r\n" +
+		"Host: example.com\r\n" +
+		"User-Agent: mamamiya\r\n" +
+		"Content-Length: 27\r\n" +
+		"Connection: keep-alive\r\n\r\n" +
+		"param1=value1&param2=value2")
+	index := 0
+	stream := &mockStream{}
+	stream.EXPECT().SetReadDeadline(mock.Anything).Return(nil)
+	stream.EXPECT().Read(mock.Anything).RunAndReturn(func(bs []byte) (int, error) {
+		if index < len(*buf) {
+			n := copy(bs, (*buf)[index:])
+			index += n
+			return n, nil
+		} else {
+			return 0, io.EOF
+		}
+	})
+
+	// Rewrite IP to domain
+	reqAddr := "111.111.111.111:80"
+	putback, err := sniffer.TCP(stream, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, *buf, putback)
+	assert.Equal(t, "example.com:80", reqAddr)
+
+	// Test TLS
+	*buf, err = base64.StdEncoding.DecodeString("FgMBARcBAAETAwPJL2jlt1OAo+Rslkjv/aqKiTthKMaCKg2Gvd+uALDbDCDdY+UIk8ouadEB9fC3j52Y1i7SJZqGIgBRIS6kKieYrAAoEwITAcAswCvAMMAvwCTAI8AowCfACsAJwBTAEwCdAJwAPQA8ADUALwEAAKIAAAAOAAwAAAlpcGluZm8uaW8ABQAFAQAAAAAAKwAJCAMEAwMDAgMBAA0AGgAYCAQIBQgGBAEFAQIBBAMFAwIDAgIGAQYDACMAAAAKAAgABgAdABcAGAAQAAsACQhodHRwLzEuMQAzACYAJAAdACBguQbqNJNyamYxYcrBFpBP7pWv5TgZsP9gwGtMYNKVBQAxAAAAFwAA/wEAAQAALQACAQE=")
+	assert.NoError(t, err)
+	index = 0
+	reqAddr = "222.222.222.222:443"
+	putback, err = sniffer.TCP(stream, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, *buf, putback)
+	assert.Equal(t, "ipinfo.io:443", reqAddr)
+
+	// Test unrecognized 1
+	*buf = []byte("Wait It's All Ohio? Always Has Been.")
+	index = 0
+	reqAddr = "123.123.123.123:123"
+	putback, err = sniffer.TCP(stream, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, *buf, putback)
+	assert.Equal(t, "123.123.123.123:123", reqAddr)
+
+	// Test unrecognized 2
+	*buf = []byte("\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a")
+	index = 0
+	reqAddr = "45.45.45.45:45"
+	putback, err = sniffer.TCP(stream, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, []byte("\x01\x02\x03"), putback)
+	assert.Equal(t, "45.45.45.45:45", reqAddr)
+
+	// Test timeout
+	blockStream := &mockStream{}
+	blockStream.EXPECT().SetReadDeadline(mock.Anything).Return(nil)
+	blockStream.EXPECT().Read(mock.Anything).RunAndReturn(func(bs []byte) (int, error) {
+		time.Sleep(2 * time.Second)
+		return 0, io.EOF
+	})
+	reqAddr = "66.66.66.66:66"
+	putback, err = sniffer.TCP(blockStream, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, []byte{}, putback)
+	assert.Equal(t, "66.66.66.66:66", reqAddr)
+}
+
+func TestSnifferUDP(t *testing.T) {
+	sniffer := &Sniffer{
+		Timeout:       1 * time.Second,
+		RewriteDomain: false,
+	}
+
+	// Test QUIC
+	reqAddr := "2.3.4.5:443"
+	pkt, err := base64.StdEncoding.DecodeString("ygAAAAEIwugWgPS7ulYAAES8hY891uwgGE9GG4CPOLd+nsDe28raso24lCSFmlFwYQG1uF39ikbL13/R9ZTghYmTl+jEbr6F9TxxRiOgpTmKRmh6aKZiIiVfy5pVRckovaI8lq0WRoW9xoFNTyYtQP8TVJ3bLCK+zUqpquEQSyWf7CE43ywayyMpE9UlIoPXFWCoopXLM1SvzdQ+17P51N9KR7m4emti4DWWTBLMQOvrwd2HEEkbiZdRO1wf6ZXJlIat5dN0R/6uod60OFPO+u+awvq67MoMReC7+5I/xWI+xx6o4JpnZNn6YPG8Gqi8hS6doNcAAdtD8h5eMLuHCCgkpX3QVjjfWtcOhtw9xKjU43HhUPwzUTv+JDLgwuTQCTmlfYlb3B+pk4b2I9si0tJ0SBuYaZ2VQPtZbj2hpGXw3gn11pbN8xsbKkQL50+Scd4dGJxWQlGaJHeaU5WOCkxLXc635z8m5XO/CBHVYPGp4pfwfwNUgbe5WF+3MaUIlDB8dMfsnrO0BmZPo379jVx0SFLTAiS8wAdHib1WNEY8qKYnTWuiyxYg1GZEhJt0nXmI+8f0eJq42DgHBWC+Rf5rRBr/Sf25o3mFAmTUaul0Woo9/CIrpT73B63N91xd9A77i4ru995YG8l9Hen+eLtpDU9Q9376nwMDYBzeYG9U/Rn0Urbm6q4hmAgV/xlNJ2rAyDS+yLnwqD6I0PRy8bZJEttcidb/SkOyrpgMiAzWeT+SO+c/k+Y8H0UTRa05faZUrhuUaym9wAcaIVRA6nFI+fejfjVp+7afFv+kWn3vCqQEij+CRHuxkltrixZMD2rfYj6NUW7TTYBtPRtuV/V0ZIDjRR26vr4K+0D84+l3c0mA/l6nmpP5kkco3nmpdjtQN6sGXL7+5o0nnsftX5d6/n5mLyEpP+AEDl1zk3iqkS62RsITwql6DMMoGbSDdUpMclCIeM0vlo3CkxGMO7QA9ruVeNddkL3EWMivl+uxO43sXEEqYQHVl4N75y63t05GOf7/gm9Kb/BJ8MpG9ViEkVYaskQCzi3D8bVpzo8FfTj8te8B6c3ikc/cm7r8k0ZcZpr+YiLGDYq+0ilHxpqJfmq8dPkSvxdzLcUSvy7+LMQ/TTobRSF7L4JhtDKck0+00vl9H35Tkh9N+MsVtpKdWyoqZ4XaK2Nx1M6AieczXpdFc0y7lYPoUfF4IeW8WzeVUclol5ElYjkyFz/lDOGAe1bF2g5AYaGWCPiGleVZknNdD5ihB8W8Mfkt1pEwq2S97AHrppqkf/VoIfZzeqH8wUFw8fDDrZIpnoa0rW7HfwIQaqJhPCyB9Z6TVbV4x9UWmaHfVAcinCK/7o10dtaj3rvEqcUC/iPceGq3Tqv/p9GGNJ+Ci2JBjXqNxYr893Llk75VdPD9pM6y1SM0P80oXNy32VMtafkFFST8GpvvqWcxUJ93kzaY8RmU1g3XFOImSU2utU6+FUQ2Pn5uLwcfT2cTYfTpPGh+WXjSbZ6trqdEMEsLHybuPo2UN4WpVLXVQma3kSaHQggcLlEip8GhEUAy/xCb2eKqhI4HkDpDjwDnDVKufWlnRaOHf58cc8Woi+WT8JTOkHC+nBEG6fKRPHDG08U5yayIQIjI")
+	assert.NoError(t, err)
+	err = sniffer.UDP(pkt, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, "www.notion.so:443", reqAddr)
+
+	// Test unrecognized
+	pkt = []byte("oh my sweet summer child")
+	reqAddr = "90.90.90.90:90"
+	err = sniffer.UDP(pkt, &reqAddr)
+	assert.NoError(t, err)
+	assert.Equal(t, "90.90.90.90:90", reqAddr)
+}
diff --git a/hysteria/extras/transport/udphop/addr.go b/hysteria/extras/transport/udphop/addr.go
index 3c704728d7..afde26a3b3 100644
--- a/hysteria/extras/transport/udphop/addr.go
+++ b/hysteria/extras/transport/udphop/addr.go
@@ -3,8 +3,8 @@ package udphop
 import (
 	"fmt"
 	"net"
-	"strconv"
-	"strings"
+
+	"github.com/apernet/hysteria/extras/v2/utils"
 )
 
 type InvalidPortError struct {
@@ -57,36 +57,11 @@ func ResolveUDPHopAddr(addr string) (*UDPHopAddr, error) {
 		PortStr: portStr,
 	}
 
-	portStrs := strings.Split(portStr, ",")
-	for _, portStr := range portStrs {
-		if strings.Contains(portStr, "-") {
-			// Port range
-			portRange := strings.Split(portStr, "-")
-			if len(portRange) != 2 {
-				return nil, InvalidPortError{portStr}
-			}
-			start, err := strconv.ParseUint(portRange[0], 10, 16)
-			if err != nil {
-				return nil, InvalidPortError{portStr}
-			}
-			end, err := strconv.ParseUint(portRange[1], 10, 16)
-			if err != nil {
-				return nil, InvalidPortError{portStr}
-			}
-			if start > end {
-				start, end = end, start
-			}
-			for i := start; i <= end; i++ {
-				result.Ports = append(result.Ports, uint16(i))
-			}
-		} else {
-			// Single port
-			port, err := strconv.ParseUint(portStr, 10, 16)
-			if err != nil {
-				return nil, InvalidPortError{portStr}
-			}
-			result.Ports = append(result.Ports, uint16(port))
-		}
+	pu := utils.ParsePortUnion(portStr)
+	if pu == nil {
+		return nil, InvalidPortError{portStr}
 	}
+	result.Ports = pu.Ports()
+
 	return result, nil
 }
diff --git a/hysteria/extras/transport/udphop/addr_test.go b/hysteria/extras/transport/udphop/addr_test.go
deleted file mode 100644
index 94a101624e..0000000000
--- a/hysteria/extras/transport/udphop/addr_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package udphop
-
-import (
-	"net"
-	"reflect"
-	"testing"
-)
-
-func TestResolveUDPHopAddr(t *testing.T) {
-	type args struct {
-		addr string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    *UDPHopAddr
-		wantErr bool
-	}{
-		{
-			name: "empty",
-			args: args{
-				addr: "",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "no port",
-			args: args{
-				addr: "8.8.8.8",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "single port",
-			args: args{
-				addr: "8.8.4.4:1234",
-			},
-			want: &UDPHopAddr{
-				IP:      net.ParseIP("8.8.4.4"),
-				Ports:   []uint16{1234},
-				PortStr: "1234",
-			},
-			wantErr: false,
-		},
-		{
-			name: "multiple ports",
-			args: args{
-				addr: "8.8.3.3:1234,5678,9012",
-			},
-			want: &UDPHopAddr{
-				IP:      net.ParseIP("8.8.3.3"),
-				Ports:   []uint16{1234, 5678, 9012},
-				PortStr: "1234,5678,9012",
-			},
-			wantErr: false,
-		},
-		{
-			name: "port range",
-			args: args{
-				addr: "1.2.3.4:1234-1240",
-			},
-			want: &UDPHopAddr{
-				IP:      net.ParseIP("1.2.3.4"),
-				Ports:   []uint16{1234, 1235, 1236, 1237, 1238, 1239, 1240},
-				PortStr: "1234-1240",
-			},
-			wantErr: false,
-		},
-		{
-			name: "port range reversed",
-			args: args{
-				addr: "123.123.123.123:9990-9980",
-			},
-			want: &UDPHopAddr{
-				IP:      net.ParseIP("123.123.123.123"),
-				Ports:   []uint16{9980, 9981, 9982, 9983, 9984, 9985, 9986, 9987, 9988, 9989, 9990},
-				PortStr: "9990-9980",
-			},
-			wantErr: false,
-		},
-		{
-			name: "port range & port list",
-			args: args{
-				addr: "9.9.9.9:1234-1236,5678,9012",
-			},
-			want: &UDPHopAddr{
-				IP:      net.ParseIP("9.9.9.9"),
-				Ports:   []uint16{1234, 1235, 1236, 5678, 9012},
-				PortStr: "1234-1236,5678,9012",
-			},
-			wantErr: false,
-		},
-		{
-			name: "invalid port",
-			args: args{
-				addr: "5.5.5.5:1234,bs",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "invalid port range 1",
-			args: args{
-				addr: "6.6.6.6:7788-bbss",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-		{
-			name: "invalid port range 2",
-			args: args{
-				addr: "1.0.0.1:8899-9002-9005",
-			},
-			want:    nil,
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := ResolveUDPHopAddr(tt.args.addr)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseUDPHopAddr() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ParseUDPHopAddr() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/hysteria/extras/utils/portunion.go b/hysteria/extras/utils/portunion.go
new file mode 100644
index 0000000000..20a31d0f1b
--- /dev/null
+++ b/hysteria/extras/utils/portunion.go
@@ -0,0 +1,107 @@
+package utils
+
+import (
+	"sort"
+	"strconv"
+	"strings"
+)
+
+// PortUnion is a collection of multiple port ranges.
+type PortUnion []PortRange
+
+// PortRange represents a range of ports.
+// Start and End are inclusive. [Start, End]
+type PortRange struct {
+	Start, End uint16
+}
+
+// ParsePortUnion parses a string of comma-separated port ranges (or single ports) into a PortUnion.
+// Returns nil if the input is invalid.
+// The returned PortUnion is guaranteed to be normalized.
+func ParsePortUnion(s string) PortUnion {
+	if s == "all" || s == "*" {
+		// Wildcard special case
+		return PortUnion{PortRange{0, 65535}}
+	}
+	var result PortUnion
+	portStrs := strings.Split(s, ",")
+	for _, portStr := range portStrs {
+		if strings.Contains(portStr, "-") {
+			// Port range
+			portRange := strings.Split(portStr, "-")
+			if len(portRange) != 2 {
+				return nil
+			}
+			start, err := strconv.ParseUint(portRange[0], 10, 16)
+			if err != nil {
+				return nil
+			}
+			end, err := strconv.ParseUint(portRange[1], 10, 16)
+			if err != nil {
+				return nil
+			}
+			if start > end {
+				start, end = end, start
+			}
+			result = append(result, PortRange{uint16(start), uint16(end)})
+		} else {
+			// Single port
+			port, err := strconv.ParseUint(portStr, 10, 16)
+			if err != nil {
+				return nil
+			}
+			result = append(result, PortRange{uint16(port), uint16(port)})
+		}
+	}
+	if result == nil {
+		return nil
+	}
+	return result.Normalize()
+}
+
+// Normalize normalizes a PortUnion.
+// No overlapping ranges, ranges are sorted from low to high.
+func (u PortUnion) Normalize() PortUnion {
+	if len(u) == 0 {
+		return u
+	}
+	sort.Slice(u, func(i, j int) bool {
+		if u[i].Start == u[j].Start {
+			return u[i].End < u[j].End
+		}
+		return u[i].Start < u[j].Start
+	})
+	normalized := PortUnion{u[0]}
+	for _, current := range u[1:] {
+		last := &normalized[len(normalized)-1]
+		if current.Start <= last.End+1 {
+			if current.End > last.End {
+				last.End = current.End
+			}
+		} else {
+			normalized = append(normalized, current)
+		}
+	}
+	return normalized
+}
+
+// Ports returns all ports in the PortUnion as a slice.
+func (u PortUnion) Ports() []uint16 {
+	var ports []uint16
+	for _, r := range u {
+		for i := r.Start; i <= r.End; i++ {
+			ports = append(ports, i)
+		}
+	}
+	return ports
+}
+
+// Contains returns true if the PortUnion contains the given port.
+func (u PortUnion) Contains(port uint16) bool {
+	for _, r := range u {
+		if port >= r.Start && port <= r.End {
+			return true
+		}
+	}
+	return false
+}
diff --git a/hysteria/extras/utils/portunion_test.go b/hysteria/extras/utils/portunion_test.go
new file mode 100644
index 0000000000..551bae137a
--- /dev/null
+++ b/hysteria/extras/utils/portunion_test.go
@@ -0,0 +1,92 @@
+package utils
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestParsePortUnion(t *testing.T) {
+	tests := []struct {
+		name string
+		s    string
+		want PortUnion
+	}{
+		{
+			name: "empty",
+			s:    "",
+			want: nil,
+		},
+		{
+			name: "all 1",
+			s:    "all",
+			want: PortUnion{{0, 65535}},
+		},
+		{
+			name: "all 2",
+			s:    "*",
+			want: PortUnion{{0, 65535}},
+		},
+		{
+			name: "single port",
+			s:    "1234",
+			want: PortUnion{{1234, 1234}},
+		},
+		{
+			name: "multiple ports (unsorted)",
+			s:    "5678,1234,9012",
+			want: PortUnion{{1234, 1234}, {5678, 5678}, {9012, 9012}},
+		},
+		{
+			name: "one range",
+			s:    "1234-1240",
+			want: PortUnion{{1234, 1240}},
+		},
+		{
+			name: "one range (reversed)",
+			s:    "1240-1234",
+			want: PortUnion{{1234, 1240}},
+		},
+		{
+			name: "multiple ports and ranges (reversed, unsorted, overlapping)",
+			s:    "5678,1200-1236,9100-9012,1234-1240",
+			want: PortUnion{{1200, 1240}, {5678, 5678}, {9012, 9100}},
+		},
+		{
+			name: "invalid 1",
+			s:    "1234-",
+			want: nil,
+		},
+		{
+			name: "invalid 2",
+			s:    "1234-ggez",
+			want: nil,
+		},
+		{
+			name: "invalid 3",
+			s:    "233,",
+			want: nil,
+		},
+		{
+			name: "invalid 4",
+			s:    "1234-1240-1250",
+			want: nil,
+		},
+		{
+			name: "invalid 5",
+			s:    "-,,",
+			want: nil,
+		},
+		{
+			name: "invalid 6",
+			s:    "http",
+			want: nil,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := ParsePortUnion(tt.s); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("ParsePortUnion() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/hysteria/go.work.sum b/hysteria/go.work.sum
index 4370b0e538..f0551e7035 100644
--- a/hysteria/go.work.sum
+++ b/hysteria/go.work.sum
@@ -41,6 +41,8 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625 h1:ckJgFhFWywOx+
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 h1:D21IyuvjDCshj1/qq+pCNd3VZOAEI9jy6Bi131YlXgI=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
+github.com/bwesterb/go-ristretto v1.2.3 h1:1w53tCkGhCQ5djbat3+MH0BAQ5Kfgbt56UZQ/JMzngw=
+github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
@@ -309,6 +311,8 @@ golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
 golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA=
diff --git a/lede/package/boot/arm-trusted-firmware-mediatek/Makefile b/lede/package/boot/arm-trusted-firmware-mediatek/Makefile
index 5324563042..798070a59e 100644
--- a/lede/package/boot/arm-trusted-firmware-mediatek/Makefile
+++ b/lede/package/boot/arm-trusted-firmware-mediatek/Makefile
@@ -397,6 +397,15 @@ define Trusted-Firmware-A/mt7988-snand-comb
   DRAM_USE_COMB:=1
 endef
 
+define Trusted-Firmware-A/mt7988-snand-ubi-comb
+  NAME:=MediaTek MT7988 (SPI-NAND via SNFI, UBI)
+  BOOT_DEVICE:=snand
+  BUILD_SUBTARGET:=filogic
+  PLAT:=mt7988
+  DRAM_USE_COMB:=1
+  USE_UBI:=1
+endef
+
 define Trusted-Firmware-A/mt7988-spim-nand-comb
   NAME:=MediaTek MT7988 (SPI-NAND via SPIM)
   BOOT_DEVICE:=spim-nand
@@ -460,6 +469,7 @@ TFA_TARGETS:= \
 	mt7988-nor-comb \
 	mt7988-sdmmc-comb \
 	mt7988-snand-comb \
+	mt7988-snand-ubi-comb \
 	mt7988-spim-nand-comb \
 	mt7988-spim-nand-ubi-comb
 
@@ -472,7 +482,6 @@ TFA_MAKE_FLAGS += \
 	HAVE_DRAM_OBJ_FILE=yes \
 	$(if $(DDR3_FLYBY),DDR3_FLYBY=1) \
 	$(if $(DRAM_USE_COMB),DRAM_USE_COMB=1) \
-	$(if $(RAM_BOOT_UART_DL),RAM_BOOT_UART_DL=1) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7622,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x80000)) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7981,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x100000)) \
 	all
diff --git a/lede/package/boot/uboot-envtools/files/mediatek_filogic b/lede/package/boot/uboot-envtools/files/mediatek_filogic
index e8f3c14664..5f81a699fb 100644
--- a/lede/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/lede/package/boot/uboot-envtools/files/mediatek_filogic
@@ -11,45 +11,28 @@ touch /etc/config/ubootenv
 
 board=$(board_name)
 
-ubootenv_add_mmc_default() {
-	local envdev="$(find_mmc_part "ubootenv" "${1:-mmcblk0}")"
-	ubootenv_add_uci_config "$envdev" "0x0" "0x40000" "0x40000" "1"
-	ubootenv_add_uci_config "$envdev" "0x40000" "0x40000" "0x40000" "1"
-}
-
-ubootenv_add_nor_default() {
-	local envdev="/dev/mtd$(find_mtd_index "u-boot-env")"
-	ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"
-	ubootenv_add_uci_config "$envdev" "0x20000" "0x20000" "0x20000" "1"
-}
-
-ubootenv_add_ubi_default() {
-	. /lib/upgrade/nand.sh
-	local envubi=$(nand_find_ubi ubi)
-	local envdev=/dev/$(nand_find_volume $envubi ubootenv)
-	local envdev2=/dev/$(nand_find_volume $envubi ubootenv2)
-	ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x1f000" "1"
-	ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x1f000" "1"
-}
-
 case "$board" in
 bananapi,bpi-r3|\
-bananapi,bpi-r3-mini|\
 bananapi,bpi-r4|\
-bananapi,bpi-r4-poe|\
-jdcloud,re-cp-03)
-	. /lib/upgrade/common.sh
-
-	bootdev="$(fitblk_get_bootdev)"
-	case "$bootdev" in
-	ubi*)
-		ubootenv_add_ubi_default
+bananapi,bpi-r4-poe)
+	case "$(cmdline_get_var root)" in
+	/dev/mmc*)
+		local envdev=$(find_mmc_part "ubootenv" $rootdev)
+		ubootenv_add_uci_config "$envdev" "0x0" "0x40000" "0x40000" "1"
+		ubootenv_add_uci_config "$envdev" "0x40000" "0x40000" "0x40000" "1"
 		;;
-	mmc*)
-		ubootenv_add_mmc_default "${bootdev%%p[0-9]*}"
+	/dev/mtd*)
+		local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
+		ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"
+		ubootenv_add_uci_config "$envdev" "0x20000" "0x20000" "0x20000" "1"
 		;;
-	mtd*)
-		ubootenv_add_nor_default
+	/dev/ubi*)
+		. /lib/upgrade/nand.sh
+		local envubi=$(nand_find_ubi ubi)
+		local envdev=/dev/$(nand_find_volume $envubi ubootenv)
+		local envdev2=/dev/$(nand_find_volume $envubi ubootenv2)
+		ubootenv_add_uci_config "$envdev" "0x0" "0x1f000" "0x1f000" "1"
+		ubootenv_add_uci_config "$envdev2" "0x0" "0x1f000" "0x1f000" "1"
 		;;
 	esac
 	;;
diff --git a/lede/package/boot/uboot-mediatek/Makefile b/lede/package/boot/uboot-mediatek/Makefile
index 8827bcf8c2..4f3041c0ca 100644
--- a/lede/package/boot/uboot-mediatek/Makefile
+++ b/lede/package/boot/uboot-mediatek/Makefile
@@ -5,8 +5,6 @@ PKG_VERSION:=2024.01
 PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
 PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host
 
-UBOOT_USE_INTREE_DTC:=1
-
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
@@ -36,7 +34,6 @@ endif
 define U-Boot/Default
   BUILD_TARGET:=mediatek
   UBOOT_IMAGE:=u-boot-mtk.bin
-  HIDDEN:=1
 endef
 
 define U-Boot/mt7620_rfb
@@ -75,15 +72,6 @@ define U-Boot/mt7621_nand_rfb
   UBOOT_IMAGE:=u-boot-mt7621.bin
 endef
 
-define U-Boot/mt7621_zbtlink_zbt-wg3526-16m
-  NAME:=Zbtlink ZBT-WG3526-16m
-  UBOOT_CONFIG:=mt7621_zbtlink_zbt-wg3526-16m
-  BUILD_DEVICES:=zbtlink_zbt-wg3526-16m
-  BUILD_TARGET:=ramips
-  BUILD_SUBTARGET:=mt7621
-  UBOOT_IMAGE:=u-boot-mt7621.bin
-endef
-
 define U-Boot/mt7622_rfb1
   NAME:=MT7622 Reference Board 1
   UBOOT_CONFIG:=mt7622_rfb
@@ -97,9 +85,9 @@ define U-Boot/mt7622_linksys_e8450
   BUILD_DEVICES:=linksys_e8450-ubi
   BUILD_SUBTARGET:=mt7622
   UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=snand-ubi
+  BL2_BOOTDEV:=snand
   BL2_DDRBLOB:=1
-  DEPENDS:=+trusted-firmware-a-mt7622-snand-ubi-1ddr
+  DEPENDS:=+trusted-firmware-a-mt7622-snand-1ddr
 endef
 
 define U-Boot/mt7622_bananapi_bpi-r64-emmc
@@ -130,15 +118,15 @@ define U-Boot/mt7622_bananapi_bpi-r64-snand
   BUILD_DEVICES:=bananapi_bpi-r64
   BUILD_SUBTARGET:=mt7622
   UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=snand-ubi
+  BL2_BOOTDEV:=snand
   BL2_DDRBLOB:=2
-  DEPENDS:=+trusted-firmware-a-mt7622-snand-ubi-2ddr
+  DEPENDS:=+trusted-firmware-a-mt7622-snand-2ddr
 endef
 
-define U-Boot/mt7622_ubnt_unifi-6-lr-v1
+define U-Boot/mt7622_ubnt_unifi-6-lr
   NAME:=Ubiquiti UniFi 6 LR
-  UBOOT_CONFIG:=mt7622_ubnt_unifi-6-lr-v1
-  BUILD_DEVICES:=ubnt_unifi-6-lr-v1-ubootmod
+  UBOOT_CONFIG:=mt7622_ubnt_unifi-6-lr
+  BUILD_DEVICES:=ubnt_unifi-6-lr-v1-ubootmod ubnt_unifi-6-lr-v2-ubootmod
   BUILD_SUBTARGET:=mt7622
   UBOOT_IMAGE:=u-boot.fip
   BL2_BOOTDEV:=nor
@@ -147,38 +135,6 @@ define U-Boot/mt7622_ubnt_unifi-6-lr-v1
   FIP_COMPRESS:=1
 endef
 
-define U-Boot/mt7622_ubnt_unifi-6-lr-v2
-  NAME:=Ubiquiti UniFi 6 LR v2
-  UBOOT_CONFIG:=mt7622_ubnt_unifi-6-lr-v2
-  BUILD_DEVICES:=ubnt_unifi-6-lr-v2-ubootmod
-  BUILD_SUBTARGET:=mt7622
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=nor
-  BL2_DDRBLOB:=2
-  DEPENDS:=+trusted-firmware-a-mt7622-nor-2ddr
-  FIP_COMPRESS:=1
-endef
-
-define U-Boot/mt7622_ubnt_unifi-6-lr-v3
-  NAME:=Ubiquiti UniFi 6 LR v3
-  UBOOT_CONFIG:=mt7622_ubnt_unifi-6-lr-v3
-  BUILD_DEVICES:=ubnt_unifi-6-lr-v3-ubootmod
-  BUILD_SUBTARGET:=mt7622
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=nor
-  BL2_DDRBLOB:=2
-  DEPENDS:=+trusted-firmware-a-mt7622-nor-2ddr
-  FIP_COMPRESS:=1
-endef
-
-define U-Boot/mt7622_xiaomi_redmi-router-ax6s-ubi-loader
-  NAME:=Xiaomi Redmi Router AX6S (as UBI loader)
-  UBOOT_CONFIG:=mt7622_xiaomi_redmi-router-ax6s-ubi-loader
-  BUILD_DEVICES:=xiaomi_redmi-router-ax6s
-  BUILD_SUBTARGET:=mt7622
-  UBOOT_IMAGE:=u-boot.bin
-endef
-
 define U-Boot/mt7623a_unielec_u7623
   NAME:=UniElec U7623 (mt7623)
   BUILD_DEVICES:=unielec_u7623-02
@@ -203,7 +159,7 @@ define U-Boot/mt7628_rfb
   UBOOT_IMAGE:=u-boot-with-spl.bin
 endef
 
-define U-Boot/mt7628_ravpower_rp-wd009
+define U-Boot/ravpower_rp-wd009
   NAME:=RAVPower RP-WD009
   BUILD_TARGET:=ramips
   BUILD_DEVICES:=ravpower_rp-wd009
@@ -219,91 +175,6 @@ define U-Boot/mt7629_rfb
   UBOOT_CONFIG:=mt7629_rfb
 endef
 
-define U-Boot/mt7981_cmcc_rax3000m-emmc
-  NAME:=CMCC RAX3000M
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=cmcc_rax3000m
-  UBOOT_CONFIG:=mt7981_cmcc_rax3000m-emmc
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=emmc
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7981-emmc-ddr4
-endef
-
-define U-Boot/mt7981_cmcc_rax3000m-nand
-  NAME:=CMCC RAX3000M
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=cmcc_rax3000m
-  UBOOT_CONFIG:=mt7981_cmcc_rax3000m-nand
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr4
-endef
-
-define U-Boot/mt7981_h3c_magic-nx30-pro
-  NAME:=H3C Magic NX30 Pro
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=h3c_magic-nx30-pro
-  UBOOT_CONFIG:=mt7981_h3c_magic-nx30-pro
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
-define U-Boot/mt7981_jcg_q30-pro
-  NAME:=JCG Q30 PRO
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=jcg_q30-pro
-  UBOOT_CONFIG:=mt7981_jcg_q30-pro
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
-define U-Boot/mt7981_nokia_ea0326gmp
-  NAME:=Nokia EA0326GMP
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=nokia_ea0326gmp
-  UBOOT_CONFIG:=mt7981_nokia_ea0326gmp
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
-define U-Boot/mt7981_openwrt_one-snand
-  NAME:=OpenWrt One NAND
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=openwrt_one
-  UBOOT_CONFIG:=mt7981_openwrt-one-spi-nand
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand-ubi
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ubi-ddr4
-endef
-
-define U-Boot/mt7981_openwrt_one-nor
-  NAME:=OpenWrt One NOR
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=openwrt_one
-  UBOOT_CONFIG:=mt7981_openwrt-one-nor
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=nor
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr4
-  FIP_COMPRESS:=1
-  DEPENDS:=+trusted-firmware-a-mt7981-nor-ddr4
-endef
-
 define U-Boot/mt7981_rfb-spim-nand
   NAME:=MT7981 Reference Board
   BUILD_SUBTARGET:=filogic
@@ -364,42 +235,6 @@ define U-Boot/mt7981_rfb-snfi
   DEPENDS:=+trusted-firmware-a-mt7981-snand-ddr3
 endef
 
-define U-Boot/mt7981_qihoo_360t7
-  NAME:=Qihoo 360T7
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=qihoo_360t7
-  UBOOT_CONFIG:=mt7981_qihoo-360t7
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
-define U-Boot/mt7981_xiaomi_mi-router-ax3000t
-  NAME:=Xiaomi Router AX3000T
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=xiaomi_mi-router-ax3000t-ubootmod
-  UBOOT_CONFIG:=mt7981_xiaomi_mi-router-ax3000t
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
-define U-Boot/mt7981_xiaomi_mi-router-wr30u
-  NAME:=Xiaomi Router WR30U
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=xiaomi_mi-router-wr30u-ubootmod
-  UBOOT_CONFIG:=mt7981_xiaomi_mi-router-wr30u
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
 define U-Boot/mt7986_rfb
   NAME:=MT7986 Reference Board
   BUILD_SUBTARGET:=filogic
@@ -461,126 +296,6 @@ define U-Boot/mt7986_bananapi_bpi-r3-nor
   FIP_COMPRESS:=1
 endef
 
-define U-Boot/mt7986_bananapi_bpi-r3-mini-emmc
-  NAME:=BananaPi BPi-R3 Mini
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=bananapi_bpi-r3-mini
-  UBOOT_CONFIG:=mt7986a_bpi-r3-mini-emmc
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=emmc
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
-endef
-
-define U-Boot/mt7986_bananapi_bpi-r3-mini-snand
-  NAME:=BananaPi BPi-R3 Mini
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=bananapi_bpi-r3-mini
-  UBOOT_CONFIG:=mt7986a_bpi-r3-mini-snand
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand-ubi
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ubi-ddr4
-endef
-
-define U-Boot/mt7986_glinet_gl-mt6000
-  NAME:=GL.iNet GL-MT6000
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=glinet_gl-mt6000
-  UBOOT_CONFIG:=mt7986a_glinet_gl-mt6000
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=emmc
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
-endef
-
-define U-Boot/mt7986_jdcloud_re-cp-03
-  NAME:=JDCloud RE-CP-03
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=jdcloud_re-cp-03
-  UBOOT_CONFIG:=mt7986a_jdcloud_re-cp-03
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=emmc
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
-endef
-
-define U-Boot/mt7986_netcore_n60
-  NAME:=Netcore N60
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=netcore_n60
-  UBOOT_CONFIG:=mt7986_netcore_n60
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ddr3
-endef
-
-define U-Boot/mt7986_tplink_tl-xdr4288
-  NAME:=TP-LINK TL-XDR4288
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=tplink_tl-xdr4288
-  UBOOT_CONFIG:=mt7986_tplink_tl-xdr4288
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ddr3
-endef
-
-define U-Boot/mt7986_tplink_tl-xdr6086
-  NAME:=TP-LINK TL-XDR6086
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=tplink_tl-xdr6086
-  UBOOT_CONFIG:=mt7986_tplink_tl-xdr6086
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ddr3
-endef
-
-define U-Boot/mt7986_tplink_tl-xdr6088
-  NAME:=TP-LINK TL-XDR6088
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=tplink_tl-xdr6088
-  UBOOT_CONFIG:=mt7986_tplink_tl-xdr6088
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ddr3
-endef
-
-define U-Boot/mt7986_xiaomi_redmi-router-ax6000
-  NAME:=Xiaomi Redmi AX6000
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=xiaomi_redmi-router-ax6000-ubootmod
-  UBOOT_CONFIG:=mt7986_xiaomi_redmi-ax6000
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ddr4
-endef
-
-define U-Boot/mt7986_zyxel_ex5601-t0
-  NAME:=Zyxel EX5601-T0
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=zyxel_ex5601-t0-ubootmod
-  UBOOT_CONFIG:=mt7986_zyxel_ex5601-t0
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand-4k
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-4k-ddr4
-endef
-
 define U-Boot/mt7988_bananapi_bpi-r4-emmc
   NAME:=BananaPi BPi-R4
   BUILD_SUBTARGET:=filogic
@@ -719,50 +434,26 @@ UBOOT_TARGETS := \
 	mt7620_rfb \
 	mt7621_nand_rfb \
 	mt7621_rfb \
-	mt7621_zbtlink_zbt-wg3526-16m \
 	mt7622_bananapi_bpi-r64-emmc \
 	mt7622_bananapi_bpi-r64-sdmmc \
 	mt7622_bananapi_bpi-r64-snand \
 	mt7622_linksys_e8450 \
 	mt7622_rfb1 \
-	mt7622_ubnt_unifi-6-lr-v1 \
-	mt7622_ubnt_unifi-6-lr-v2 \
-	mt7622_ubnt_unifi-6-lr-v3 \
-	mt7622_xiaomi_redmi-router-ax6s-ubi-loader \
+	mt7622_ubnt_unifi-6-lr \
 	mt7623n_bpir2 \
 	mt7623a_unielec_u7623 \
 	mt7628_rfb \
 	mt7628_ravpower_rp-wd009 \
 	mt7629_rfb \
-	mt7981_cmcc_rax3000m-emmc \
-	mt7981_cmcc_rax3000m-nand \
-	mt7981_h3c_magic-nx30-pro \
-	mt7981_jcg_q30-pro \
-	mt7981_nokia_ea0326gmp \
-	mt7981_openwrt_one-snand \
-	mt7981_openwrt_one-nor \
 	mt7981_rfb-spim-nand \
 	mt7981_rfb-emmc \
 	mt7981_rfb-nor \
 	mt7981_rfb-sd \
 	mt7981_rfb-snfi \
-	mt7981_qihoo_360t7 \
-	mt7981_xiaomi_mi-router-ax3000t \
-	mt7981_xiaomi_mi-router-wr30u \
 	mt7986_bananapi_bpi-r3-emmc \
 	mt7986_bananapi_bpi-r3-sdmmc \
 	mt7986_bananapi_bpi-r3-snand \
 	mt7986_bananapi_bpi-r3-nor \
-	mt7986_bananapi_bpi-r3-mini-emmc \
-	mt7986_bananapi_bpi-r3-mini-snand \
-	mt7986_glinet_gl-mt6000 \
-	mt7986_jdcloud_re-cp-03 \
-	mt7986_netcore_n60 \
-	mt7986_tplink_tl-xdr4288 \
-	mt7986_tplink_tl-xdr6086 \
-	mt7986_tplink_tl-xdr6088 \
-	mt7986_xiaomi_redmi-router-ax6000 \
-	mt7986_zyxel_ex5601-t0 \
 	mt7986_rfb \
 	mt7988_bananapi_bpi-r4-emmc \
 	mt7988_bananapi_bpi-r4-sdmmc \
diff --git a/lede/package/boot/uboot-mediatek/patches/111-force-pylibfdt-build.patch b/lede/package/boot/uboot-mediatek/patches/111-force-pylibfdt-build.patch
new file mode 100644
index 0000000000..e55fad489b
--- /dev/null
+++ b/lede/package/boot/uboot-mediatek/patches/111-force-pylibfdt-build.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2011,26 +2011,7 @@ endif
+ # Check dtc and pylibfdt, if DTC is provided, else build them
+ PHONY += scripts_dtc
+ scripts_dtc: scripts_basic
+-	$(Q)if test "$(DTC)" = "$(DTC_INTREE)"; then \
+-		$(MAKE) $(build)=scripts/dtc; \
+-	else \
+-		if ! $(DTC) -v >/dev/null; then \
+-			echo '*** Failed to check dtc version: $(DTC)'; \
+-			false; \
+-		else \
+-			if test "$(call dtc-version)" -lt $(DTC_MIN_VERSION); then \
+-				echo '*** Your dtc is too old, please upgrade to dtc $(DTC_MIN_VERSION) or newer'; \
+-				false; \
+-			else \
+-				if [ -n "$(CONFIG_PYLIBFDT)" ]; then \
+-					if ! echo "import libfdt" | $(PYTHON3) 2>/dev/null; then \
+-						echo '*** pylibfdt does not seem to be available with $(PYTHON3)'; \
+-						false; \
+-					fi; \
+-				fi; \
+-			fi; \
+-		fi; \
+-	fi
++	$(MAKE) $(build)=scripts/dtc
+ 
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds = LDS     $@
diff --git a/lede/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch b/lede/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch
deleted file mode 100644
index f8e8659952..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/160-net-phy-add-support-for-Airoha-ethernet-PHY-driver.patch
+++ /dev/null
@@ -1,1929 +0,0 @@
-From 70157a6148ad47734f1dc646b4157ca83cc5df9f Mon Sep 17 00:00:00 2001
-From: Weijie Gao <weijie.gao@mediatek.com>
-Date: Thu, 13 Jul 2023 16:34:48 +0800
-Subject: [PATCH] net: phy: add support for Airoha ethernet PHY driver
-
-This patch adds support for Airoha ethernet PHY driver.
-
-If GMAC2 of your board connects to Airoha EN8801S, please change the eth
-node as follow:
-
-&eth {
-        status = "okay";
-        mediatek,gmac-id = <1>;
-        mediatek,sgmiisys = <&sgmiisys1>;
-        phy-mode = "sgmii";
-        phy-handle = <&phy5>;
-
-        phy5: eth-phy@5 {
-                reg = <24>;
-        };
-};
-
-If GMAC2 of your board connects to Airoha EN8811H, please change the eth
-node as follow:
-
-&eth {
-        status = "okay";
-        mediatek,gmac-id = <1>;
-        mediatek,sgmiisys = <&sgmiisys1>;
-        phy-mode = "2500base-x";
-        phy-handle = <&phy5>;
-
-        fixed-link {
-                speed = <2500>;
-                full-duplex;
-        };
-
-        phy5: eth-phy@5 {
-                reg = <15>;
-        };
-};
-
-Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
----
- .../drivers/net/phy/Kconfig                   |   15 +
- .../drivers/net/phy/Makefile                  |    2 +
- .../drivers/net/phy/air_en8801s.c             |  633 ++
- .../drivers/net/phy/air_en8801s.h             |  267 +
- .../drivers/net/phy/air_en8811h.c             |  649 ++
- .../drivers/net/phy/air_en8811h.h             |  160 +
- .../drivers/net/phy/air_en8811h_fw.h          | 9227 +++++++++++++++++
- 7 files changed, 10953 insertions(+)
- create mode 100644 drivers/net/phy/air_en8801s.c
- create mode 100644 drivers/net/phy/air_en8801s.h
- create mode 100644 drivers/net/phy/air_en8811h.c
- create mode 100644 drivers/net/phy/air_en8811h.h
- create mode 100644 drivers/net/phy/air_en8811h_fw.h
-
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -77,6 +77,37 @@ config PHY_ADIN
- 	help
- 		Add support for configuring RGMII on Analog Devices ADIN PHYs.
- 
-+menuconfig PHY_AIROHA
-+	bool "Airoha Ethernet PHYs support"
-+
-+config PHY_AIROHA_EN8801S
-+	bool "Airoha Ethernet EN8801S support"
-+	depends on PHY_AIROHA
-+	help
-+		AIROHA EN8801S supported.
-+
-+config PHY_AIROHA_EN8811H
-+	bool "Airoha Ethernet EN8811H support"
-+	depends on PHY_AIROHA
-+	help
-+		AIROHA EN8811H supported.
-+
-+choice
-+	prompt "Location of the Airoha PHY firmware"
-+	default PHY_AIROHA_FW_IN_UBI
-+	depends on PHY_AIROHA_EN8811H
-+
-+config PHY_AIROHA_FW_IN_MMC
-+	bool "Airoha firmware in MMC boot1 partition"
-+
-+config PHY_AIROHA_FW_IN_UBI
-+	bool "Airoha firmware in UBI volume en8811h-fw on NAND flash"
-+
-+config PHY_AIROHA_FW_IN_MTD
-+	bool "Airoha firmware in MTD partition on raw flash"
-+
-+endchoice
-+
- menuconfig PHY_AQUANTIA
- 	bool "Aquantia Ethernet PHYs support"
- 	select PHY_GIGE
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -11,6 +11,8 @@ obj-$(CONFIG_MV88E6352_SWITCH) += mv88e6
- obj-$(CONFIG_PHYLIB) += phy.o
- obj-$(CONFIG_PHYLIB_10G) += generic_10g.o
- obj-$(CONFIG_PHY_ADIN) += adin.o
-+obj-$(CONFIG_PHY_AIROHA_EN8801S) += air_en8801s.o
-+obj-$(CONFIG_PHY_AIROHA_EN8811H) += air_en8811h.o
- obj-$(CONFIG_PHY_AQUANTIA) += aquantia.o
- obj-$(CONFIG_PHY_ATHEROS) += atheros.o
- obj-$(CONFIG_PHY_BROADCOM) += broadcom.o
---- /dev/null
-+++ b/drivers/net/phy/air_en8801s.c
-@@ -0,0 +1,633 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*************************************************
-+ * FILE NAME:  air_en8801s.c
-+ * PURPOSE:
-+ *      EN8801S PHY Driver for Uboot
-+ * NOTES:
-+ *
-+ *  Copyright (C) 2023 Airoha Technology Corp.
-+ *************************************************/
-+
-+/* INCLUDE FILE DECLARATIONS
-+ */
-+#include <common.h>
-+#include <phy.h>
-+#include <errno.h>
-+#include <version.h>
-+#include "air_en8801s.h"
-+
-+#if AIR_UBOOT_REVISION > 0x202004
-+#include <linux/delay.h>
-+#endif
-+
-+static struct phy_device *s_phydev = 0;
-+/******************************************************
-+ * The following led_cfg example is for reference only.
-+ * LED5 1000M/LINK/ACT   (GPIO5)  <-> BASE_T_LED0,
-+ * LED6 10/100M/LINK/ACT (GPIO9)  <-> BASE_T_LED1,
-+ * LED4 100M/LINK/ACT    (GPIO8)  <-> BASE_T_LED2,
-+ ******************************************************/
-+/* User-defined.B */
-+#define AIR_LED_SUPPORT
-+#ifdef AIR_LED_SUPPORT
-+static const AIR_BASE_T_LED_CFG_T led_cfg[4] =
-+{
-+    /*
-+     *    LED Enable,     GPIO,       LED Polarity,            LED ON,               LED Blink
-+     */
-+         {LED_ENABLE,       5,       AIR_ACTIVE_LOW,      BASE_T_LED0_ON_CFG,    BASE_T_LED0_BLK_CFG}, /* BASE-T LED0 */
-+         {LED_ENABLE,       9,       AIR_ACTIVE_LOW,      BASE_T_LED1_ON_CFG,    BASE_T_LED1_BLK_CFG}, /* BASE-T LED1 */
-+         {LED_ENABLE,       8,       AIR_ACTIVE_LOW,      BASE_T_LED2_ON_CFG,    BASE_T_LED2_BLK_CFG}, /* BASE-T LED2 */
-+         {LED_DISABLE,      1,       AIR_ACTIVE_LOW,      BASE_T_LED3_ON_CFG,    BASE_T_LED3_BLK_CFG}  /* BASE-T LED3 */
-+};
-+static const u16 led_dur = UNIT_LED_BLINK_DURATION << AIR_LED_BLK_DUR_64M;
-+#endif
-+/* User-defined.E */
-+/************************************************************************
-+ *                  F U N C T I O N S
-+ ************************************************************************/
-+/* Airoha MII read function */
-+static int airoha_cl22_read(struct mii_dev *bus, int phy_addr, int phy_register)
-+{
-+    int read_data = bus->read(bus, phy_addr, MDIO_DEVAD_NONE, phy_register);
-+
-+    if (read_data < 0)
-+        return -EIO;
-+    return read_data;
-+}
-+
-+/* Airoha MII write function */
-+static int airoha_cl22_write(struct mii_dev *bus, int phy_addr, int phy_register, int write_data)
-+{
-+    int ret = bus->write(bus, phy_addr, MDIO_DEVAD_NONE, phy_register, write_data);
-+
-+    return ret;
-+}
-+
-+static int airoha_cl45_write(struct phy_device *phydev, int devad, int reg, int val)
-+{
-+    int ret = 0;
-+
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, devad);
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG, reg);
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, MMD_OP_MODE_DATA | devad);
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG, val);
-+    AIR_RTN_ERR(ret);
-+    return ret;
-+}
-+
-+static int airoha_cl45_read(struct phy_device *phydev, int devad, int reg)
-+{
-+    int read_data, ret;
-+
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, devad);
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG, reg);
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, MMD_OP_MODE_DATA | devad);
-+    AIR_RTN_ERR(ret);
-+    read_data = phy_read(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG);
-+    if (read_data < 0)
-+        return -EIO;
-+    return read_data;
-+}
-+
-+/* EN8801 PBUS write function */
-+int airoha_pbus_write(struct mii_dev *bus, int pbus_addr, int pbus_reg, unsigned long pbus_data)
-+{
-+    int ret = 0;
-+
-+    ret = airoha_cl22_write(bus, pbus_addr, 0x1F, (pbus_reg >> 6));
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl22_write(bus, pbus_addr, ((pbus_reg >> 2) & 0xf), (pbus_data & 0xFFFF));
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl22_write(bus, pbus_addr, 0x10, (pbus_data >> 16));
-+    AIR_RTN_ERR(ret);
-+    return ret;
-+}
-+
-+/* EN8801 PBUS read function */
-+unsigned long airoha_pbus_read(struct mii_dev *bus, int pbus_addr, int pbus_reg)
-+{
-+    unsigned long pbus_data;
-+    unsigned int pbus_data_low, pbus_data_high;
-+
-+    airoha_cl22_write(bus, pbus_addr, 0x1F, (pbus_reg >> 6));
-+    pbus_data_low = airoha_cl22_read(bus, pbus_addr, ((pbus_reg >> 2) & 0xf));
-+    pbus_data_high = airoha_cl22_read(bus, pbus_addr, 0x10);
-+    pbus_data = (pbus_data_high << 16) + pbus_data_low;
-+    return pbus_data;
-+}
-+
-+/* Airoha Token Ring Write function */
-+static int airoha_tr_reg_write(struct phy_device *phydev, unsigned long tr_address, unsigned long tr_data)
-+{
-+    int ret;
-+
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, 0x52b5);       /* page select */
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x11, (int)(tr_data & 0xffff));
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x12, (int)(tr_data >> 16));
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x10, (int)(tr_address | TrReg_WR));
-+    AIR_RTN_ERR(ret);
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, 0x0);          /* page resetore */
-+    AIR_RTN_ERR(ret);
-+    return ret;
-+}
-+
-+int airoha_phy_process(void)
-+{
-+    int ret = 0, pbus_addr = EN8801S_PBUS_PHY_ID;
-+    unsigned long pbus_data;
-+    struct mii_dev *mbus;
-+
-+    mbus = s_phydev->bus;
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x19e0);
-+    pbus_data |= BIT(0);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x19e0, pbus_data);
-+    if(ret)
-+        printf("error: airoha_pbus_write fail ret: %d\n", ret);
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x19e0);
-+    pbus_data &= ~BIT(0);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x19e0, pbus_data);
-+    if(ret)
-+        printf("error: airoha_pbus_write fail ret: %d\n", ret);
-+
-+    if(ret)
-+        printf("error: FCM regs reset fail, ret: %d\n", ret);
-+    else
-+        debug("FCM regs reset successful\n");
-+    return ret;
-+}
-+
-+#ifdef  AIR_LED_SUPPORT
-+static int airoha_led_set_usr_def(struct phy_device *phydev, u8 entity, int polar,
-+                                   u16 on_evt, u16 blk_evt)
-+{
-+    int ret = 0;
-+
-+    if (AIR_ACTIVE_HIGH == polar) {
-+        on_evt |= LED_ON_POL;
-+    } else {
-+        on_evt &= ~LED_ON_POL;
-+    }
-+    ret = airoha_cl45_write(phydev, 0x1f, LED_ON_CTRL(entity), on_evt | LED_ON_EN);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1f, LED_BLK_CTRL(entity), blk_evt);
-+    AIR_RTN_ERR(ret);
-+    return 0;
-+}
-+
-+static int airoha_led_set_mode(struct phy_device *phydev, u8 mode)
-+{
-+    u16 cl45_data;
-+    int err = 0;
-+
-+    cl45_data = airoha_cl45_read(phydev, 0x1f, LED_BCR);
-+    switch (mode) {
-+    case AIR_LED_MODE_DISABLE:
-+        cl45_data &= ~LED_BCR_EXT_CTRL;
-+        cl45_data &= ~LED_BCR_MODE_MASK;
-+        cl45_data |= LED_BCR_MODE_DISABLE;
-+        break;
-+    case AIR_LED_MODE_USER_DEFINE:
-+        cl45_data |= LED_BCR_EXT_CTRL;
-+		cl45_data |= LED_BCR_CLK_EN;
-+        break;
-+    default:
-+        printf("LED mode%d is not supported!\n", mode);
-+        return -EINVAL;
-+    }
-+    err = airoha_cl45_write(phydev, 0x1f, LED_BCR, cl45_data);
-+    AIR_RTN_ERR(err);
-+    return 0;
-+}
-+
-+static int airoha_led_set_state(struct phy_device *phydev, u8 entity, u8 state)
-+{
-+    u16 cl45_data;
-+    int err;
-+
-+    cl45_data = airoha_cl45_read(phydev, 0x1f, LED_ON_CTRL(entity));
-+    if (LED_ENABLE == state) {
-+        cl45_data |= LED_ON_EN;
-+    } else {
-+        cl45_data &= ~LED_ON_EN;
-+    }
-+
-+    err = airoha_cl45_write(phydev, 0x1f, LED_ON_CTRL(entity), cl45_data);
-+    AIR_RTN_ERR(err);
-+    return 0;
-+}
-+
-+static int en8801s_led_init(struct phy_device *phydev)
-+{
-+
-+    unsigned long led_gpio = 0, reg_value = 0;
-+    int ret = 0, led_id;
-+    struct mii_dev *mbus = phydev->bus;
-+    int gpio_led_rg[3] = {0x1870, 0x1874, 0x1878};
-+    u16 cl45_data = led_dur;
-+
-+    ret = airoha_cl45_write(phydev, 0x1f, LED_BLK_DUR, cl45_data);
-+    AIR_RTN_ERR(ret);
-+    cl45_data >>= 1;
-+    ret = airoha_cl45_write(phydev, 0x1f, LED_ON_DUR, cl45_data);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_led_set_mode(phydev, AIR_LED_MODE_USER_DEFINE);
-+    if (ret != 0) {
-+        printf("LED fail to set mode, ret %d !\n", ret);
-+        return ret;
-+    }
-+    for(led_id = 0; led_id < EN8801S_LED_COUNT; led_id++) {
-+        reg_value = 0;
-+        ret = airoha_led_set_state(phydev, led_id, led_cfg[led_id].en);
-+        if (ret != 0) {
-+            printf("LED fail to set state, ret %d !\n", ret);
-+            return ret;
-+        }
-+        if (LED_ENABLE == led_cfg[led_id].en) {
-+            if ( (led_cfg[led_id].gpio < 0) || led_cfg[led_id].gpio > 9) {
-+                printf("GPIO%d is out of range!! GPIO number is 0~9.\n", led_cfg[led_id].gpio);
-+                return -EIO;
-+            }
-+            led_gpio |= BIT(led_cfg[led_id].gpio);
-+            reg_value = airoha_pbus_read(mbus, EN8801S_PBUS_PHY_ID, gpio_led_rg[led_cfg[led_id].gpio / 4]);
-+            LED_SET_GPIO_SEL(led_cfg[led_id].gpio, led_id, reg_value);
-+            debug("[Airoha] gpio%d, reg_value 0x%lx\n", led_cfg[led_id].gpio, reg_value);
-+            ret = airoha_pbus_write(mbus, EN8801S_PBUS_PHY_ID, gpio_led_rg[led_cfg[led_id].gpio / 4], reg_value);
-+            AIR_RTN_ERR(ret);
-+            ret = airoha_led_set_usr_def(phydev, led_id, led_cfg[led_id].pol, led_cfg[led_id].on_cfg, led_cfg[led_id].blk_cfg);
-+            if (ret != 0) {
-+                printf("LED fail to set usr def, ret %d !\n", ret);
-+                return ret;
-+            }
-+        }
-+    }
-+    reg_value = (airoha_pbus_read(mbus, EN8801S_PBUS_PHY_ID, 0x1880) & ~led_gpio);
-+    ret = airoha_pbus_write(mbus, EN8801S_PBUS_PHY_ID, 0x1880, reg_value);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_pbus_write(mbus, EN8801S_PBUS_PHY_ID, 0x186c, led_gpio);
-+    AIR_RTN_ERR(ret);
-+
-+    printf("LED initialize OK !\n");
-+    return 0;
-+}
-+#endif /* AIR_LED_SUPPORT */
-+
-+static int en8801s_config(struct phy_device *phydev)
-+{
-+    int reg_value = 0, ret = 0;
-+    struct mii_dev *mbus = phydev->bus;
-+    int retry, pbus_addr = EN8801S_PBUS_DEFAULT_ID;
-+    int phy_addr = EN8801S_MDIO_PHY_ID;
-+    unsigned long pbus_data = 0;
-+    gephy_all_REG_LpiReg1Ch      GPHY_RG_LPI_1C;
-+    gephy_all_REG_dev1Eh_reg324h GPHY_RG_1E_324;
-+    gephy_all_REG_dev1Eh_reg012h GPHY_RG_1E_012;
-+    gephy_all_REG_dev1Eh_reg017h GPHY_RG_1E_017;
-+
-+    s_phydev = phydev;
-+    retry = MAX_OUI_CHECK;
-+    while (1) {
-+        /* PHY OUI */
-+        pbus_data = airoha_pbus_read(mbus, pbus_addr, EN8801S_RG_ETHER_PHY_OUI);
-+        if (EN8801S_PBUS_OUI == pbus_data) {
-+            printf("PBUS addr 0x%x: Start initialized.\n", pbus_addr);
-+            ret = airoha_pbus_write(mbus, pbus_addr, EN8801S_RG_BUCK_CTL, 0x03);
-+            AIR_RTN_ERR(ret);
-+            break;
-+        } else
-+            pbus_addr = EN8801S_PBUS_PHY_ID;
-+
-+        if (0 == --retry) {
-+            printf("EN8801S Probe fail !\n");
-+            return 0;
-+        }
-+    }
-+
-+    /* SMI ADDR */
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, EN8801S_RG_SMI_ADDR);
-+    pbus_data = (pbus_data & 0xffff0000) | (unsigned long)(pbus_addr << 8) | (unsigned long)(EN8801S_MDIO_DEFAULT_ID);
-+    ret = airoha_pbus_write(mbus, pbus_addr, EN8801S_RG_SMI_ADDR, pbus_data);
-+    AIR_RTN_ERR(ret);
-+    mdelay(10);
-+
-+    pbus_data = (airoha_pbus_read(mbus, pbus_addr, EN8801S_RG_LTR_CTL) & (~0x3)) | BIT(2) ;
-+    ret = airoha_pbus_write(mbus, pbus_addr, EN8801S_RG_LTR_CTL, pbus_data);
-+    AIR_RTN_ERR(ret);
-+    mdelay(500);
-+    pbus_data = (pbus_data & ~BIT(2)) | EN8801S_RX_POLARITY_NORMAL | EN8801S_TX_POLARITY_NORMAL;
-+    ret = airoha_pbus_write(mbus, pbus_addr, EN8801S_RG_LTR_CTL, pbus_data);
-+    AIR_RTN_ERR(ret);
-+    mdelay(500);
-+    /* SMI ADDR */
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, EN8801S_RG_SMI_ADDR);
-+    pbus_data = (pbus_data & 0xffff0000) | (unsigned long)(EN8801S_PBUS_PHY_ID << 8) | (unsigned long)(EN8801S_MDIO_PHY_ID);
-+    ret = airoha_pbus_write(mbus, pbus_addr, EN8801S_RG_SMI_ADDR, pbus_data);
-+    pbus_addr = EN8801S_PBUS_PHY_ID;
-+    AIR_RTN_ERR(ret);
-+    mdelay(10);
-+
-+    /* Optimze 10M IoT */
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1690);
-+    pbus_data |= (1 << 31);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x1690, pbus_data);
-+    AIR_RTN_ERR(ret);
-+    /* set SGMII Base Page */
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x0600, 0x0c000c00);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x10, 0xD801);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x0,  0x9140);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x0A14, 0x0003);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x0600, 0x0c000c00);
-+    AIR_RTN_ERR(ret);
-+    /* Set FCM control */
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x1404, 0x004b);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x140c, 0x0007);
-+    AIR_RTN_ERR(ret);
-+
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x142c, 0x05050505);
-+    AIR_RTN_ERR(ret);
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1440);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x1440, pbus_data & ~BIT(11));
-+    AIR_RTN_ERR(ret);
-+
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1408);
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x1408, pbus_data | BIT(5));
-+    AIR_RTN_ERR(ret);
-+
-+    /* Set GPHY Perfomance*/
-+    /* Token Ring */
-+    ret = airoha_tr_reg_write(phydev, RgAddr_R1000DEC_15h, 0x0055A0);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_R1000DEC_17h, 0x07FF3F);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_PMA_00h,      0x00001E);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_PMA_01h,      0x6FB90A);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_PMA_17h,      0x060671);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_PMA_18h,      0x0E2F00);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_TR_26h,       0x444444);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_03h,     0x000000);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_06h,     0x2EBAEF);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_08h,     0x00000B);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_0Ch,     0x00504D);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_0Dh,     0x02314F);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_0Fh,     0x003028);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_10h,     0x005010);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_11h,     0x040001);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_13h,     0x018670);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_14h,     0x00024A);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_1Bh,     0x000072);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_tr_reg_write(phydev, RgAddr_DSPF_1Ch,     0x003210);
-+    AIR_RTN_ERR(ret);
-+    /* CL22 & CL45 */
-+    ret = airoha_cl22_write(mbus, phy_addr, 0x1f, 0x03);
-+    AIR_RTN_ERR(ret);
-+    GPHY_RG_LPI_1C.DATA = airoha_cl22_read(mbus, phy_addr, RgAddr_LPI_1Ch);
-+    if (GPHY_RG_LPI_1C.DATA < 0)
-+        return -EIO;
-+    GPHY_RG_LPI_1C.DataBitField.smi_deton_th = 0x0C;
-+    ret = airoha_cl22_write(mbus, phy_addr, RgAddr_LPI_1Ch, GPHY_RG_LPI_1C.DATA);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl22_write(mbus, phy_addr, RgAddr_LPI_1Ch, 0xC92);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl22_write(mbus, phy_addr, RgAddr_AUXILIARY_1Dh, 0x1);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl22_write(mbus, phy_addr, 0x1f, 0x0);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x120, 0x8014);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x122, 0xffff);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x123, 0xffff);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x144, 0x0200);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x14A, 0xEE20);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x189, 0x0110);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x19B, 0x0111);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x234, 0x0181);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x238, 0x0120);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x239, 0x0117);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x268, 0x07F4);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x2D1, 0x0733);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x323, 0x0011);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x324, 0x013F);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x326, 0x0037);
-+    AIR_RTN_ERR(ret);
-+
-+    reg_value = airoha_cl45_read(phydev, 0x1E, 0x324);
-+    if (reg_value < 0)
-+        return -EIO;
-+    GPHY_RG_1E_324.DATA = (int)reg_value;
-+    GPHY_RG_1E_324.DataBitField.smi_det_deglitch_off = 0;
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x324, GPHY_RG_1E_324.DATA);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x19E, 0xC2);
-+    AIR_RTN_ERR(ret);
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x013, 0x0);
-+    AIR_RTN_ERR(ret);
-+
-+    /* EFUSE */
-+    airoha_pbus_write(mbus, pbus_addr, 0x1C08, 0x40000040);
-+    retry = MAX_RETRY;
-+    while (0 != retry) {
-+        mdelay(1);
-+        pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1C08);
-+        if ((pbus_data & (1 << 30)) == 0) {
-+            break;
-+        }
-+        retry--;
-+    }
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1C38);          /* RAW#2 */
-+    reg_value = airoha_cl45_read(phydev, 0x1E, 0x12);
-+    if (reg_value < 0)
-+        return -EIO;
-+    GPHY_RG_1E_012.DATA = reg_value;
-+    GPHY_RG_1E_012.DataBitField.da_tx_i2mpb_a_tbt = pbus_data & 0x03f;
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x12, GPHY_RG_1E_012.DATA);
-+    AIR_RTN_ERR(ret);
-+    reg_value = airoha_cl45_read(phydev, 0x1E, 0x17);
-+    if (reg_value < 0)
-+        return -EIO;
-+    GPHY_RG_1E_017.DataBitField.da_tx_i2mpb_b_tbt = (reg_value >> 8) & 0x03f;
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x17, GPHY_RG_1E_017.DATA);
-+    AIR_RTN_ERR(ret);
-+
-+    ret = airoha_pbus_write(mbus, pbus_addr, 0x1C08, 0x40400040);
-+    AIR_RTN_ERR(ret);
-+    retry = MAX_RETRY;
-+    while (0 != retry) {
-+        mdelay(1);
-+        reg_value = airoha_pbus_read(mbus, pbus_addr, 0x1C08);
-+        if ((reg_value & (1 << 30)) == 0) {
-+            break;
-+        }
-+        retry--;
-+    }
-+    pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1C30);          /* RAW#16 */
-+    GPHY_RG_1E_324.DataBitField.smi_det_deglitch_off = (pbus_data >> 12) & 0x01;
-+    ret = airoha_cl45_write(phydev, 0x1E, 0x324, GPHY_RG_1E_324.DATA);
-+    AIR_RTN_ERR(ret);
-+#ifdef AIR_LED_SUPPORT
-+    ret = en8801s_led_init(phydev);
-+    if (ret != 0){
-+        printf("en8801s_led_init fail (ret:%d) !\n", ret);
-+    }
-+#endif
-+    printf("EN8801S initialize OK ! (%s)\n", EN8801S_DRIVER_VERSION);
-+    return 0;
-+}
-+
-+int en8801s_read_status(struct phy_device *phydev)
-+{
-+    int ret, pbus_addr = EN8801S_PBUS_PHY_ID;
-+    struct mii_dev *mbus;
-+    unsigned long pbus_data;
-+
-+    mbus = phydev->bus;
-+    if (SPEED_10 == phydev->speed) {
-+        /* set the bit for Optimze 10M IoT */
-+        debug("[Airoha] SPEED_10 0x1694\n");
-+        pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1694);
-+        pbus_data |= (1 << 31);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x1694, pbus_data);
-+        AIR_RTN_ERR(ret);
-+    } else {
-+        debug("[Airoha] SPEED_1000/100 0x1694\n");
-+        /* clear the bit for other speeds */
-+        pbus_data = airoha_pbus_read(mbus, pbus_addr, 0x1694);
-+        pbus_data &= ~(1 << 31);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x1694, pbus_data);
-+        AIR_RTN_ERR(ret);
-+    }
-+
-+    airoha_pbus_write(mbus, pbus_addr, 0x0600, 0x0c000c00);
-+    if(SPEED_1000 == phydev->speed) {
-+        debug("[Airoha] SPEED_1000\n");
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x10, 0xD801);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0,  0x9140);
-+        AIR_RTN_ERR(ret);
-+
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0A14, 0x0003);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0600, 0x0c000c00);
-+        AIR_RTN_ERR(ret);
-+        mdelay(2);  /* delay 2 ms */
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x1404, 0x004b);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x140c, 0x0007);
-+        AIR_RTN_ERR(ret);
-+    }
-+    else if (SPEED_100 == phydev->speed) {
-+        debug("[Airoha] SPEED_100\n");
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x10, 0xD401);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0,  0x9140);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0A14, 0x0007);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0600, 0x0c11);
-+        AIR_RTN_ERR(ret);
-+        mdelay(2);  /* delay 2 ms */
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x1404, 0x0027);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x140c, 0x0007);
-+        AIR_RTN_ERR(ret);
-+    }
-+    else {
-+        debug("[Airoha] SPEED_10\n");
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x10, 0xD001);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0,  0x9140);
-+        AIR_RTN_ERR(ret);
-+
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0A14, 0x000b);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x0600, 0x0c11);
-+        AIR_RTN_ERR(ret);
-+         mdelay(2);  /* delay 2 ms */
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x1404, 0x0047);
-+        AIR_RTN_ERR(ret);
-+        ret = airoha_pbus_write(mbus, pbus_addr, 0x140c, 0x0007);
-+        AIR_RTN_ERR(ret);
-+    }
-+    return 0;
-+}
-+
-+static int en8801s_startup(struct phy_device *phydev)
-+{
-+    int ret;
-+
-+    ret = genphy_update_link(phydev);
-+    if (ret)
-+        return ret;
-+    ret = genphy_parse_link(phydev);
-+    if (ret)
-+        return ret;
-+    return en8801s_read_status(phydev);
-+}
-+#if AIR_UBOOT_REVISION > 0x202303
-+U_BOOT_PHY_DRIVER(en8801s) = {
-+    .name = "Airoha EN8801S",
-+    .uid = EN8801S_PHY_ID,
-+    .mask = 0x0ffffff0,
-+    .features = PHY_GBIT_FEATURES,
-+    .config = &en8801s_config,
-+    .startup = &en8801s_startup,
-+    .shutdown = &genphy_shutdown,
-+};
-+#else
-+static struct phy_driver AIR_EN8801S_driver = {
-+    .name = "Airoha EN8801S",
-+    .uid = EN8801S_PHY_ID,
-+    .mask = 0x0ffffff0,
-+    .features = PHY_GBIT_FEATURES,
-+    .config = &en8801s_config,
-+    .startup = &en8801s_startup,
-+    .shutdown = &genphy_shutdown,
-+};
-+
-+int phy_air_en8801s_init(void)
-+{
-+    phy_register(&AIR_EN8801S_driver);
-+    return 0;
-+}
-+#endif
---- /dev/null
-+++ b/drivers/net/phy/air_en8801s.h
-@@ -0,0 +1,267 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*************************************************
-+ * FILE NAME:  air_en8801s.h
-+ * PURPOSE:
-+ *      EN8801S PHY Driver for Uboot
-+ * NOTES:
-+ *
-+ *  Copyright (C) 2023 Airoha Technology Corp.
-+ *************************************************/
-+
-+#ifndef __EN8801S_H
-+#define __EN8801S_H
-+
-+/************************************************************************
-+*                  D E F I N E S
-+************************************************************************/
-+#define AIR_UBOOT_REVISION ((((U_BOOT_VERSION_NUM / 1000) % 10) << 20) | \
-+		      (((U_BOOT_VERSION_NUM / 100) % 10) << 16) | \
-+		      (((U_BOOT_VERSION_NUM / 10) % 10) << 12) | \
-+		      ((U_BOOT_VERSION_NUM % 10) << 8) | \
-+		      (((U_BOOT_VERSION_NUM_PATCH / 10) % 10) << 4) | \
-+		      ((U_BOOT_VERSION_NUM_PATCH % 10) << 0))
-+
-+#define EN8801S_MDIO_DEFAULT_ID 0x1d
-+#define EN8801S_PBUS_DEFAULT_ID (EN8801S_MDIO_DEFAULT_ID + 1)
-+#define EN8801S_MDIO_PHY_ID     0x18       /* Range PHY_ADDRESS_RANGE .. 0x1e */
-+#define EN8801S_PBUS_PHY_ID     (EN8801S_MDIO_PHY_ID + 1)
-+#define EN8801S_DRIVER_VERSION      "v1.1.3"
-+
-+#define EN8801S_RG_ETHER_PHY_OUI    0x19a4
-+#define EN8801S_RG_SMI_ADDR         0x19a8
-+#define EN8801S_PBUS_OUI            0x17a5
-+#define EN8801S_RG_BUCK_CTL         0x1a20
-+#define EN8801S_RG_LTR_CTL          0x0cf8
-+
-+#define EN8801S_PHY_ID1         0x03a2
-+#define EN8801S_PHY_ID2         0x9461
-+#define EN8801S_PHY_ID          (unsigned long)((EN8801S_PHY_ID1 << 16) | EN8801S_PHY_ID2)
-+
-+/*
-+SFP Sample for verification
-+Tx Reverse, Rx Reverse
-+*/
-+#define EN8801S_TX_POLARITY_NORMAL   0x0
-+#define EN8801S_TX_POLARITY_REVERSE  0x1
-+
-+#define EN8801S_RX_POLARITY_NORMAL   (0x1 << 1)
-+#define EN8801S_RX_POLARITY_REVERSE  (0x0 << 1)
-+
-+#ifndef BIT
-+#define BIT(nr)			(1UL << (nr))
-+#endif
-+
-+#define MAX_RETRY               5
-+#define MAX_OUI_CHECK           2
-+
-+/* CL45 MDIO control */
-+#define MII_MMD_ACC_CTL_REG     0x0d
-+#define MII_MMD_ADDR_DATA_REG   0x0e
-+#define MMD_OP_MODE_DATA        BIT(14)
-+
-+#define MAX_TRG_COUNTER         5
-+
-+/* TokenRing Reg Access */
-+#define TrReg_PKT_XMT_STA       0x8000
-+#define TrReg_WR                0x8000
-+#define TrReg_RD                0xA000
-+
-+#define RgAddr_LPI_1Ch       0x1c
-+#define RgAddr_AUXILIARY_1Dh 0x1d
-+#define RgAddr_PMA_00h       0x0f80
-+#define RgAddr_PMA_01h       0x0f82
-+#define RgAddr_PMA_17h       0x0fae
-+#define RgAddr_PMA_18h       0x0fb0
-+#define RgAddr_DSPF_03h      0x1686
-+#define RgAddr_DSPF_06h      0x168c
-+#define RgAddr_DSPF_08h      0x1690
-+#define RgAddr_DSPF_0Ch      0x1698
-+#define RgAddr_DSPF_0Dh      0x169a
-+#define RgAddr_DSPF_0Fh      0x169e
-+#define RgAddr_DSPF_10h      0x16a0
-+#define RgAddr_DSPF_11h      0x16a2
-+#define RgAddr_DSPF_13h      0x16a6
-+#define RgAddr_DSPF_14h      0x16a8
-+#define RgAddr_DSPF_1Bh      0x16b6
-+#define RgAddr_DSPF_1Ch      0x16b8
-+#define RgAddr_TR_26h        0x0ecc
-+#define RgAddr_R1000DEC_15h  0x03aa
-+#define RgAddr_R1000DEC_17h  0x03ae
-+
-+/*
-+The following led_cfg example is for reference only.
-+LED5 1000M/LINK/ACT  (GPIO5)  <-> BASE_T_LED0,
-+LED6 10/100M/LINK/ACT(GPIO9)  <-> BASE_T_LED1,
-+LED4 100M/LINK/ACT   (GPIO8)  <-> BASE_T_LED2,
-+*/
-+/* User-defined.B */
-+#define BASE_T_LED0_ON_CFG      (LED_ON_EVT_LINK_1000M)
-+#define BASE_T_LED0_BLK_CFG     (LED_BLK_EVT_1000M_TX_ACT | LED_BLK_EVT_1000M_RX_ACT)
-+#define BASE_T_LED1_ON_CFG      (LED_ON_EVT_LINK_100M | LED_ON_EVT_LINK_10M)
-+#define BASE_T_LED1_BLK_CFG     (LED_BLK_EVT_100M_TX_ACT | LED_BLK_EVT_100M_RX_ACT | \
-+                                 LED_BLK_EVT_10M_TX_ACT | LED_BLK_EVT_10M_RX_ACT )
-+#define BASE_T_LED2_ON_CFG      (LED_ON_EVT_LINK_100M)
-+#define BASE_T_LED2_BLK_CFG     (LED_BLK_EVT_100M_TX_ACT | LED_BLK_EVT_100M_RX_ACT)
-+#define BASE_T_LED3_ON_CFG      (0x0)
-+#define BASE_T_LED3_BLK_CFG     (0x0)
-+/* User-defined.E */
-+
-+#define EN8801S_LED_COUNT       4
-+
-+#define LED_BCR                     (0x021)
-+#define LED_BCR_EXT_CTRL            (1 << 15)
-+#define LED_BCR_CLK_EN              (1 << 3)
-+#define LED_BCR_TIME_TEST           (1 << 2)
-+#define LED_BCR_MODE_MASK           (3)
-+#define LED_BCR_MODE_DISABLE        (0)
-+#define LED_ON_CTRL(i)              (0x024 + ((i)*2))
-+#define LED_ON_EN                   (1 << 15)
-+#define LED_ON_POL                  (1 << 14)
-+#define LED_ON_EVT_MASK             (0x7f)
-+/* LED ON Event Option.B */
-+#define LED_ON_EVT_FORCE            (1 << 6)
-+#define LED_ON_EVT_LINK_DOWN        (1 << 3)
-+#define LED_ON_EVT_LINK_10M         (1 << 2)
-+#define LED_ON_EVT_LINK_100M        (1 << 1)
-+#define LED_ON_EVT_LINK_1000M       (1 << 0)
-+/* LED ON Event Option.E */
-+#define LED_BLK_CTRL(i)             (0x025 + ((i)*2))
-+#define LED_BLK_EVT_MASK            (0x3ff)
-+/* LED Blinking Event Option.B*/
-+#define LED_BLK_EVT_FORCE           (1 << 9)
-+#define LED_BLK_EVT_10M_RX_ACT      (1 << 5)
-+#define LED_BLK_EVT_10M_TX_ACT      (1 << 4)
-+#define LED_BLK_EVT_100M_RX_ACT     (1 << 3)
-+#define LED_BLK_EVT_100M_TX_ACT     (1 << 2)
-+#define LED_BLK_EVT_1000M_RX_ACT    (1 << 1)
-+#define LED_BLK_EVT_1000M_TX_ACT    (1 << 0)
-+/* LED Blinking Event Option.E*/
-+#define LED_ON_DUR                  (0x022)
-+#define LED_ON_DUR_MASK             (0xffff)
-+#define LED_BLK_DUR                 (0x023)
-+#define LED_BLK_DUR_MASK            (0xffff)
-+
-+#define LED_ENABLE                  1
-+#define LED_DISABLE                 0
-+
-+#define UNIT_LED_BLINK_DURATION     1024
-+
-+#define AIR_RTN_ON_ERR(cond, err)  \
-+    do { if ((cond)) return (err); } while(0)
-+
-+#define AIR_RTN_ERR(err)                       AIR_RTN_ON_ERR(err < 0, err)
-+
-+#define LED_SET_EVT(reg, cod, result, bit) do         \
-+    {                                                 \
-+        if(reg & cod) {                               \
-+            result |= bit;                            \
-+        }                                             \
-+    } while(0)
-+
-+#define LED_SET_GPIO_SEL(gpio, led, val) do           \
-+    {                                                 \
-+            val |= (led << (8 * (gpio % 4)));         \
-+    } while(0)
-+
-+/* DATA TYPE DECLARATIONS
-+ */
-+typedef struct
-+{
-+    int DATA_Lo;
-+    int DATA_Hi;
-+}TR_DATA_T;
-+
-+typedef union
-+{
-+    struct
-+    {
-+        /* b[15:00] */
-+        int smi_deton_wt                             : 3;
-+        int smi_det_mdi_inv                          : 1;
-+        int smi_detoff_wt                            : 3;
-+        int smi_sigdet_debouncing_en                 : 1;
-+        int smi_deton_th                             : 6;
-+        int rsv_14                                   : 2;
-+    } DataBitField;
-+    int DATA;
-+} gephy_all_REG_LpiReg1Ch, *Pgephy_all_REG_LpiReg1Ch;
-+
-+typedef union
-+{
-+    struct
-+    {
-+        /* b[15:00] */
-+        int rg_smi_detcnt_max                        : 6;
-+        int rsv_6                                    : 2;
-+        int rg_smi_det_max_en                        : 1;
-+        int smi_det_deglitch_off                     : 1;
-+        int rsv_10                                   : 6;
-+    } DataBitField;
-+    int DATA;
-+} gephy_all_REG_dev1Eh_reg324h, *Pgephy_all_REG_dev1Eh_reg324h;
-+
-+typedef union
-+{
-+    struct
-+    {
-+        /* b[15:00] */
-+        int da_tx_i2mpb_a_tbt                        : 6;
-+        int rsv_6                                    : 4;
-+        int da_tx_i2mpb_a_gbe                        : 6;
-+    } DataBitField;
-+    int DATA;
-+} gephy_all_REG_dev1Eh_reg012h, *Pgephy_all_REG_dev1Eh_reg012h;
-+
-+typedef union
-+{
-+    struct
-+    {
-+        /* b[15:00] */
-+        int da_tx_i2mpb_b_tbt                        : 6;
-+        int rsv_6                                    : 2;
-+        int da_tx_i2mpb_b_gbe                        : 6;
-+        int rsv_14                                   : 2;
-+    } DataBitField;
-+    int DATA;
-+} gephy_all_REG_dev1Eh_reg017h, *Pgephy_all_REG_dev1Eh_reg017h;
-+
-+typedef struct AIR_BASE_T_LED_CFG_S
-+{
-+    u16 en;
-+    u16 gpio;
-+    u16 pol;
-+    u16 on_cfg;
-+    u16 blk_cfg;
-+}AIR_BASE_T_LED_CFG_T;
-+
-+typedef enum
-+{
-+    AIR_LED_BLK_DUR_32M,
-+    AIR_LED_BLK_DUR_64M,
-+    AIR_LED_BLK_DUR_128M,
-+    AIR_LED_BLK_DUR_256M,
-+    AIR_LED_BLK_DUR_512M,
-+    AIR_LED_BLK_DUR_1024M,
-+    AIR_LED_BLK_DUR_LAST
-+} AIR_LED_BLK_DUT_T;
-+
-+typedef enum
-+{
-+    AIR_ACTIVE_LOW,
-+    AIR_ACTIVE_HIGH,
-+} AIR_LED_POLARITY;
-+typedef enum
-+{
-+    AIR_LED_MODE_DISABLE,
-+    AIR_LED_MODE_USER_DEFINE,
-+    AIR_LED_MODE_LAST
-+} AIR_LED_MODE_T;
-+
-+/************************************************************************
-+*                  F U N C T I O N    P R O T O T Y P E S
-+************************************************************************/
-+
-+unsigned long airoha_pbus_read(struct mii_dev *bus, int pbus_addr, int pbus_reg);
-+int airoha_pbus_write(struct mii_dev *bus, int pbus_addr, int pbus_reg, unsigned long pbus_data);
-+int airoha_phy_process(void);
-+#endif /* __EN8801S_H */
---- /dev/null
-+++ b/drivers/net/phy/air_en8811h.c
-@@ -0,0 +1,725 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*************************************************
-+ * FILE NAME:  air_en8811h.c
-+ * PURPOSE:
-+ *      EN8811H PHY Driver for Uboot
-+ * NOTES:
-+ *
-+ *  Copyright (C) 2023 Airoha Technology Corp.
-+ *************************************************/
-+
-+/* INCLUDE FILE DECLARATIONS
-+*/
-+#include <common.h>
-+#include <eth_phy.h>
-+#include <phy.h>
-+#include <errno.h>
-+#include <malloc.h>
-+#include <version.h>
-+#include "air_en8811h.h"
-+
-+#ifdef CONFIG_PHY_AIROHA_FW_IN_UBI
-+#include <ubi_uboot.h>
-+#endif
-+
-+#ifdef CONFIG_PHY_AIROHA_FW_IN_MMC
-+#include <mmc.h>
-+#endif
-+
-+#ifdef CONFIG_PHY_AIROHA_FW_IN_MTD
-+#include <mtd.h>
-+#endif
-+
-+#if AIR_UBOOT_REVISION > 0x202004
-+#include <linux/delay.h>
-+#endif
-+
-+/**************************
-+ * GPIO5  <-> BASE_T_LED0,
-+ * GPIO4  <-> BASE_T_LED1,
-+ * GPIO3  <-> BASE_T_LED2,
-+ **************************/
-+/* User-defined.B */
-+#define AIR_LED_SUPPORT
-+#ifdef AIR_LED_SUPPORT
-+static const struct air_base_t_led_cfg_s led_cfg[3] = {
-+/*********************************************************************
-+ *Enable,   GPIO,        LED Polarity,     LED ON,      LED Blink
-+**********************************************************************/
-+    {1, AIR_LED0_GPIO5, AIR_ACTIVE_HIGH, AIR_LED0_ON, AIR_LED0_BLK},
-+    {1, AIR_LED1_GPIO4, AIR_ACTIVE_HIGH, AIR_LED1_ON, AIR_LED1_BLK},
-+    {1, AIR_LED2_GPIO3, AIR_ACTIVE_HIGH, AIR_LED2_ON, AIR_LED2_BLK},
-+};
-+static const u16 led_dur = UNIT_LED_BLINK_DURATION << AIR_LED_BLK_DUR_64M;
-+#endif
-+/* User-defined.E */
-+/*************************************************************
-+ *                       F U N C T I O N S
-+ **************************************************************/
-+/* Airoha MII read function */
-+static int air_mii_cl22_read(struct mii_dev *bus, int phy_addr, int phy_register)
-+{
-+    int read_data = bus->read(bus, phy_addr, MDIO_DEVAD_NONE, phy_register);
-+
-+    if (read_data < 0)
-+        return -EIO;
-+    return read_data;
-+}
-+
-+/* Airoha MII write function */
-+static int air_mii_cl22_write(struct mii_dev *bus, int phy_addr, int phy_register, int write_data)
-+{
-+    int ret = 0;
-+
-+    ret = bus->write(bus, phy_addr, MDIO_DEVAD_NONE, phy_register, write_data);
-+    if (ret < 0) {
-+        printf("bus->write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    return ret;
-+}
-+
-+static int air_mii_cl45_read(struct phy_device *phydev, int devad, u16 reg)
-+{
-+    int ret = 0;
-+    int data;
-+
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, devad);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return INVALID_DATA;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG, reg);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return INVALID_DATA;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, MMD_OP_MODE_DATA | devad);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return INVALID_DATA;
-+    }
-+    data = phy_read(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG);
-+    return data;
-+}
-+
-+static int air_mii_cl45_write(struct phy_device *phydev, int devad, u16 reg, u16 write_data)
-+{
-+    int ret = 0;
-+
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, devad);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG, reg);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ACC_CTL_REG, MMD_OP_MODE_DATA | devad);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_ADDR_DATA_REG, write_data);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    return 0;
-+}
-+/* Use default PBUS_PHY_ID */
-+/* EN8811H PBUS write function */
-+static int air_pbus_reg_write(struct phy_device *phydev, unsigned long pbus_address, unsigned long pbus_data)
-+{
-+    int ret = 0;
-+    struct mii_dev *mbus = phydev->bus;
-+
-+    ret = air_mii_cl22_write(mbus, ((phydev->addr) + 8), 0x1F, (unsigned int)(pbus_address >> 6));
-+    if (ret < 0)
-+        return ret;
-+    ret = air_mii_cl22_write(mbus, ((phydev->addr) + 8), (unsigned int)((pbus_address >> 2) & 0xf), (unsigned int)(pbus_data & 0xFFFF));
-+    if (ret < 0)
-+        return ret;
-+    ret = air_mii_cl22_write(mbus, ((phydev->addr) + 8), 0x10, (unsigned int)(pbus_data >> 16));
-+    if (ret < 0)
-+        return ret;
-+    return 0;
-+}
-+
-+/* EN8811H BUCK write function */
-+static int air_buckpbus_reg_write(struct phy_device *phydev, unsigned long pbus_address, unsigned int pbus_data)
-+{
-+    int ret = 0;
-+
-+    /* page 4 */
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, (unsigned int)4);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x10, (unsigned int)0);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x11, (unsigned int)((pbus_address >> 16) & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x12, (unsigned int)(pbus_address & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x13, (unsigned int)((pbus_data >> 16) & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x14, (unsigned int)(pbus_data & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    return 0;
-+}
-+
-+/* EN8811H BUCK read function */
-+static unsigned int air_buckpbus_reg_read(struct phy_device *phydev, unsigned long pbus_address)
-+{
-+    unsigned int pbus_data = 0, pbus_data_low, pbus_data_high;
-+    int ret = 0;
-+
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, (unsigned int)4);        /* page 4 */
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return PBUS_INVALID_DATA;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x10, (unsigned int)0);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return PBUS_INVALID_DATA;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x15, (unsigned int)((pbus_address >> 16) & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return PBUS_INVALID_DATA;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x16, (unsigned int)(pbus_address & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return PBUS_INVALID_DATA;
-+    }
-+
-+    pbus_data_high = phy_read(phydev, MDIO_DEVAD_NONE, 0x17);
-+    pbus_data_low = phy_read(phydev, MDIO_DEVAD_NONE, 0x18);
-+    pbus_data = (pbus_data_high << 16) + pbus_data_low;
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, (unsigned int)0);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    return pbus_data;
-+}
-+
-+static int MDIOWriteBuf(struct phy_device *phydev, unsigned long address, unsigned long array_size, const unsigned char *buffer)
-+{
-+    unsigned int write_data, offset ;
-+    int ret = 0;
-+
-+    /* page 4 */
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, (unsigned int)4);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    /* address increment*/
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x10, (unsigned int)0x8000);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x11, (unsigned int)((address >> 16) & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x12, (unsigned int)(address & 0xffff));
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+
-+    for (offset = 0; offset < array_size; offset += 4) {
-+        write_data = (buffer[offset + 3] << 8) | buffer[offset + 2];
-+        ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x13, write_data);
-+        if (ret < 0) {
-+            printf("phy_write, ret: %d\n", ret);
-+            return ret;
-+        }
-+        write_data = (buffer[offset + 1] << 8) | buffer[offset];
-+        ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x14, write_data);
-+        if (ret < 0) {
-+            printf("phy_write, ret: %d\n", ret);
-+            return ret;
-+        }
-+    }
-+    ret = phy_write(phydev, MDIO_DEVAD_NONE, 0x1F, (unsigned int)0);
-+    if (ret < 0) {
-+        printf("phy_write, ret: %d\n", ret);
-+        return ret;
-+    }
-+    return 0;
-+}
-+
-+#ifdef  AIR_LED_SUPPORT
-+static int airoha_led_set_usr_def(struct phy_device *phydev, u8 entity, int polar,
-+                                   u16 on_evt, u16 blk_evt)
-+{
-+    int ret = 0;
-+
-+    if (AIR_ACTIVE_HIGH == polar)
-+        on_evt |= LED_ON_POL;
-+    else
-+        on_evt &= ~LED_ON_POL;
-+
-+    ret = air_mii_cl45_write(phydev, 0x1f, LED_ON_CTRL(entity), on_evt | LED_ON_EN);
-+    if (ret < 0)
-+        return ret;
-+    ret = air_mii_cl45_write(phydev, 0x1f, LED_BLK_CTRL(entity), blk_evt);
-+    if (ret < 0)
-+        return ret;
-+    return 0;
-+}
-+
-+static int airoha_led_set_mode(struct phy_device *phydev, u8 mode)
-+{
-+    u16 cl45_data;
-+    int err = 0;
-+
-+    cl45_data = air_mii_cl45_read(phydev, 0x1f, LED_BCR);
-+    switch (mode) {
-+    case AIR_LED_MODE_DISABLE:
-+        cl45_data &= ~LED_BCR_EXT_CTRL;
-+        cl45_data &= ~LED_BCR_MODE_MASK;
-+        cl45_data |= LED_BCR_MODE_DISABLE;
-+        break;
-+    case AIR_LED_MODE_USER_DEFINE:
-+        cl45_data |= LED_BCR_EXT_CTRL;
-+        cl45_data |= LED_BCR_CLK_EN;
-+        break;
-+    default:
-+        printf("LED mode%d is not supported!\n", mode);
-+        return -EINVAL;
-+    }
-+    err = air_mii_cl45_write(phydev, 0x1f, LED_BCR, cl45_data);
-+    if (err < 0)
-+        return err;
-+    return 0;
-+}
-+
-+static int airoha_led_set_state(struct phy_device *phydev, u8 entity, u8 state)
-+{
-+    u16 cl45_data;
-+    int err;
-+
-+    cl45_data = air_mii_cl45_read(phydev, 0x1f, LED_ON_CTRL(entity));
-+    if (LED_ENABLE == state)
-+        cl45_data |= LED_ON_EN;
-+    else
-+        cl45_data &= ~LED_ON_EN;
-+
-+    err = air_mii_cl45_write(phydev, 0x1f, LED_ON_CTRL(entity), cl45_data);
-+    if (err < 0)
-+        return err;
-+    return 0;
-+}
-+
-+static int en8811h_led_init(struct phy_device *phydev)
-+{
-+    unsigned int led_gpio = 0, reg_value = 0;
-+    u16 cl45_data = led_dur;
-+    int ret, led_id;
-+
-+    cl45_data = UNIT_LED_BLINK_DURATION << AIR_LED_BLK_DUR_64M;
-+    ret = air_mii_cl45_write(phydev, 0x1f, LED_BLK_DUR, cl45_data);
-+    if (ret < 0)
-+        return ret;
-+    cl45_data >>= 1;
-+    ret = air_mii_cl45_write(phydev, 0x1f, LED_ON_DUR, cl45_data);
-+    if (ret < 0)
-+        return ret;
-+
-+    ret = airoha_led_set_mode(phydev, AIR_LED_MODE_USER_DEFINE);
-+    if (ret != 0) {
-+        printf("LED fail to set mode, ret %d !\n", ret);
-+        return ret;
-+    }
-+    for(led_id = 0; led_id < EN8811H_LED_COUNT; led_id++)
-+    {
-+        /* LED0 <-> GPIO5, LED1 <-> GPIO4, LED0 <-> GPIO3 */
-+        if ( led_cfg[led_id].gpio != (led_id + (AIR_LED0_GPIO5 - (2 * led_id)))) {
-+            printf("LED%d uses incorrect GPIO%d !\n", led_id, led_cfg[led_id].gpio);
-+            return -EINVAL;
-+        }
-+        reg_value = 0;
-+        if (led_cfg[led_id].en == LED_ENABLE)
-+        {
-+            led_gpio |= BIT(led_cfg[led_id].gpio);
-+            ret = airoha_led_set_state(phydev, led_id, led_cfg[led_id].en);
-+            if (ret != 0) {
-+                printf("LED fail to set state, ret %d !\n", ret);
-+                return ret;
-+            }
-+            ret = airoha_led_set_usr_def(phydev, led_id, led_cfg[led_id].pol, led_cfg[led_id].on_cfg, led_cfg[led_id].blk_cfg);
-+            if (ret != 0) {
-+                printf("LED fail to set default, ret %d !\n", ret);
-+                return ret;
-+            }
-+        }
-+    }
-+    ret = air_buckpbus_reg_write(phydev, 0xcf8b8, led_gpio);
-+    if (ret < 0)
-+        return ret;
-+    printf("LED initialize OK !\n");
-+    return 0;
-+}
-+#endif /* AIR_LED_SUPPORT */
-+
-+static char *firmware_buf;
-+static int en8811h_load_firmware(struct phy_device *phydev)
-+{
-+    u32 pbus_value;
-+    int ret = 0;
-+
-+    if (!firmware_buf) {
-+        firmware_buf = malloc(EN8811H_MD32_DM_SIZE + EN8811H_MD32_DSP_SIZE);
-+        if (!firmware_buf) {
-+            printf("[Airoha] cannot allocated buffer for firmware.\n");
-+            return -ENOMEM;
-+        }
-+
-+#ifdef CONFIG_PHY_AIROHA_FW_IN_UBI
-+        ret = ubi_volume_read("en8811h-fw", firmware_buf, EN8811H_MD32_DM_SIZE + EN8811H_MD32_DSP_SIZE);
-+        if (ret) {
-+            printf("[Airoha] read firmware from UBI failed.\n");
-+            free(firmware_buf);
-+            firmware_buf = NULL;
-+            return ret;
-+        }
-+#elif defined(CONFIG_PHY_AIROHA_FW_IN_MMC)
-+        struct mmc *mmc = find_mmc_device(0);
-+        if (!mmc) {
-+            printf("[Airoha] opening MMC device failed.\n");
-+            free(firmware_buf);
-+            firmware_buf = NULL;
-+            return -ENODEV;
-+        }
-+        if (mmc_init(mmc)) {
-+            printf("[Airoha] initializing MMC device failed.\n");
-+            free(firmware_buf);
-+            firmware_buf = NULL;
-+            return -ENODEV;
-+        }
-+        if (IS_SD(mmc)) {
-+            printf("[Airoha] SD card is not supported.\n");
-+            free(firmware_buf);
-+            firmware_buf = NULL;
-+            return -EINVAL;
-+        }
-+        ret = mmc_set_part_conf(mmc, 1, 2, 2);
-+        if (ret) {
-+            printf("[Airoha] cannot access eMMC boot1 hw partition.\n");
-+            free(firmware_buf);
-+            firmware_buf = NULL;
-+            return ret;
-+        }
-+        ret = blk_dread(mmc_get_blk_desc(mmc), 0, 0x120, firmware_buf);
-+        mmc_set_part_conf(mmc, 1, 1, 0);
-+        if (ret != 0x120) {
-+            printf("[Airoha] cannot read firmware from eMMC.\n");
-+            free(firmware_buf);
-+            firmware_buf = NULL;
-+            return -EIO;
-+        }
-+#else
-+#warning EN8811H firmware loading not implemented
-+        free(firmware_buf);
-+        firmware_buf = NULL;
-+        return -EOPNOTSUPP;
-+#endif
-+    }
-+
-+    ret = air_buckpbus_reg_write(phydev, 0x0f0018, 0x0);
-+    if (ret < 0)
-+        return ret;
-+    pbus_value = air_buckpbus_reg_read(phydev, 0x800000);
-+    pbus_value |= BIT(11);
-+    ret = air_buckpbus_reg_write(phydev, 0x800000, pbus_value);
-+    if (ret < 0)
-+        return ret;
-+    /* Download DM */
-+    ret = MDIOWriteBuf(phydev, 0x00000000, EN8811H_MD32_DM_SIZE, firmware_buf);
-+    if (ret < 0) {
-+        printf("[Airoha] MDIOWriteBuf 0x00000000 fail.\n");
-+        return ret;
-+    }
-+    /* Download PM */
-+    ret = MDIOWriteBuf(phydev, 0x00100000, EN8811H_MD32_DSP_SIZE, firmware_buf + EN8811H_MD32_DM_SIZE);
-+    if (ret < 0) {
-+        printf("[Airoha] MDIOWriteBuf 0x00100000 fail.\n");
-+        return ret;
-+    }
-+    pbus_value = air_buckpbus_reg_read(phydev, 0x800000);
-+    pbus_value &= ~BIT(11);
-+    ret = air_buckpbus_reg_write(phydev, 0x800000, pbus_value);
-+    if (ret < 0)
-+        return ret;
-+    ret = air_buckpbus_reg_write(phydev, 0x0f0018, 0x01);
-+    if (ret < 0)
-+        return ret;
-+    return 0;
-+}
-+
-+static int en8811h_config(struct phy_device *phydev)
-+{
-+    int ret = 0;
-+    int pid1 = 0, pid2 = 0;
-+
-+    ret = air_pbus_reg_write(phydev, 0xcf928 , 0x0);
-+    if (ret < 0)
-+        return ret;
-+
-+    pid1 = phy_read(phydev, MDIO_DEVAD_NONE, MII_PHYSID1);
-+    pid2 = phy_read(phydev, MDIO_DEVAD_NONE, MII_PHYSID2);
-+    if ((EN8811H_PHY_ID1 != pid1) || (EN8811H_PHY_ID2 != pid2)) {
-+        printf("EN8811H does not exist !\n");
-+        return -ENODEV;
-+    }
-+
-+    return 0;
-+}
-+
-+static int en8811h_get_autonego(struct phy_device *phydev, int *an)
-+{
-+    int reg;
-+    reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);
-+    if (reg < 0)
-+        return -EINVAL;
-+    if (reg & BMCR_ANENABLE)
-+        *an = AUTONEG_ENABLE;
-+    else
-+        *an = AUTONEG_DISABLE;
-+    return 0;
-+}
-+
-+static int en8811h_startup(struct phy_device *phydev)
-+{
-+    ofnode node = phy_get_ofnode(phydev);
-+    int ret = 0, lpagb = 0, lpa = 0, common_adv_gb = 0, common_adv = 0, advgb = 0, adv = 0, reg = 0, an = AUTONEG_DISABLE, bmcr = 0, reg_value;
-+    int old_link = phydev->link;
-+    u32 pbus_value = 0, retry;
-+
-+    eth_phy_reset(phydev->dev, 1);
-+    mdelay(10);
-+    eth_phy_reset(phydev->dev, 0);
-+    mdelay(1);
-+
-+    ret = en8811h_load_firmware(phydev);
-+    if (ret) {
-+        printf("EN8811H load firmware fail.\n");
-+        return ret;
-+    }
-+    retry = MAX_RETRY;
-+    do {
-+        mdelay(300);
-+        reg_value = air_mii_cl45_read(phydev, 0x1e, 0x8009);
-+        if (EN8811H_PHY_READY == reg_value) {
-+            printf("EN8811H PHY ready!\n");
-+            break;
-+        }
-+        retry--;
-+    } while (retry);
-+    if (0 == retry) {
-+        printf("EN8811H PHY is not ready. (MD32 FW Status reg: 0x%x)\n", reg_value);
-+        pbus_value = air_buckpbus_reg_read(phydev, 0x3b3c);
-+        printf("Check MD32 FW Version(0x3b3c) : %08x\n", pbus_value);
-+        printf("EN8811H initialize fail!\n");
-+        return 0;
-+    }
-+    /* Mode selection*/
-+    printf("EN8811H Mode 1 !\n");
-+    ret = air_mii_cl45_write(phydev, 0x1e, 0x800c, 0x0);
-+    if (ret < 0)
-+        return ret;
-+    ret = air_mii_cl45_write(phydev, 0x1e, 0x800d, 0x0);
-+    if (ret < 0)
-+        return ret;
-+    ret = air_mii_cl45_write(phydev, 0x1e, 0x800e, 0x1101);
-+    if (ret < 0)
-+        return ret;
-+    ret = air_mii_cl45_write(phydev, 0x1e, 0x800f, 0x0002);
-+    if (ret < 0)
-+        return ret;
-+
-+    /* Serdes polarity */
-+    pbus_value = air_buckpbus_reg_read(phydev, 0xca0f8);
-+    pbus_value &= 0xfffffffc;
-+    pbus_value |= ofnode_read_bool(node, "airoha,rx-pol-reverse") ?
-+            EN8811H_RX_POLARITY_REVERSE : EN8811H_RX_POLARITY_NORMAL;
-+    pbus_value |= ofnode_read_bool(node, "airoha,tx-pol-reverse") ?
-+            EN8811H_TX_POLARITY_REVERSE : EN8811H_TX_POLARITY_NORMAL;
-+    ret = air_buckpbus_reg_write(phydev, 0xca0f8, pbus_value);
-+    if (ret < 0)
-+        return ret;
-+    pbus_value = air_buckpbus_reg_read(phydev, 0xca0f8);
-+    printf("Tx, Rx Polarity(0xca0f8): %08x\n", pbus_value);
-+    pbus_value = air_buckpbus_reg_read(phydev, 0x3b3c);
-+    printf("MD32 FW Version(0x3b3c) : %08x\n", pbus_value);
-+#if defined(AIR_LED_SUPPORT)
-+    ret = en8811h_led_init(phydev);
-+    if (ret < 0) {
-+        printf("en8811h_led_init fail\n");
-+    }
-+#endif
-+    printf("EN8811H initialize OK ! (%s)\n", EN8811H_DRIVER_VERSION);
-+
-+    ret = genphy_update_link(phydev);
-+    if (ret)
-+    {
-+        printf("ret %d!\n", ret);
-+        return ret;
-+    }
-+
-+    ret = genphy_parse_link(phydev);
-+    if (ret)
-+    {
-+        printf("ret %d!\n", ret);
-+        return ret;
-+    }
-+
-+    if (old_link && phydev->link)
-+       return 0;
-+
-+    phydev->speed = SPEED_100;
-+    phydev->duplex = DUPLEX_FULL;
-+    phydev->pause = 0;
-+    phydev->asym_pause = 0;
-+
-+    reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMSR);
-+    if (reg < 0)
-+    {
-+        printf("MII_BMSR reg %d!\n", reg);
-+        return reg;
-+    }
-+    reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMSR);
-+    if (reg < 0)
-+    {
-+        printf("MII_BMSR reg %d!\n", reg);
-+        return reg;
-+    }
-+    if(reg & BMSR_LSTATUS)
-+    {
-+        pbus_value = air_buckpbus_reg_read(phydev, 0x109D4);
-+        if (0x10 & pbus_value) {
-+            phydev->speed = SPEED_2500;
-+            phydev->duplex = DUPLEX_FULL;
-+        }
-+        else
-+        {
-+            ret = en8811h_get_autonego(phydev, &an);
-+            if ((AUTONEG_ENABLE == an) && (0 == ret))
-+            {
-+                printf("AN mode!\n");
-+                printf("SPEED 1000/100!\n");
-+                lpagb = phy_read(phydev, MDIO_DEVAD_NONE, MII_STAT1000);
-+                if (lpagb < 0 )
-+                    return lpagb;
-+                advgb = phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000);
-+                if (adv < 0 )
-+                    return adv;
-+                common_adv_gb = (lpagb & (advgb << 2));
-+
-+                lpa = phy_read(phydev, MDIO_DEVAD_NONE, MII_LPA);
-+                if (lpa < 0 )
-+                    return lpa;
-+                adv = phy_read(phydev, MDIO_DEVAD_NONE, MII_ADVERTISE);
-+                if (adv < 0 )
-+                    return adv;
-+                common_adv = (lpa & adv);
-+
-+                phydev->speed = SPEED_10;
-+                phydev->duplex = DUPLEX_HALF;
-+                if (common_adv_gb & (LPA_1000FULL | LPA_1000HALF))
-+                {
-+                    phydev->speed = SPEED_1000;
-+                    if (common_adv_gb & LPA_1000FULL)
-+
-+                        phydev->duplex = DUPLEX_FULL;
-+                }
-+                else if (common_adv & (LPA_100FULL | LPA_100HALF))
-+                {
-+                    phydev->speed = SPEED_100;
-+                    if (common_adv & LPA_100FULL)
-+                        phydev->duplex = DUPLEX_FULL;
-+                }
-+                else
-+                {
-+                    if (common_adv & LPA_10FULL)
-+                        phydev->duplex = DUPLEX_FULL;
-+                }
-+            }
-+            else
-+            {
-+                printf("Force mode!\n");
-+                bmcr = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);
-+
-+                if (bmcr < 0)
-+                    return bmcr;
-+
-+                if (bmcr & BMCR_FULLDPLX)
-+                    phydev->duplex = DUPLEX_FULL;
-+                else
-+                    phydev->duplex = DUPLEX_HALF;
-+
-+                if (bmcr & BMCR_SPEED1000)
-+                    phydev->speed = SPEED_1000;
-+                else if (bmcr & BMCR_SPEED100)
-+                    phydev->speed = SPEED_100;
-+                else
-+                    phydev->speed = SPEED_100;
-+            }
-+        }
-+    }
-+
-+    return ret;
-+}
-+
-+#if AIR_UBOOT_REVISION > 0x202303
-+U_BOOT_PHY_DRIVER(en8811h) = {
-+    .name = "Airoha EN8811H",
-+    .uid = EN8811H_PHY_ID,
-+    .mask = 0x0ffffff0,
-+    .config = &en8811h_config,
-+    .startup = &en8811h_startup,
-+    .shutdown = &genphy_shutdown,
-+};
-+#else
-+static struct phy_driver AIR_EN8811H_driver = {
-+    .name = "Airoha EN8811H",
-+    .uid = EN8811H_PHY_ID,
-+    .mask = 0x0ffffff0,
-+    .config = &en8811h_config,
-+    .startup = &en8811h_startup,
-+    .shutdown = &genphy_shutdown,
-+};
-+
-+int phy_air_en8811h_init(void)
-+{
-+    phy_register(&AIR_EN8811H_driver);
-+    return 0;
-+}
-+#endif
---- /dev/null
-+++ b/drivers/net/phy/air_en8811h.h
-@@ -0,0 +1,163 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*************************************************
-+ * FILE NAME:  air_en8811h.h
-+ * PURPOSE:
-+ *      EN8811H PHY Driver for Uboot
-+ * NOTES:
-+ *
-+ *  Copyright (C) 2023 Airoha Technology Corp.
-+ *************************************************/
-+
-+#ifndef __EN8811H_H
-+#define __EN8811H_H
-+
-+#define AIR_UBOOT_REVISION ((((U_BOOT_VERSION_NUM / 1000) % 10) << 20) | \
-+			(((U_BOOT_VERSION_NUM / 100) % 10) << 16) | \
-+			(((U_BOOT_VERSION_NUM / 10) % 10) << 12) | \
-+			((U_BOOT_VERSION_NUM % 10) << 8) | \
-+			(((U_BOOT_VERSION_NUM_PATCH / 10) % 10) << 4) | \
-+			((U_BOOT_VERSION_NUM_PATCH % 10) << 0))
-+
-+#define EN8811H_PHY_ID1             0x03a2
-+#define EN8811H_PHY_ID2             0xa411
-+#define EN8811H_PHY_ID              ((EN8811H_PHY_ID1 << 16) | EN8811H_PHY_ID2)
-+#define EN8811H_SPEED_2500          0x03
-+#define EN8811H_PHY_READY           0x02
-+#define MAX_RETRY                   5
-+
-+#define EN8811H_MD32_DM_SIZE   0x4000
-+#define EN8811H_MD32_DSP_SIZE  0x20000
-+
-+#define EN8811H_TX_POLARITY_NORMAL   0x1
-+#define EN8811H_TX_POLARITY_REVERSE  0x0
-+
-+#define EN8811H_RX_POLARITY_NORMAL  (0x0 << 1)
-+#define EN8811H_RX_POLARITY_REVERSE (0x1 << 1)
-+
-+#ifndef BIT
-+#define BIT(nr)			(1UL << (nr))
-+#endif
-+
-+/* CL45 MDIO control */
-+#define MII_MMD_ACC_CTL_REG         0x0d
-+#define MII_MMD_ADDR_DATA_REG       0x0e
-+#define MMD_OP_MODE_DATA            BIT(14)
-+/* MultiGBASE-T AN register */
-+#define MULTIG_ANAR_2500M           (0x0080)
-+#define MULTIG_LPAR_2500M           (0x0020)
-+
-+#define EN8811H_DRIVER_VERSION  "v1.0.4"
-+
-+/************************************************************
-+ * For reference only
-+ * LED0 Link 2500/Blink 2500 TxRx (GPIO5)    <-> BASE_T_LED0,
-+ * LED1 Link 1000/Blink 1000 TxRx (GPIO4)    <-> BASE_T_LED1,
-+ * LED2 Link 100/Blink 100 TxRx   (GPIO3)    <-> BASE_T_LED2,
-+ ************************************************************/
-+/* User-defined.B */
-+#define AIR_LED0_ON      (LED_ON_EVT_LINK_2500M)
-+#define AIR_LED0_BLK     (LED_BLK_EVT_2500M_TX_ACT | LED_BLK_EVT_2500M_RX_ACT)
-+#define AIR_LED1_ON      (LED_ON_EVT_LINK_1000M)
-+#define AIR_LED1_BLK    (LED_BLK_EVT_1000M_TX_ACT | LED_BLK_EVT_1000M_RX_ACT)
-+#define AIR_LED2_ON      (LED_ON_EVT_LINK_100M)
-+#define AIR_LED2_BLK     (LED_BLK_EVT_100M_TX_ACT | LED_BLK_EVT_100M_RX_ACT)
-+/* User-defined.E */
-+
-+#define LED_ON_CTRL(i)              (0x024 + ((i)*2))
-+#define LED_ON_EN                   (1 << 15)
-+#define LED_ON_POL                  (1 << 14)
-+#define LED_ON_EVT_MASK             (0x1ff)
-+/* LED ON Event Option.B */
-+#define LED_ON_EVT_LINK_2500M       (1 << 8)
-+#define LED_ON_EVT_FORCE            (1 << 6)
-+#define LED_ON_EVT_HDX              (1 << 5)
-+#define LED_ON_EVT_FDX              (1 << 4)
-+#define LED_ON_EVT_LINK_DOWN        (1 << 3)
-+#define LED_ON_EVT_LINK_100M        (1 << 1)
-+#define LED_ON_EVT_LINK_1000M       (1 << 0)
-+/* LED ON Event Option.E */
-+
-+#define LED_BLK_CTRL(i)             (0x025 + ((i)*2))
-+#define LED_BLK_EVT_MASK            (0xfff)
-+/* LED Blinking Event Option.B*/
-+#define LED_BLK_EVT_2500M_RX_ACT    (1 << 11)
-+#define LED_BLK_EVT_2500M_TX_ACT    (1 << 10)
-+#define LED_BLK_EVT_FORCE           (1 << 9)
-+#define LED_BLK_EVT_100M_RX_ACT     (1 << 3)
-+#define LED_BLK_EVT_100M_TX_ACT     (1 << 2)
-+#define LED_BLK_EVT_1000M_RX_ACT    (1 << 1)
-+#define LED_BLK_EVT_1000M_TX_ACT    (1 << 0)
-+/* LED Blinking Event Option.E*/
-+#define LED_ENABLE                  1
-+#define LED_DISABLE                 0
-+
-+#define EN8811H_LED_COUNT       3
-+
-+#define LED_BCR                     (0x021)
-+#define LED_BCR_EXT_CTRL            (1 << 15)
-+#define LED_BCR_CLK_EN              (1 << 3)
-+#define LED_BCR_TIME_TEST           (1 << 2)
-+#define LED_BCR_MODE_MASK           (3)
-+#define LED_BCR_MODE_DISABLE        (0)
-+#define LED_BCR_MODE_2LED           (1)
-+#define LED_BCR_MODE_3LED_1         (2)
-+#define LED_BCR_MODE_3LED_2         (3)
-+
-+#define LED_ON_DUR                  (0x022)
-+#define LED_ON_DUR_MASK             (0xffff)
-+
-+#define LED_BLK_DUR                 (0x023)
-+#define LED_BLK_DUR_MASK            (0xffff)
-+
-+#define LED_GPIO_SEL_MASK           0x7FFFFFF
-+
-+#define UNIT_LED_BLINK_DURATION     1024
-+
-+#define INVALID_DATA                0xffff
-+#define PBUS_INVALID_DATA           0xffffffff
-+
-+struct air_base_t_led_cfg_s {
-+    u16 en;
-+    u16 gpio;
-+    u16 pol;
-+    u16 on_cfg;
-+    u16 blk_cfg;
-+};
-+
-+enum {
-+    AIR_LED2_GPIO3 = 3,
-+    AIR_LED1_GPIO4,
-+    AIR_LED0_GPIO5,
-+    AIR_LED_LAST
-+};
-+
-+enum {
-+    AIR_BASE_T_LED0,
-+    AIR_BASE_T_LED1,
-+    AIR_BASE_T_LED2,
-+    AIR_BASE_T_LED3
-+};
-+
-+enum {
-+    AIR_LED_BLK_DUR_32M,
-+    AIR_LED_BLK_DUR_64M,
-+    AIR_LED_BLK_DUR_128M,
-+    AIR_LED_BLK_DUR_256M,
-+    AIR_LED_BLK_DUR_512M,
-+    AIR_LED_BLK_DUR_1024M,
-+    AIR_LED_BLK_DUR_LAST
-+};
-+
-+enum {
-+    AIR_ACTIVE_LOW,
-+    AIR_ACTIVE_HIGH,
-+};
-+
-+enum {
-+    AIR_LED_MODE_DISABLE,
-+    AIR_LED_MODE_USER_DEFINE,
-+    AIR_LED_MODE_LAST
-+};
-+
-+#endif /* End of __EN8811H_MD32_H */
-+
---- a/drivers/net/eth-phy-uclass.c
-+++ b/drivers/net/eth-phy-uclass.c
-@@ -155,7 +155,7 @@ static int eth_phy_of_to_plat(struct ude
- 	return 0;
- }
- 
--static void eth_phy_reset(struct udevice *dev, int value)
-+void eth_phy_reset(struct udevice *dev, int value)
- {
- 	struct eth_phy_device_priv *uc_priv = dev_get_uclass_priv(dev);
- 	u32 delay;
---- a/include/eth_phy.h
-+++ b/include/eth_phy.h
-@@ -14,5 +14,6 @@ int eth_phy_binds_nodes(struct udevice *
- int eth_phy_set_mdio_bus(struct udevice *eth_dev, struct mii_dev *mdio_bus);
- struct mii_dev *eth_phy_get_mdio_bus(struct udevice *eth_dev);
- int eth_phy_get_addr(struct udevice *dev);
-+void eth_phy_reset(struct udevice *dev, int value);
- 
- #endif
diff --git a/lede/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/lede/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
index bbd05fe41f..a39d03adf2 100644
--- a/lede/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
+++ b/lede/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/configs/mt7622_ubnt_unifi-6-lr-v1_defconfig
++++ b/configs/mt7622_ubnt_unifi-6-lr_defconfig
 @@ -0,0 +1,147 @@
 +CONFIG_ARM=y
 +CONFIG_POSITION_INDEPENDENT=y
@@ -149,305 +149,6 @@
 +CONFIG_USE_SERVERIP=y
 +CONFIG_SERVERIP="192.168.1.254"
 --- /dev/null
-+++ b/configs/mt7622_ubnt_unifi-6-lr-v2_defconfig
-@@ -0,0 +1,147 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7622=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_LOAD_ADDR=0x40080000
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)"
-+CONFIG_ENV_IS_IN_MTD=y
-+CONFIG_ENV_MTD_NAME="nor0"
-+CONFIG_ENV_SIZE_REDUND=0x4000
-+CONFIG_ENV_SIZE=0x4000
-+CONFIG_ENV_OFFSET=0xc0000
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_RESET_BUTTON_SETTLE_DELAY=400
-+CONFIG_BOOTP_SEND_HOSTNAME=y
-+CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr-v2_env"
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=25000000
-+CONFIG_DEFAULT_DEVICE_TREE="mt7622-ubnt-unifi-6-lr"
-+CONFIG_DEBUG_UART=y
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_DEFAULT_FDT_FILE="mt7622-ubnt-unifi-6-lr"
-+CONFIG_SYS_PROMPT="MT7622> "
-+# CONFIG_LEGACY_IMAGE_FORMAT is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+# CONFIG_EFI is not set
-+# CONFIG_EFI_LOADER is not set
-+CONFIG_CMD_BOOTMENU=y
-+# CONFIG_CMD_BOOTEFI is not set
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_BOOTEFI_BOOTMGR is not set
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_MTDPARTS=y
-+# CONFIG_CMD_PCI is not set
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+# CONFIG_CMD_UNLZ4 is not set
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_ETH=y
-+CONFIG_DM_ETH_PHY=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_MDIO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+# CONFIG_DM_MMC is not set
-+CONFIG_DM_SERIAL=y
-+CONFIG_DM_SPI=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_HUSH_PARSER=y
-+# CONFIG_PARTITION_UUIDS is not set
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+# CONFIG_LED is not set
-+# CONFIG_LZ4 is not set
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_PHYLIB_10G=y
-+CONFIG_PHY_AQUANTIA=y
-+CONFIG_PHY_ADDR_ENABLE=y
-+CONFIG_PHY_ADDR=8
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_MTD=y
-+# CONFIG_MMC is not set
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_MTK_SNFI_SPI=y
-+CONFIG_MTK_SNOR=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SPI_FLASH_BAR=y
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_SPI_FLASH_UNLOCK_ALL=y
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+CONFIG_SPI_FLASH_STMICRO=y
-+CONFIG_SPI_FLASH_SST=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_USE_4K_SECTORS=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/configs/mt7622_ubnt_unifi-6-lr-v3_defconfig
-@@ -0,0 +1,146 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7622=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_LOAD_ADDR=0x40080000
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)"
-+CONFIG_ENV_IS_IN_MTD=y
-+CONFIG_ENV_MTD_NAME="nor0"
-+CONFIG_ENV_SIZE_REDUND=0x4000
-+CONFIG_ENV_SIZE=0x4000
-+CONFIG_ENV_OFFSET=0xc0000
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_RESET_BUTTON_SETTLE_DELAY=400
-+CONFIG_BOOTP_SEND_HOSTNAME=y
-+CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr_env"
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=25000000
-+CONFIG_DEFAULT_DEVICE_TREE="mt7622-ubnt-unifi-6-lr-v3"
-+CONFIG_DEBUG_UART=y
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_DEFAULT_FDT_FILE="mt7622-ubnt-unifi-6-lr-v3"
-+CONFIG_SYS_PROMPT="MT7622> "
-+# CONFIG_LEGACY_IMAGE_FORMAT is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+# CONFIG_EFI is not set
-+# CONFIG_EFI_LOADER is not set
-+CONFIG_CMD_BOOTMENU=y
-+# CONFIG_CMD_BOOTEFI is not set
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_BOOTEFI_BOOTMGR is not set
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_MTDPARTS=y
-+# CONFIG_CMD_PCI is not set
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+# CONFIG_CMD_UNLZ4 is not set
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_ETH=y
-+CONFIG_DM_ETH_PHY=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_MDIO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+# CONFIG_DM_MMC is not set
-+CONFIG_DM_SERIAL=y
-+CONFIG_DM_SPI=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_HUSH_PARSER=y
-+# CONFIG_PARTITION_UUIDS is not set
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+# CONFIG_LED is not set
-+# CONFIG_LZ4 is not set
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_PHY_REALTEK=y
-+CONFIG_PHY_ADDR_ENABLE=y
-+CONFIG_PHY_ADDR=0
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_MTD=y
-+# CONFIG_MMC is not set
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_MTK_SNFI_SPI=y
-+CONFIG_MTK_SNOR=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SPI_FLASH_BAR=y
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_SPI_FLASH_UNLOCK_ALL=y
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+CONFIG_SPI_FLASH_STMICRO=y
-+CONFIG_SPI_FLASH_SST=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_USE_4K_SECTORS=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
 +++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr.dts
 @@ -0,0 +1,193 @@
 +// SPDX-License-Identifier: GPL-2.0
@@ -643,210 +344,13 @@
 +		};
 +	};
 +};
---- /dev/null
-+++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr-v3.dts
-@@ -0,0 +1,193 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2019 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include <dt-bindings/input/linux-event-codes.h>
-+#include "mt7622.dtsi"
-+#include "mt7622-u-boot.dtsi"
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "mt7622-ubnt-unifi-6-lr-v3";
-+	compatible = "mediatek,mt7622", "ubnt,unifi-6-lr-v3";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	aliases {
-+		spi0 = &snor;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio 62 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	reg_1p8v: regulator-1p8v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-1.8V";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	reg_3p3v: regulator-3p3v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-3.3V";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	reg_5v: regulator-5v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-5V";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+};
-+
-+&pcie {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie0_pins>, <&pcie1_pins>;
-+	status = "okay";
-+
-+	pcie@0,0 {
-+		status = "okay";
-+	};
-+
-+	pcie@1,0 {
-+		status = "okay";
-+	};
-+};
-+
-+&pinctrl {
-+	eth_pins: eth-pins {
-+		mux {
-+			function = "eth";
-+			groups = "mdc_mdio", "rgmii_via_gmac2";
-+		};
-+	};
-+
-+	pcie0_pins: pcie0-pins {
-+		mux {
-+			function = "pcie";
-+			groups = "pcie0_pad_perst",
-+				 "pcie0_1_waken",
-+				 "pcie0_1_clkreq";
-+		};
-+	};
-+
-+	pcie1_pins: pcie1-pins {
-+		mux {
-+			function = "pcie";
-+			groups = "pcie1_pad_perst",
-+				 "pcie1_0_waken",
-+				 "pcie1_0_clkreq";
-+		};
-+	};
-+
-+	snfi_pins: snfi-pins {
-+		mux {
-+			function = "flash";
-+			groups = "snfi";
-+		};
-+	};
-+
-+	snor_pins: snor-pins {
-+		mux {
-+			function = "flash";
-+			groups = "spi_nor";
-+		};
-+	};
-+
-+	uart0_pins: uart0 {
-+		mux {
-+			function = "uart";
-+			groups = "uart0_0_tx_rx" ;
-+		};
-+	};
-+
-+	watchdog_pins: watchdog-default {
-+		mux {
-+			function = "watchdog";
-+			groups = "watchdog";
-+		};
-+	};
-+};
-+
-+&snor {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&snor_pins>;
-+	status = "okay";
-+
-+	spi-flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-tx-bus-width = <1>;
-+		spi-rx-bus-width = <4>;
-+		u-boot,dm-pre-reloc;
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&watchdog_pins>;
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&eth_pins>;
-+
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "sgmii";
-+	phy-handle = <&gphy>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+
-+	mdio-bus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		gphy: ethernet-phy@0 {
-+			/* RealTek RTL8211FS */
-+			compatible = "ethernet-phy-ieee802.3-c22";
-+			reg = <0x0>;
-+		};
-+	};
-+};
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -1423,6 +1423,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
+@@ -1423,6 +1423,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
  	mt7623a-unielec-u7623-02-emmc.dtb \
  	mt7622-bananapi-bpi-r64.dtb \
  	mt7622-linksys-e8450-ubi.dtb \
 +	mt7622-ubnt-unifi-6-lr.dtb \
-+	mt7622-ubnt-unifi-6-lr-v3.dtb \
  	mt7623n-bananapi-bpi-r2.dtb \
  	mt7629-rfb.dtb \
  	mt7981-rfb.dtb \
@@ -903,112 +407,6 @@
 +_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first
 +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/ubnt_unifi-6-lr-v2_env
-@@ -0,0 +1,50 @@
-+ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x48000000
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_nor ; fi
-+bootdelay=0
-+bootfile=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v2-ubootmod-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v2-ubootmod-preloader.bin
-+bootfile_fip=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v2-ubootmod-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v2-ubootmod-squashfs-sysupgrade.itb
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from flash.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from flash.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to flash.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to flash.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to flash.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to flash.=run boot_tftp_write_preloader ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=run nor_read_production && bootm $loadaddr
-+boot_recovery=run nor_read_recovery ; bootm $loadaddr
-+boot_serial_write_fip=loadx $loadaddr 115200 && run boot_write_fip
-+boot_serial_write_preloader=loadx $loadaddr 115200 && run boot_write_preloader
-+boot_tftp_forever=while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run nor_write_production ; if env exists noboot ; then else bootm $loadaddr ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run nor_write_recovery ; if env exists noboot ; then else bootm $loadaddr ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run boot_write_fip
-+boot_tftp_write_preloader=tftpboot $loadaddr $bootfile_bl2 && run boot_write_preloader
-+boot_nor=run boot_production ; run boot_recovery
-+boot_write_fip=mtd erase nor0 0x20000 0x80000 && mtd write nor0 $loadaddr 0x20000 0x80000
-+boot_write_preloader=mtd erase nor0 0x0 0x20000 && mtd write nor0 $loadaddr 0x0 0x20000
-+reset_factory=mtd erase nor0 0xc0000 0x10000 && reset
-+nor_read_production=mtd read nor0 $loadaddr 0x1000000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x1000000 $image_size
-+nor_read_recovery=mtd read nor0 $loadaddr 0x120000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x120000 $image_size
-+nor_pad_size=imsz $loadaddr image_size ; setexpr image_eb 0x$image_size / 0x1000 ; setexpr tmp1 0x$image_size % 0x1000 ; test 0x$tmp1 -gt 0 && setexpr image_eb 0x$image_eb + 1 ; setexpr image_eb 0x$image_eb * 0x1000
-+nor_write_production=run nor_pad_size ; test 0x$image_eb -le 0x3000000 && mtd erase nor0 0x1000000 0x$image_eb && mtd write nor0 $loadaddr 0x1000000 $filesize
-+nor_write_recovery=run nor_pad_size ; test 0x$image_eb -le 0xee0000 && mtd erase nor0 0x120000 0x$image_eb && mtd write nor0 $loadaddr 0x120000 $filesize
-+_init_env=setenv _init_env ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"--- /dev/null
---- /dev/null
-+++ b/ubnt_unifi-6-lr-v3_env
-@@ -0,0 +1,50 @@
-+ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x48000000
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_nor ; fi
-+bootdelay=0
-+bootfile=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v3-ubootmod-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v3-ubootmod-preloader.bin
-+bootfile_fip=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v3-ubootmod-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-v3-ubootmod-squashfs-sysupgrade.itb
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from flash.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from flash.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to flash.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to flash.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to flash.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to flash.=run boot_tftp_write_preloader ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=run nor_read_production && bootm $loadaddr
-+boot_recovery=run nor_read_recovery ; bootm $loadaddr
-+boot_serial_write_fip=loadx $loadaddr 115200 && run boot_write_fip
-+boot_serial_write_preloader=loadx $loadaddr 115200 && run boot_write_preloader
-+boot_tftp_forever=while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run nor_write_production ; if env exists noboot ; then else bootm $loadaddr ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run nor_write_recovery ; if env exists noboot ; then else bootm $loadaddr ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run boot_write_fip
-+boot_tftp_write_preloader=tftpboot $loadaddr $bootfile_bl2 && run boot_write_preloader
-+boot_nor=run boot_production ; run boot_recovery
-+boot_write_fip=mtd erase nor0 0x20000 0x80000 && mtd write nor0 $loadaddr 0x20000 0x80000
-+boot_write_preloader=mtd erase nor0 0x0 0x20000 && mtd write nor0 $loadaddr 0x0 0x20000
-+reset_factory=mtd erase nor0 0xc0000 0x10000 && reset
-+nor_read_production=mtd read nor0 $loadaddr 0x1000000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x1000000 $image_size
-+nor_read_recovery=mtd read nor0 $loadaddr 0x120000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x120000 $image_size
-+nor_pad_size=imsz $loadaddr image_size ; setexpr image_eb 0x$image_size / 0x1000 ; setexpr tmp1 0x$image_size % 0x1000 ; test 0x$tmp1 -gt 0 && setexpr image_eb 0x$image_eb + 1 ; setexpr image_eb 0x$image_eb * 0x1000
-+nor_write_production=run nor_pad_size ; test 0x$image_eb -le 0x3000000 && mtd erase nor0 0x1000000 0x$image_eb && mtd write nor0 $loadaddr 0x1000000 $filesize
-+nor_write_recovery=run nor_pad_size ; test 0x$image_eb -le 0xee0000 && mtd erase nor0 0x120000 0x$image_eb && mtd write nor0 $loadaddr 0x120000 $filesize
-+_init_env=setenv _init_env ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
 --- a/common/board_r.c
 +++ b/common/board_r.c
 @@ -66,6 +66,7 @@
diff --git a/lede/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch b/lede/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch
deleted file mode 100644
index b9b241a51d..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch
+++ /dev/null
@@ -1,314 +0,0 @@
---- /dev/null
-+++ b/configs/mt7621_zbtlink_zbt-wg3526-16m_defconfig
-@@ -0,0 +1,138 @@
-+CONFIG_MIPS=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_SYS_MALLOC_LEN=0x100000
-+CONFIG_SPL_LIBCOMMON_SUPPORT=y
-+CONFIG_SPL_LIBGENERIC_SUPPORT=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_ENV_SIZE=0x1000
-+CONFIG_ENV_IS_IN_MTD=y
-+CONFIG_ENV_MTD_NAME="nor0"
-+CONFIG_ENV_SIZE_REDUND=0x10000
-+CONFIG_ENV_SIZE=0x10000
-+CONFIG_ENV_OFFSET=0x30000
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_RESET_BUTTON_SETTLE_DELAY=400
-+CONFIG_BOOTP_SEND_HOSTNAME=y
-+# CONFIG_BOOTSTD is not set
-+CONFIG_DEFAULT_ENV_FILE="zbtlink_zbt-wg3526-16m_env"
-+CONFIG_DEFAULT_DEVICE_TREE="zbtlink,zbt-wg3526"
-+CONFIG_SPL_BSS_MAX_SIZE=0x80000
-+CONFIG_SPL_BSS_START_ADDR=0x80140000
-+CONFIG_SPL_SERIAL=y
-+CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
-+CONFIG_SPL=y
-+CONFIG_DEBUG_UART_BASE=0xbe000c00
-+CONFIG_DEBUG_UART_CLOCK=50000000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_SYS_LOAD_ADDR=0x83000000
-+CONFIG_SYS_MIPS_TIMER_FREQ=440000000
-+CONFIG_ARCH_MTMIPS=y
-+CONFIG_SOC_MT7621=y
-+# CONFIG_MIPS_CACHE_SETUP is not set
-+# CONFIG_MIPS_CACHE_DISABLE is not set
-+CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y
-+CONFIG_MIPS_BOOT_FDT=y
-+CONFIG_DEBUG_UART=y
-+CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+# CONFIG_FIT_ENABLE_SHA256_SUPPORT is not set
-+CONFIG_HUSH_PARSER=y
-+CONFIG_LOGLEVEL=6
-+# CONFIG_LOG is not set
-+# CONFIG_SYS_LONGHELP is not set
-+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
-+CONFIG_SYS_CONSOLE_INFO_QUIET=y
-+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-+CONFIG_SPL_NOR_SUPPORT=y
-+CONFIG_TPL=y
-+# CONFIG_TPL_FRAMEWORK is not set
-+CONFIG_LEGACY_IMAGE_FORMAT=y
-+# CONFIG_BOOTM_NETBSD is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+# CONFIG_EFI is not set
-+# CONFIG_EFI_LOADER is not set
-+CONFIG_CMD_BOOTMENU=y
-+# CONFIG_CMD_BOOTEFI is not set
-+# CONFIG_CMD_BOOTD is not set
-+# CONFIG_CMD_BOOTP is not set
-+CONFIG_CMD_BOOTM=y
-+# CONFIG_CMD_BOOTDEV is not set
-+# CONFIG_CMD_BOOTFLOW is not set
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_ECHO=y
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_BOOTEFI_BOOTMGR is not set
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_MTDPART=y
-+# CONFIG_CMD_PCI is not set
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_TFTPBOOT=y
-+# CONFIG_CMD_UNLZ4 is not set
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_DOS_PARTITION=y
-+# CONFIG_SPL_DOS_PARTITION is not set
-+# CONFIG_ISO_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SPL_EFI_PARTITION is not set
-+CONFIG_PARTITION_TYPE_GUID=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+# CONFIG_NET_RANDOM_ETHADDR is not set
-+# CONFIG_I2C is not set
-+# CONFIG_INPUT is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_QUIRKS is not set
-+# CONFIG_MMC_HW_PARTITIONING is not set
-+CONFIG_MMC_MTK=y
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_SF_DEFAULT_SPEED=20000000
-+# CONFIG_SPI_FLASH_BAR is not set
-+# CONFIG_SPI_FLASH_EON is not set
-+# CONFIG_SPI_FLASH_GIGADEVICE is not set
-+# CONFIG_SPI_FLASH_ISSI is not set
-+# CONFIG_SPI_FLASH_MACRONIX is not set
-+# CONFIG_SPI_FLASH_SPANSION is not set
-+# CONFIG_SPI_FLASH_STMICRO is not set
-+CONFIG_SPI_FLASH_WINBOND=y
-+# CONFIG_SPI_FLASH_XMC is not set
-+# CONFIG_SPI_FLASH_XTX is not set
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_DEBUG_UART_SHIFT=2
-+CONFIG_SPI=y
-+CONFIG_MT7621_SPI=y
-+CONFIG_SYSRESET=y
-+CONFIG_SYSRESET_RESETCTL=y
-+# CONFIG_SYS_XTRACE is not set
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_WDT=y
-+CONFIG_WDT_MT7621=y
-+# CONFIG_BINMAN_FDT is not set
-+CONFIG_LZMA=y
-+CONFIG_SPL_LZMA=y
-+# CONFIG_GZIP is not set
---- /dev/null
-+++ b/zbtlink_zbt-wg3526-16m_env
-@@ -0,0 +1,36 @@
-+ethaddr_factory=mtd read factory $loadaddr 0x0 0x10000 ; setexpr macoffs $loadaddr + 0xe000 ; env readmem -b ethaddr $macoffs 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x83000000
-+bootcmd=run boot_nor
-+bootdelay=0
-+bootfile=openwrt-ramips-mt7621-zbtlink_zbt-wg3526-16m-initramfs-kernel.bin
-+bootfile_uboot=u-boot-mt7621.bin
-+bootfile_upg=openwrt-ramips-mt7621-zbtlink_zbt-wg3526-16m-squashfs-sysupgrade.bin
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot system from flash.=run boot_nor ; run bootmenu_confirm_return
-+bootmenu_3=Load system via TFTP then write to flash.=run boot_tftp_sysupgrade ; run bootmenu_confirm_return
-+bootmenu_4=Load U-Boot via TFTP then write to flash.=run boot_tftp_write_uboot ; run bootmenu_confirm_return
-+bootmenu_5=Reset all settings to factory defaults.=run reset_factory ; reset
-+bootmenu_6=Reboot.=reset
-+boot_first=if button reset ; then run boot_tftp ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_tftp_forever
-+boot_nor=bootm 0x1fc50000
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
-+boot_tftp_forever=while true ; do run boot_tftp ; sleep 1 ; done
-+boot_tftp_sysupgrade=tftpboot $loadaddr $bootfile_upg && iminfo $loadaddr && run nor_write_production
-+boot_tftp_write_uboot=tftpboot $loadaddr $bootfile_uboot && run nor_write_uboot
-+reset_factory=mtd erase u-boot-env 0x0 0x10000 && reset
-+nor_pad_size=setexpr image_eb $filesize / 0x1000 ; setexpr tmp1 image_size % 0x1000 ; test 0x$tmp1 -gt 0 && setexpr image_eb $image_eb + 1 ; setexpr image_eb $image_eb * 0x1000
-+nor_write_production=run nor_pad_size ; test 0x$image_eb -le 0xfb0000 && mtd erase firmware 0x0 0x$image_eb && mtd write firmware $loadaddr 0x0 $filesize
-+nor_write_uboot=mtd erase u-boot 0x0 0x30000 && mtd write u-boot $loadaddr 0x0 0x30000
-+_init_env=setenv _init_env ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/arch/mips/dts/zbtlink,zbt-wg3526.dts
-@@ -0,0 +1,131 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (C) 2022 MediaTek Inc. All rights reserved.
-+ *
-+ * Author: Weijie Gao <weijie.gao@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+
-+#include "mt7621.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "zbtlink,zbt-wg3526", "mediatek,mt7621-rfb", "mediatek,mt7621-soc";
-+	model = "Zbtlink WG3526";
-+
-+	aliases {
-+		ethernet0 = &eth;
-+		serial0 = &uart0;
-+		spi0 = &spi;
-+	};
-+
-+	chosen {
-+		stdout-path = &uart0;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_status: status {
-+			label = "green:status";
-+			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&pinctrl {
-+	state_default: pin_state {
-+		gpios {
-+			groups = "i2c", "uart3", "pcie reset";
-+			function = "gpio";
-+		};
-+
-+		wdt {
-+			groups = "wdt";
-+			function = "wdt rst";
-+		};
-+
-+		jtag {
-+			groups = "jtag";
-+			function = "jtag";
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&gpio {
-+	status = "okay";
-+};
-+
-+&spi {
-+	status = "okay";
-+	num-cs = <2>;
-+
-+	spi-flash@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		compatible = "jedec,spi-nor";
-+		spi-max-frequency = <25000000>;
-+		reg = <0>;
-+
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "u-boot";
-+				reg = <0x0 0x30000>;
-+			};
-+
-+			partition@30000 {
-+				label = "u-boot-env";
-+				reg = <0x30000 0x10000>;
-+			};
-+
-+			factory: partition@40000 {
-+				label = "factory";
-+				reg = <0x40000 0x10000>;
-+				read-only;
-+			};
-+
-+			firmware: partition@50000 {
-+				compatible = "denx,uimage";
-+				label = "firmware";
-+				reg = <0x50000 0xfb0000>;
-+			};
-+		};
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+};
-+
-+&mmc {
-+	cap-sd-highspeed;
-+
-+	status = "okay";
-+};
-+
-+&ssusb {
-+	status = "okay";
-+};
-+
-+&u3phy {
-+	status = "okay";
-+};
diff --git a/lede/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch b/lede/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch
deleted file mode 100644
index 2304fcd5ce..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch
+++ /dev/null
@@ -1,433 +0,0 @@
---- /dev/null
-+++ b/configs/mt7986_netcore_n60_defconfig
-@@ -0,0 +1,182 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-netcore-n60"
-+CONFIG_DEFAULT_ENV_FILE="netcore_n60_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-netcore-n60.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7986a-netcore-n60.dts
-@@ -0,0 +1,185 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2021 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7986.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Netcore N60";
-+	compatible = "mediatek,mt7986", "mediatek,mt7986-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		factory {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_red {
-+			label = "red:status";
-+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		status_green {
-+			label = "green:status";
-+			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_2";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <1>;
-+	sample_sel = <0>;
-+
-+	spi_nand@1 {
-+		compatible = "spi-nand";
-+		reg = <1>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "orig-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@160000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7280000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/netcore_n60_env
-@@ -0,0 +1,57 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-netcore_n60-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-netcore_n60-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-netcore_n60-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-netcore_n60-squashfs-sysupgrade.itb
-+bootled_pwr=green:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+ethaddr_factory=mtd read factory 0x40080000 0x1fe000 0x1000 && env readmem -b ethaddr 0x40080f20 0x6 ; setenv ethaddr_factory
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch b/lede/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch
deleted file mode 100644
index 365f280947..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch
+++ /dev/null
@@ -1,934 +0,0 @@
---- /dev/null
-+++ b/configs/mt7986_tplink_tl-xdr4288_defconfig
-@@ -0,0 +1,182 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xdr608x"
-+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr4288_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-tplink-tl-xdr608x.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/configs/mt7986_tplink_tl-xdr6086_defconfig
-@@ -0,0 +1,182 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xdr608x"
-+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr6086_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-tplink-tl-xdr608x.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/configs/mt7986_tplink_tl-xdr6088_defconfig
-@@ -0,0 +1,182 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xdr608x"
-+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr6088_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-tplink-tl-xdr608x.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7986a-tplink-tl-xdr608x.dts
-@@ -0,0 +1,196 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2021 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7986.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "TP-Link TL-XDR608x";
-+	compatible = "mediatek,mt7986", "mediatek,mt7986-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		factory {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		turbo {
-+			label = "turbo";
-+			linux,code = <BTN_1>;
-+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_red {
-+			label = "red:status";
-+			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		status_green {
-+			label = "green:status";
-+			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		turbo {
-+			label = "green:turbo";
-+			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_2";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <1>;
-+	sample_sel = <0>;
-+
-+	spi_nand@1 {
-+		compatible = "spi-nand";
-+		reg = <1>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x80000>;
-+			};
-+
-+			partition@100000 {
-+				label = "config";
-+				reg = <0x100000 0x60000>;
-+			};
-+
-+			partition@160000 {
-+				label = "factory";
-+				reg = <0x160000 0x60000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7800000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/tplink_tl-xdr4288_env
-@@ -0,0 +1,57 @@
-+ethaddr_factory=mtd read config 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008001c 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-tplink_tl-xdr4288-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-tplink_tl-xdr4288-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-tplink_tl-xdr4288-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-tplink_tl-xdr4288-squashfs-sysupgrade.itb
-+bootled_pwr=green:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/tplink_tl-xdr6086_env
-@@ -0,0 +1,57 @@
-+ethaddr_factory=mtd read config 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008001c 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-tplink_tl-xdr6086-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-tplink_tl-xdr6086-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-tplink_tl-xdr6086-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-tplink_tl-xdr6086-squashfs-sysupgrade.itb
-+bootled_pwr=green:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/tplink_tl-xdr6088_env
-@@ -0,0 +1,57 @@
-+ethaddr_factory=mtd read config 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008001c 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-tplink_tl-xdr6088-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-tplink_tl-xdr6088-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-tplink_tl-xdr6088-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-tplink_tl-xdr6088-squashfs-sysupgrade.itb
-+bootled_pwr=green:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch b/lede/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch
deleted file mode 100644
index 4f98c95893..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch
+++ /dev/null
@@ -1,425 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_qihoo-360t7_defconfig
-@@ -0,0 +1,175 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981_qihoo-360t7"
-+CONFIG_DEFAULT_ENV_FILE="qihoo-360t7_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981_qihoo-360t7.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981_qihoo-360t7.dts
-@@ -0,0 +1,185 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2022 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Qihoo 360T7";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		factory {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_red {
-+			label = "red:status";
-+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		status_green {
-+			label = "green:status";
-+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_1";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0_1", "pwm1_0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "orig-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@160000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x6c00000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/qihoo-360t7_env
-@@ -0,0 +1,56 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-qihoo_360t7-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-qihoo_360t7-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-qihoo_360t7-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-qihoo_360t7-squashfs-sysupgrade.itb
-+bootled_pwr=green:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch b/lede/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch
deleted file mode 100644
index 2bd1afe7a8..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch
+++ /dev/null
@@ -1,461 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_xiaomi_mi-router-wr30u_defconfig
-@@ -0,0 +1,175 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981_xiaomi_mi-router-wr30u"
-+CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-wr30u_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981_xiaomi_mi-router-wr30u.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981_xiaomi_mi-router-wr30u.dts
-@@ -0,0 +1,221 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2022 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Xiaomi Router WR30U";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	config {
-+		blink_led = "yellow:network";
-+		system_led = "yellow:system";
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+
-+		mesh {
-+			label = "mesh";
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+			linux,code = <BTN_9>;
-+			linux,input-type = <EV_SW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_system_blue {
-+			label = "blue:system";
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_system_yellow {
-+			label = "yellow:system";
-+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_network_blue {
-+			label = "blue:network";
-+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_network_yellow {
-+			label = "yellow:network";
-+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "sgmii";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <1000>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_1";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0_1", "pwm1_0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x00 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "Nvram";
-+				reg = <0x100000 0x40000>;
-+			};
-+
-+			partition@140000 {
-+				label = "Bdata";
-+				reg = <0x140000 0x40000>;
-+			};
-+
-+			partition@180000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "crash";
-+				reg = <0x580000 0x40000>;
-+			};
-+
-+			partition@5c0000 {
-+				label = "crash_log";
-+				reg = <0x5c0000 0x40000>;
-+			};
-+
-+			partition@600000 {
-+				label = "ubi";
-+				reg = <0x600000 0x7000000>;
-+			};
-+
-+			partition@7600000 {
-+				label = "KF";
-+				reg = <0x7600000 0x40000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/xiaomi_mi-router-wr30u_env
-@@ -0,0 +1,56 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-xiaomi_mi-router-wr30u-ubootmod-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-xiaomi_mi-router-wr30u-ubootmod-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-xiaomi_mi-router-wr30u-ubootmod-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-xiaomi_mi-router-wr30u-ubootmod-squashfs-sysupgrade.itb
-+bootled_pwr=yellow:system
-+bootled_rec=yellow:network
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch b/lede/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch
deleted file mode 100644
index d5a149b903..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch
+++ /dev/null
@@ -1,445 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_h3c_magic-nx30-pro_defconfig
-@@ -0,0 +1,175 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981_h3c_magic-nx30-pro"
-+CONFIG_DEFAULT_ENV_FILE="h3c_magic-nx30-pro_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981_h3c_magic-nx30-pro.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981_h3c_magic-nx30-pro.dts
-@@ -0,0 +1,205 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2022 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "H3C Magic NX30 Pro";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		factory {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_red {
-+			label = "red:status";
-+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		status_green {
-+			label = "green:status";
-+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_1";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0_1", "pwm1_0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0000000 0x0100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "orig-env";
-+				reg = <0x0100000 0x0080000>;
-+			};
-+
-+			partition@180000 {
-+				label = "factory";
-+				reg = <0x0180000 0x0200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x0380000 0x0200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x0580000 0x4000000>;
-+			};
-+
-+			partition@4580000 {
-+				label = "pdt_data";
-+				reg = <0x4580000 0x0600000>;
-+			};
-+
-+			partition@4b80000 {
-+				label = "pdt_data_1";
-+				reg = <0x4b80000 0x0600000>;
-+			};
-+
-+			partition@5180000 {
-+				label = "exp";
-+				reg = <0x5180000 0x0100000>;
-+			};
-+
-+			partition@5280000 {
-+				label = "plugin";
-+				reg = <0x5280000 0x2580000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/h3c_magic-nx30-pro_env
-@@ -0,0 +1,56 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-h3c_magic-nx30-pro-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-h3c_magic-nx30-pro-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-h3c_magic-nx30-pro-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-h3c_magic-nx30-pro-squashfs-sysupgrade.itb
-+bootled_pwr=green:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/lede/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
deleted file mode 100644
index 26e0e30a99..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
+++ /dev/null
@@ -1,697 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_cmcc_rax3000m-emmc_defconfig
-@@ -0,0 +1,175 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000m-emmc"
-+CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-emmc_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-cmcc-rax3000m-emmc.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MMC=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_MMC=y
-+CONFIG_MMC_DEFAULT_DEV=1
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_MMC_MTK=y
-+CONFIG_MMC_SUPPORTS_TUNING=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_SPI=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_MMC=y
-+CONFIG_ENV_OFFSET=0x400000
-+CONFIG_ENV_OFFSET_REDUND=0x440000
-+CONFIG_ENV_SIZE=0x40000
-+CONFIG_ENV_SIZE_REDUND=0x40000
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_CMD_SF=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/configs/mt7981_cmcc_rax3000m-nand_defconfig
-@@ -0,0 +1,175 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000m-nand"
-+CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-nand_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-cmcc-rax3000m-nand.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981-cmcc-rax3000m.dtsi
-@@ -0,0 +1,85 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (c) 2022 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "CMCC RAX3000M";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		button-mesh {
-+			label = "mesh";
-+			linux,code = <BTN_9>;
-+			linux,input-type = <EV_SW>;
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led-0 {
-+			label = "green:status";
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-1 {
-+			label = "blue:status";
-+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-2 {
-+			label = "red:status";
-+			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/arch/arm/dts/mt7981-cmcc-rax3000m-emmc.dts
-@@ -0,0 +1,53 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+
-+/dts-v1/;
-+#include "mt7981-cmcc-rax3000m.dtsi"
-+
-+/ {
-+	reg_3p3v: regulator-3p3v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-3.3V";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+};
-+
-+&mmc0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_default>;
-+	max-frequency = <26000000>;
-+	bus-width = <8>;
-+	cap-mmc-hw-reset;
-+	vmmc-supply = <&reg_3p3v>;
-+	non-removable;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	mmc0_pins_default: mmc0default {
-+		mux {
-+			function = "flash";
-+			groups =  "emmc_45";
-+		};
-+		conf-cmd-dat {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO",
-+				"SPI0_CS",  "SPI0_HOLD", "SPI0_WP",
-+				"SPI1_CLK", "SPI1_MOSI", "SPI1_MISO";
-+			input-enable;
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
-+		};
-+		conf-clk {
-+			pins = "SPI1_CS";
-+			drive-strength = <MTK_DRIVE_6mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
-+		};
-+		conf-rst {
-+			pins = "PWM0";
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
-+		};
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/dts/mt7981-cmcc-rax3000m-nand.dts
-@@ -0,0 +1,77 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+
-+/dts-v1/;
-+#include "mt7981-cmcc-rax3000m.dtsi"
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "orig-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@160000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7200000>;
-+			};
-+		};
-+	};
-+};
---- /dev/null
-+++ b/cmcc_rax3000m-emmc_env
-@@ -0,0 +1,55 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=root=/dev/mmcblk0p65
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
-+bootconf=config-1#mt7981b-cmcc-rax3000m-emmc
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
-+bootled_pwr=red:status
-+bootled_rec=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )  [eMMC]
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from eMMC.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from eMMC.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to eMMC.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to eMMC.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_emmc=run boot_production ; run boot_recovery
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run emmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run emmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run emmc_write_fip
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
-+mmc_read_vol=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
-+part_default=production
-+part_recovery=recovery
-+reset_factory=eraseenv && reset
-+emmc_read_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
-+emmc_read_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
-+emmc_write_bl2=mmc partconf 0 1 1 1 && mmc erase 0x0 0x400 && mmc write $fileaddr 0x0 0x400 ; mmc partconf 0 1 1 0
-+emmc_write_fip=mmc erase 0x3400 0x2000 && mmc write $fileaddr 0x3400 0x2000 && mmc erase 0x2000 0x800
-+emmc_write_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
-+emmc_write_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
-+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/cmcc_rax3000m-nand_env
-@@ -0,0 +1,56 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootconf=config-1#mt7981b-cmcc-rax3000m-nand
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-nand-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-nand-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
-+bootled_pwr=red:status
-+bootled_rec=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )  [SPI-NAND]
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch b/lede/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch
deleted file mode 100644
index 639cae174e..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch
+++ /dev/null
@@ -1,420 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_jcg_q30-pro_defconfig
-@@ -0,0 +1,175 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981_jcg_q30-pro"
-+CONFIG_DEFAULT_ENV_FILE="jcg_q30-pro_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981_jcg_q30-pro.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981_jcg_q30-pro.dts
-@@ -0,0 +1,179 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2022 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "JCG Q30 PRO";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		factory {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_red {
-+			label = "red:status";
-+			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		status_blue {
-+			label = "blue:status";
-+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_1";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0_1", "pwm1_0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "orig-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@160000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7000000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/jcg_q30-pro_env
-@@ -0,0 +1,57 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-jcg_q30-pro-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-jcg_q30-pro-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-jcg_q30-pro-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-jcg_q30-pro-squashfs-sysupgrade.itb
-+bootled_pwr=blue:status
-+bootled_rec=red:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+ethaddr_factory=mtd read factory 0x40080000 0xa0000 0x800 && env readmem -b ethaddr 0x4008002a 0x6 ; setenv ethaddr_factory
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch b/lede/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch
deleted file mode 100644
index 7f0564fd49..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch
+++ /dev/null
@@ -1,431 +0,0 @@
---- /dev/null
-+++ b/configs/mt7986_zyxel_ex5601-t0_defconfig
-@@ -0,0 +1,186 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-zyxel_ex5601-t0"
-+CONFIG_DEFAULT_ENV_FILE="zyxel_ex5601-t0_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-zyxel_ex5601-t0.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="EX5601> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+# CONFIG_CMD_FLASH is not set
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+# CONFIG_DM_PCI is not set
-+# CONFIG_PCIE_MEDIATEK is not set
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+# CONFIG_I2C is not set
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7986a-zyxel_ex5601-t0.dts
-@@ -0,0 +1,181 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Author: Valerio 'ftp21' Mancini <ftp21@ftp21.eu>
-+ * Author: Nicolò Veronese <nicveronese@gmail.com>
-+ */
-+
-+/dts-v1/;
-+#include <dt-bindings/input/linux-event-codes.h>
-+#include "mt7986.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Zyxel EX5601-T0 ubootmod";
-+	compatible = "mediatek,mt7986", "mediatek,mt7986-sd-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+		factory {
-+			label = "reset";
-+			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			gpios = <&gpio 56 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_WPS_BUTTON>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_status_green: pwr {
-+			label = "green:status";
-+			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
-+			default-state = "off";
-+		};
-+
-+		led_sfp_green: sfp {
-+			label = "green:sfp";
-+			gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-+			default-state = "off";
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "disabled";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_2";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <1>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <20000000>;
-+		spi-tx-buswidth = <4>;
-+		spi-rx-buswidth = <4>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x0100000 0x0080000>;
-+			};
-+
-+			partition@180000 {
-+				label = "Factory";
-+				reg = <0x180000 0x0200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x0200000>;
-+			};
-+
-+			partition@540000 {
-+				label = "zloader";
-+				reg = <0x540000 0x0040000>;
-+				read-only;
-+			};
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x1da80000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
-+
---- /dev/null
-+++ b/zyxel_ex5601-t0_env
-@@ -0,0 +1,55 @@
-+ethaddr_factory=mtd read Factory 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008002A 0x6 ; setenv ethaddr_factory
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=console=ttyS0,115200n8 console_msg_format=syslog
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-zyxel_ex5601-t0-ubootmod-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-zyxel_ex5601-t0-ubootmod-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-zyxel_ex5601-t0-ubootmod-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-zyxel_ex5601-t0-ubootmod-squashfs-sysupgrade.itb
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=run ubi_read_production && bootm $loadaddr#$bootconf
-+boot_recovery=run ubi_read_recovery && bootm $loadaddr#$bootconf
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+part_fit=fit
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr $part_fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch b/lede/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch
deleted file mode 100644
index 9b50166a94..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch
+++ /dev/null
@@ -1,414 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_xiaomi_mi-router-ax3000t_defconfig
-@@ -0,0 +1,163 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981_xiaomi_mi-router-ax3000t"
-+CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-ax3000t_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981_xiaomi_mi-router-ax3000t.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+# CONFIG_CMD_EXT4 is not set
-+# CONFIG_CMD_FAT is not set
-+CONFIG_CMD_FDT=y
-+# CONFIG_CMD_FS_GENERIC is not set
-+# CONFIG_CMD_FS_UUID is not set
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MTD=y
-+# CONFIG_CMD_PCI is not set
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+# CONFIG_CMD_PWM is not set
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+# CONFIG_CMD_USB is not set
-+# CONFIG_CMD_FLASH is not set
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+# CONFIG_DM_USB is not set
-+# CONFIG_DM_PWM is not set
-+# CONFIG_PWM_MTK is not set
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+# CONFIG_DM_SCSI is not set
-+# CONFIG_AHCI is not set
-+CONFIG_PHY=y
-+# CONFIG_PHY_MTK_TPHY is not set
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+# CONFIG_PCI is not set
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+# CONFIG_DM_PCI is not set
-+# CONFIG_PCIE_MEDIATEK is not set
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+# CONFIG_USB is not set
-+# CONFIG_USB_HOST is not set
-+# CONFIG_USB_XHCI_HCD is not set
-+# CONFIG_USB_XHCI_MTK is not set
-+# CONFIG_USB_STORAGE is not set
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981_xiaomi_mi-router-ax3000t.dts
-@@ -0,0 +1,187 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2022 MediaTek Inc.
-+ * Author: Sam Shih <sam.shih@mediatek.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Xiaomi Router AX3000T";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+
-+		mesh {
-+			label = "mesh";
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+			linux,code = <BTN_9>;
-+			linux,input-type = <EV_SW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_status_blue {
-+			label = "blue:status";
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_status_yellow {
-+			label = "yellow:status";
-+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spic_pins: spi1-pins-func-1 {
-+		mux {
-+			function = "spi";
-+			groups = "spi1_1";
-+		};
-+	};
-+
-+	uart1_pins: spi1-pins-func-3 {
-+		mux {
-+			function = "uart";
-+			groups = "uart1_2";
-+		};
-+	};
-+
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x00 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "Nvram";
-+				reg = <0x100000 0x40000>;
-+			};
-+
-+			partition@140000 {
-+				label = "Bdata";
-+				reg = <0x140000 0x40000>;
-+			};
-+
-+			partition@180000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "crash";
-+				reg = <0x580000 0x40000>;
-+			};
-+
-+			partition@5c0000 {
-+				label = "crash_log";
-+				reg = <0x5c0000 0x40000>;
-+			};
-+
-+			partition@600000 {
-+				label = "ubi";
-+				reg = <0x600000 0x7000000>;
-+			};
-+
-+			partition@7600000 {
-+				label = "KF";
-+				reg = <0x7600000 0x40000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/xiaomi_mi-router-ax3000t_env
-@@ -0,0 +1,55 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=console=ttyS0,115200n8 console_msg_format=syslog
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-xiaomi_mi-router-ax3000t-ubootmod-squashfs-sysupgrade.itb
-+bootled_pwr=yellow:status
-+bootled_rec=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch b/lede/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch
deleted file mode 100644
index dc8dfe0140..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch
+++ /dev/null
@@ -1,324 +0,0 @@
---- /dev/null
-+++ b/configs/mt7986a_jdcloud_re-cp-03_defconfig
-@@ -0,0 +1,112 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_ENV_SIZE=0x40000
-+CONFIG_ENV_OFFSET=0x400000
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-jdcloud_re-cp-03"
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_ENV_OFFSET_REDUND=0x440000
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-jdcloud_re-cp-03.dtb"
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_UUID=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_MMC=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_DEFAULT_ENV_FILE="jdcloud_re-cp-03_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_MMC_MTK=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_DM_MDIO=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_RAM=y
-+CONFIG_SCSI=y
-+CONFIG_DM_SCSI=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_LMB_MAX_REGIONS=64
---- /dev/null
-+++ b/arch/arm/dts/mt7986a-jdcloud_re-cp-03.dts
-@@ -0,0 +1,148 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+/dts-v1/;
-+#include <dt-bindings/input/linux-event-codes.h>
-+#include "mt7986.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "JDCloud RE-CP-03";
-+	compatible = "mediatek,mt7986", "mediatek,mt7986-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x40000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		button-joylink {
-+			label = "joylink";
-+			linux,code = <BTN_0>;
-+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		led-0 {
-+			label = "blue:status";
-+			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-+			default-state = "off";
-+		};
-+
-+		led-1 {
-+			label = "red:status";
-+			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-+			default-state = "on";
-+		};
-+
-+		led-2 {
-+			label = "green:status";
-+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+	};
-+
-+	reg_1p8v: regulator-1p8v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-1.8V";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	reg_3p3v: regulator-3p3v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-3.3V";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&mmc0 {
-+	bus-width = <8>;
-+	cap-mmc-highspeed;
-+	cap-mmc-hw-reset;
-+	max-frequency = <200000000>;
-+	non-removable;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_default>;
-+	vmmc-supply = <&reg_3p3v>;
-+	vqmmc-supply = <&reg_1p8v>;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	mmc0_pins_default: mmc0default {
-+		mux {
-+			function = "flash";
-+			groups =  "emmc_51";
-+		};
-+
-+		conf-cmd-dat {
-+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
-+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
-+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
-+			input-enable;
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
-+		};
-+
-+		conf-clk {
-+			pins = "EMMC_CK";
-+			drive-strength = <MTK_DRIVE_6mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
-+		};
-+
-+		conf-dsl {
-+			pins = "EMMC_DSL";
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
-+		};
-+
-+		conf-rst {
-+			pins = "EMMC_RSTB";
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/jdcloud_re-cp-03_env
-@@ -0,0 +1,55 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=root=/dev/fit0 rootwait
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-jdcloud_re-cp-03-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-jdcloud_re-cp-03-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-jdcloud_re-cp-03-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-jdcloud_re-cp-03-squashfs-sysupgrade.itb
-+bootled_pwr=red:status
-+bootled_rec=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from eMMC.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from eMMC.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to eMMC.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to eMMC.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_emmc=run boot_production ; run boot_recovery
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run emmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run emmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run emmc_write_fip
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
-+mmc_read_vol=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
-+part_default=production
-+part_recovery=recovery
-+reset_factory=eraseenv && reset
-+emmc_read_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
-+emmc_read_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
-+emmc_write_bl2=mmc partconf 0 1 1 1 && mmc erase 0x0 0x400 && mmc write $fileaddr 0x0 0x400 ; mmc partconf 0 1 1 0
-+emmc_write_fip=mmc erase 0x3400 0x2000 && mmc write $fileaddr 0x3400 0x2000 && mmc erase 0x2000 0x800
-+emmc_write_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
-+emmc_write_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
-+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch b/lede/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch
deleted file mode 100644
index 5409f7fa0d..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch
+++ /dev/null
@@ -1,779 +0,0 @@
---- /dev/null
-+++ b/configs/mt7986a_bpi-r3-mini-emmc_defconfig
-@@ -0,0 +1,203 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-mini"
-+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3-mini_emmc_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-bpi-r3-mini.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_OF_SYSTEM_SETUP=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MDIO=y
-+CONFIG_CMD_MII=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MDIO=y
-+CONFIG_DM_MMC=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_ETHERNET_ID=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_DM_ETH_PHY=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY_AIROHA=y
-+CONFIG_PHY_AIROHA_EN8811H=y
-+CONFIG_PHY_AIROHA_FW_IN_MMC=y
-+CONFIG_PCI=y
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_MMC=y
-+CONFIG_MMC_DEFAULT_DEV=1
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_MMC_MTK=y
-+CONFIG_MMC_SUPPORTS_TUNING=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_MMC=y
-+CONFIG_ENV_OFFSET=0x400000
-+CONFIG_ENV_OFFSET_REDUND=0x440000
-+CONFIG_ENV_SIZE=0x40000
-+CONFIG_ENV_SIZE_REDUND=0x40000
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_MMC_MTK=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+#CONFIG_MTK_SNOR=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/configs/mt7986a_bpi-r3-mini-snand_defconfig
-@@ -0,0 +1,203 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7986=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-mini"
-+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3-mini_snand_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986a-bpi-r3-mini.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_OF_SYSTEM_SETUP=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7986> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MDIO=y
-+CONFIG_CMD_MII=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MMC=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_USB=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+CONFIG_DM_SCSI=y
-+CONFIG_AHCI=y
-+CONFIG_AHCI_PCI=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_DM_MDIO=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PHY_ETHERNET_ID=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_DM_ETH_PHY=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCI=y
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_DM_PCI=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_MMC=y
-+CONFIG_MMC_DEFAULT_DEV=1
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_MMC_MTK=y
-+CONFIG_MMC_SUPPORTS_TUNING=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+CONFIG_USB=y
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_SUPPORT_EMMC_BOOT=y
-+CONFIG_MMC_HS200_SUPPORT=y
-+CONFIG_MMC_MTK=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY_AIROHA=y
-+CONFIG_PHY_AIROHA_EN8811H=y
-+CONFIG_PHY_AIROHA_FW_IN_UBI=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7986=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_HEXDUMP=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+#CONFIG_MTK_SNOR=y
-+#CONFIG_DM_SPI_FLASH=y
-+#CONFIG_SPI_FLASH_MTD=y
-+#CONFIG_SPI_FLASH_WINBOND=y
-+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-+#CONFIG_CMD_SF=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
---- /dev/null
-+++ b/bananapi_bpi-r3-mini_snand_env
-@@ -0,0 +1,61 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=root=ubi.block=0,fit root=/dev/fit0 rootwait
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-mt7986a-bananapi-bpi-r3-mini
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-snand-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-snand-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-squashfs-sysupgrade.itb
-+bootfile_en8811h_fw=EthMD32.bin
-+bootled_pwr=green:status
-+bootled_rec=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )  [SPI-NAND]
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load Airoha EN8811H firmware via TFTP then write to NAND.=run boot_tftp_write_en8811h_fw ; run bootmenu_confirm_return
-+bootmenu_7=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_8=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_9=Reboot.=reset
-+bootmenu_10=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run ubi_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run snand_write_bl2
-+boot_tftp_write_en8811h_fw=tftpboot $loadaddr $bootfile_en8811h_fw && run ubi_write_en8811h_fw
-+part_default=production
-+part_recovery=recovery
-+reset_factory=mw $loadaddr 0xff 0x1f000 ; ubi write $loadaddr ubootenv 0x1f000 ; ubi write $loadaddr ubootenv2 0x1f000 ; ubi remove rootfs_data
-+snand_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr 0x0 0x40000 && mtd write bl2 $loadaddr 0x40000 0x40000 && mtd write bl2 $loadaddr 0x80000 0x40000 && mtd write bl2 $loadaddr 0xc0000 0x40000
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x1f000 dynamic ; ubi check ubootenv2 || ubi create ubootenv2 0x1f000 dynamic
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_read_emmc_install=ubi check emmc_install && ubi read $loadaddr emmc_install
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_fip=run ubi_remove_rootfs ; ubi check fip && ubi remove fip ; ubi create fip 0x200000 static ; ubi write $loadaddr fip 0x200000
-+ubi_write_en8811h_fw=ubi check en8811h-fw && ubi remove en8811h-fw ; ubi create en8811h-fw 0x24000 static ; ubi write $loadaddr en8811h-fw 0x24000
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/bananapi_bpi-r3-mini_emmc_env
-@@ -0,0 +1,59 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=root=/dev/fit0 rootwait
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
-+bootconf=config-mt7986a-bananapi-bpi-r3-mini
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-emmc-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-emmc-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-bananapi_bpi-r3-mini-squashfs-sysupgrade.itb
-+bootfile_en8811h_fw=EthMD32.bin
-+bootled_pwr=green:status
-+bootled_rec=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )  [eMMC]
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from eMMC.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from eMMC.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load Airoha EN8811H firmware via TFTP then write to eMMC.=run boot_tftp_write_en8811h_fw ; run bootmenu_confirm_return
-+bootmenu_7=Load BL31+U-Boot FIP via TFTP then write to eMMC.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_8=Load BL2 preloader via TFTP then write to eMMC.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_9=Reboot.=reset
-+bootmenu_10=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_emmc=run boot_production ; run boot_recovery
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run emmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run emmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run emmc_write_fip
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
-+boot_tftp_write_en8811h_fw=tftpboot $loadaddr $bootfile_en8811h_fw && run emmc_write_en8811h_fw
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
-+mmc_read_vol=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
-+part_default=production
-+part_recovery=recovery
-+reset_factory=eraseenv && reset
-+emmc_read_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
-+emmc_read_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
-+emmc_write_en8811h_fw=mmc partconf 0 1 2 2 && mmc erase 0x0 0x120 && mmc write $fileaddr 0x0 0x120 ; mmc partconf 0 1 1 0
-+emmc_write_bl2=mmc partconf 0 1 1 1 && mmc erase 0x0 0x400 && mmc write $fileaddr 0x0 0x400 ; mmc partconf 0 1 1 0
-+emmc_write_fip=mmc erase 0x3400 0x2000 && mmc write $fileaddr 0x3400 0x2000 && mmc erase 0x2000 0x800
-+emmc_write_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
-+emmc_write_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
-+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/arch/arm/dts/mt7986a-bpi-r3-mini.dts
-@@ -0,0 +1,238 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+/dts-v1/;
-+#include "mt7986.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Bananapi BPi-R3 Mini";
-+	compatible = "mediatek,mt7986", "mediatek,mt7986-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x80000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_led: led-0 {
-+			label = "green:status";
-+			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		led-1 {
-+			label = "blue:wlan2g";
-+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		led-2 {
-+			label = "blue:wlan5g";
-+			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+		};
-+	};
-+
-+	reg_1p8v: regulator-1p8v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-1.8V";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	reg_3p3v: regulator-3p3v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-3.3V";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mdio_pins>;
-+
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	phy-handle = <&phy14>;
-+
-+	phy14: eth-phy@e {
-+		compatible = "ethernet-phy-id03a2.a411";
-+		reg = <14>;
-+
-+		airoha,rx-pol-reverse;
-+
-+		reset-gpios = <&gpio 49 GPIO_ACTIVE_LOW>;
-+		reset-assert-us = <10000>;
-+		reset-deassert-us = <20000>;
-+	};
-+};
-+
-+&mmc0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_default>;
-+	bus-width = <8>;
-+	max-frequency = <200000000>;
-+	cap-mmc-highspeed;
-+	cap-mmc-hw-reset;
-+	vmmc-supply = <&reg_3p3v>;
-+	vqmmc-supply = <&reg_1p8v>;
-+	non-removable;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	mdio_pins: mdio-pins {
-+		mux {
-+			function = "eth";
-+			groups = "mdc_mdio";
-+		};
-+
-+		conf-en8811-pwr-a {
-+			pins = "GPIO_11";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+			output-low;
-+		};
-+
-+		conf-en8811-pwr-b {
-+			pins = "GPIO_12";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+			output-low;
-+		};
-+	};
-+
-+	mmc0_pins_default: mmc0default {
-+		mux {
-+			function = "flash";
-+			groups =  "emmc_51";
-+		};
-+
-+		conf-cmd-dat {
-+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
-+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
-+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
-+			input-enable;
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
-+		};
-+
-+		conf-clk {
-+			pins = "EMMC_CK";
-+			drive-strength = <MTK_DRIVE_6mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
-+		};
-+
-+		conf-dsl {
-+			pins = "EMMC_DSL";
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
-+		};
-+
-+		conf-rst {
-+			pins = "EMMC_RSTB";
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
-+		};
-+	};
-+
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+
-+	pwm_pins: pwm0-pins-func-1 {
-+		mux {
-+			function = "pwm";
-+			groups = "pwm0";
-+		};
-+	};
-+};
-+
-+&pwm {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <1>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <20000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x200000>;
-+			};
-+
-+			partition@200000 {
-+				label = "ubi";
-+				reg = <0x200000 0x7e00000>;
-+			};
-+		};
-+	};
-+
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
diff --git a/lede/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch b/lede/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch
deleted file mode 100644
index 0b72e1ee98..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch
+++ /dev/null
@@ -1,413 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_nokia_ea0326gmp_defconfig
-@@ -0,0 +1,163 @@
-+CONFIG_ARM=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-nokia-ea0326gmp"
-+CONFIG_DEFAULT_ENV_FILE="nokia_ea0326gmp_env"
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-nokia-ea0326gmp.dtb"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+# CONFIG_CMD_EXT4 is not set
-+# CONFIG_CMD_FAT is not set
-+CONFIG_CMD_FDT=y
-+# CONFIG_CMD_FS_GENERIC is not set
-+# CONFIG_CMD_FS_UUID is not set
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_MBR is not set
-+CONFIG_CMD_MTD=y
-+# CONFIG_CMD_PCI is not set
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+# CONFIG_CMD_PWM is not set
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+# CONFIG_CMD_USB is not set
-+# CONFIG_CMD_FLASH is not set
-+CONFIG_CMD_UUID=y
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DM_MTD=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+# CONFIG_DM_USB is not set
-+# CONFIG_DM_PWM is not set
-+# CONFIG_PWM_MTK is not set
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+CONFIG_DM_GPIO=y
-+# CONFIG_DM_SCSI is not set
-+# CONFIG_AHCI is not set
-+CONFIG_PHY=y
-+# CONFIG_PHY_MTK_TPHY is not set
-+CONFIG_PHY_FIXED=y
-+CONFIG_MTK_AHCI=y
-+CONFIG_DM_ETH=y
-+CONFIG_MEDIATEK_ETH=y
-+# CONFIG_PCI is not set
-+# CONFIG_MMC is not set
-+# CONFIG_DM_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+# CONFIG_DM_PCI is not set
-+# CONFIG_PCIE_MEDIATEK is not set
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_SYSRESET_WATCHDOG=y
-+CONFIG_WDT_MTK=y
-+CONFIG_LZO=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
-+CONFIG_RANDOM_UUID=y
-+CONFIG_REGEX=y
-+# CONFIG_USB is not set
-+# CONFIG_USB_HOST is not set
-+# CONFIG_USB_XHCI_HCD is not set
-+# CONFIG_USB_XHCI_MTK is not set
-+# CONFIG_USB_STORAGE is not set
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_CMD_NAND=y
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
---- /dev/null
-+++ b/arch/arm/dts/mt7981-nokia-ea0326gmp.dts
-@@ -0,0 +1,186 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Nokia EA0326GMP";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		button-wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		power_led: led-0 {
-+			label = "green:power";
-+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-+			default-state = "on";
-+		};
-+
-+		led-1 {
-+			label = "green:wan";
-+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-2 {
-+			label = "red:wan";
-+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-3 {
-+			label = "green:lan";
-+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-4 {
-+			label = "green:wlan";
-+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-5 {
-+			label = "green:wps";
-+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x00000 0x0100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x0100000 0x0080000>;
-+			};
-+
-+			partition@180000 {
-+				label = "factory";
-+				reg = <0x180000 0x0200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x0200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "config";
-+				reg = <0x580000 0x200000>;
-+			};
-+
-+			partition@780000 {
-+				label = "config2";
-+				reg = <0x780000 0x200000>;
-+			};
-+
-+			partition@980000 {
-+				label = "ubi";
-+				reg = <0x980000 0x7680000>;
-+				compatible = "linux,ubi";
-+			};
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/nokia_ea0326gmp_env
-@@ -0,0 +1,55 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=root=/dev/fit0 rootwait
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-nokia_ea0326gmp-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-nokia_ea0326gmp-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-nokia_ea0326gmp-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-nokia_ea0326gmp-squashfs-sysupgrade.itb
-+bootled_pwr=green:power
-+bootled_rec=green:power
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch b/lede/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch
deleted file mode 100644
index 28cc5d73d7..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From 57dc777bddf0baf3c27177576c40b5113309ce54 Mon Sep 17 00:00:00 2001
-From: Chuanhong Guo <gch981213@gmail.com>
-Date: Sat, 2 Mar 2024 20:30:16 +0800
-Subject: [PATCH] add xiaomi redmi ax6s
-
----
- arch/arm/dts/Makefile                         |   1 +
- .../dts/mt7622-xiaomi-redmi-router-ax6s.dts   | 166 ++++++++++++++++++
- ...omi_redmi-router-ax6s-ubi-loader_defconfig |  98 +++++++++++
- xiaomi-redmi-router-ax6s-ubi-loader_env       |  22 +++
- 4 files changed, 287 insertions(+)
- create mode 100644 arch/arm/dts/mt7622-xiaomi-redmi-router-ax6s.dts
- create mode 100644 configs/mt7622_xiaomi_redmi-router-ax6s-ubi-loader_defconfig
- create mode 100644 xiaomi-redmi-router-ax6s-ubi-loader_env
-
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -1425,6 +1425,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
- 	mt7622-linksys-e8450-ubi.dtb \
- 	mt7622-ubnt-unifi-6-lr.dtb \
- 	mt7622-ubnt-unifi-6-lr-v3.dtb \
-+	mt7622-xiaomi-redmi-router-ax6s.dtb \
- 	mt7623n-bananapi-bpi-r2.dtb \
- 	mt7629-rfb.dtb \
- 	mt7981-rfb.dtb \
---- /dev/null
-+++ b/arch/arm/dts/mt7622-xiaomi-redmi-router-ax6s.dts
-@@ -0,0 +1,166 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+/dts-v1/;
-+#include <dt-bindings/input/linux-event-codes.h>
-+#include <dt-bindings/leds/common.h>
-+#include "mt7622.dtsi"
-+#include "mt7622-u-boot.dtsi"
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Xiaomi Redmi Router AX6S";
-+	compatible = "xiaomi,redmi-router-ax6s", "mediatek,mt7622";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	aliases {
-+		spi0 = &snand;
-+		ethernet0 = &eth;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x8000000>;
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_power_blue: power_blue {
-+			function = LED_FUNCTION_POWER;
-+			color = <LED_COLOR_ID_BLUE>;
-+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_power_amber: power_amber {
-+			function = LED_FUNCTION_POWER;
-+			color = <LED_COLOR_ID_AMBER>;
-+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_net_blue: net_blue {
-+			label = "blue:net";
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_net_amber: net_amber {
-+			label = "amber:net";
-+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-+		};
-+
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+
-+		mesh {
-+			label = "mesh";
-+			gpios = <&gpio 102 GPIO_ACTIVE_LOW>;
-+			linux,code = <BTN_9>;
-+			linux,input-type = <EV_SW>;
-+		};
-+	};
-+
-+	reg_1p8v: regulator-1p8v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-1.8V";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+
-+	reg_3p3v: regulator-3p3v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "fixed-3.3V";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+	};
-+};
-+
-+&pcie {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pcie0_pins>;
-+	status = "okay";
-+
-+	pcie@0,0 {
-+		status = "okay";
-+	};
-+};
-+
-+&pinctrl {
-+	pcie0_pins: pcie0-pins {
-+		mux {
-+			function = "pcie";
-+			groups = "pcie0_pad_perst",
-+				 "pcie0_1_waken",
-+				 "pcie0_1_clkreq";
-+		};
-+	};
-+
-+	snfi_pins: snfi-pins {
-+		mux {
-+			function = "flash";
-+			groups = "snfi";
-+		};
-+	};
-+
-+	uart0_pins: uart0 {
-+		mux {
-+			function = "uart";
-+			groups = "uart0_0_tx_rx" ;
-+		};
-+	};
-+
-+	watchdog_pins: watchdog-default {
-+		mux {
-+			function = "watchdog";
-+			groups = "watchdog";
-+		};
-+	};
-+};
-+
-+&snand {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&snfi_pins>;
-+	quad-spi;
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins>;
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&watchdog_pins>;
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&gpio 54 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
---- /dev/null
-+++ b/configs/mt7622_xiaomi_redmi-router-ax6s-ubi-loader_defconfig
-@@ -0,0 +1,98 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7622-xiaomi-redmi-router-ax6s"
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=25000000
-+CONFIG_SYS_LOAD_ADDR=0x40080000
-+CONFIG_PCI=y
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7622-xiaomi-redmi-router-ax6s"
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_LAST_STAGE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+# CONFIG_AUTO_COMPLETE is not set
-+CONFIG_SYS_PROMPT="MT7622> "
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+# CONFIG_CMD_UNLZ4 is not set
-+# CONFIG_CMD_UNZIP is not set
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_MTD=y
-+# CONFIG_CMD_BOOTP is not set
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_MTDPARTS=y
-+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-nand0:512k(preloader),2816k(reserved),117248k(ubi)"
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_DOS_PARTITION=y
-+CONFIG_EFI_PARTITION=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_DEFAULT_ENV_FILE="xiaomi-redmi-router-ax6s-ubi-loader_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_PROT_UDP=y
-+CONFIG_BOOTP_SEND_HOSTNAME=y
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTK_SPI_NAND=y
-+CONFIG_MTK_SPI_NAND_MTD=y
-+CONFIG_UBI_SILENCE_MSG=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PCIE_MEDIATEK=y
-+CONFIG_PHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7622=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_UBIFS_SILENCE_MSG=y
-+CONFIG_LZ4=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
---- /dev/null
-+++ b/xiaomi-redmi-router-ax6s-ubi-loader_env
-@@ -0,0 +1,22 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootled_pwr=power_blue
-+bootled_rec=power_amber
-+bootcmd=run boot_or_recovery
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-mt7622-xiaomi_redmi-router-ax6s-initramfs-recovery.itb
-+bootfile_upg=openwrt-mediatek-mt7622-xiaomi_redmi-router-ax6s-squashfs-sysupgrade.itb
-+boot_or_recovery=run boot_production ; led $bootled_pwr off ; led $bootled_rec on ; if ubi check fit ; then run boot_tftp_forever ; else run tftp_production ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_forever=while true ; do run boot_tftp ; sleep 1 ; done
-+boot_production=run ubi_read_production && bootm $loadaddr#$bootconf
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi
-+ubi_init=ubi part ubi || run ubi_format
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
-+ubi_read_production=run ubi_init && ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+tftp_production=tftpboot $loadaddr $bootfile_upg && iminfo $loadaddr && run ubi_write_production && reset
diff --git a/lede/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/lede/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
deleted file mode 100644
index 25d2733d1c..0000000000
--- a/lede/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
+++ /dev/null
@@ -1,3949 +0,0 @@
---- /dev/null
-+++ b/arch/arm/dts/openwrt-one.dts
-@@ -0,0 +1,203 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2024 John Crispin <john@phrozen.org>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "OpenWrt One";
-+	compatible = "openwrt,one", "mediatek,mt7981";
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		user {
-+			label = "front";
-+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-+			linux,code = <BTN_0>;
-+		};
-+
-+		reset {
-+			label = "back";
-+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-+			linux,code = <BTN_1>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		red {
-+			label = "red";
-+			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		white {
-+			label = "white";
-+			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		green {
-+			label = "green";
-+			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <1>;
-+	phy-mode = "gmii";
-+	phy-handle = <&phy0>;
-+
-+	phy0: eth-phy@0 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0>;
-+	};
-+};
-+
-+&pinctrl {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+
-+	spi2_flash_pins: spi2-spi2-pins {
-+		mux {
-+			function = "spi";
-+			groups = "spi2", "spi2_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@200000 {
-+				label = "ubi";
-+				reg = <0x100000 0x7f00000>;
-+			};
-+		};
-+	};
-+};
-+
-+&spi2 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi2_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nor@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <5000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@00000 {
-+				label = "bl2-nor";
-+				reg = <0x00000 0x0040000>;
-+			};
-+
-+			partition@40000 {
-+				label = "factory";
-+				reg = <0x40000 0x00C0000>;
-+			};
-+
-+			partition@100000 {
-+				label = "fip-nor";
-+				reg = <0x100000 0x0080000>;
-+			};
-+
-+			partition@180000 {
-+				label = "recovery";
-+				reg = <0x180000 0xc80000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/configs/mt7981_openwrt-one-nor_defconfig
-@@ -0,0 +1,1811 @@
-+#
-+# Automatically generated file; DO NOT EDIT.
-+# U-Boot 2024.01 Configuration
-+#
-+
-+#
-+# Compiler: aarch64-openwrt-linux-musl-gcc (OpenWrt GCC 13.2.0 r26144+12-219018185e) 13.2.0
-+#
-+CONFIG_CREATE_ARCH_SYMLINK=y
-+CONFIG_SYS_CACHE_SHIFT_6=y
-+CONFIG_SYS_CACHELINE_SIZE=64
-+CONFIG_LINKER_LIST_ALIGN=8
-+# CONFIG_ARC is not set
-+CONFIG_ARM=y
-+# CONFIG_M68K is not set
-+# CONFIG_MICROBLAZE is not set
-+# CONFIG_MIPS is not set
-+# CONFIG_NIOS2 is not set
-+# CONFIG_PPC is not set
-+# CONFIG_RISCV is not set
-+# CONFIG_SANDBOX is not set
-+# CONFIG_SH is not set
-+# CONFIG_X86 is not set
-+# CONFIG_XTENSA is not set
-+CONFIG_SYS_ARCH="arm"
-+CONFIG_SYS_CPU="armv8"
-+CONFIG_SYS_SOC="mediatek"
-+CONFIG_SYS_VENDOR="mediatek"
-+CONFIG_SYS_BOARD="mt7981"
-+CONFIG_SYS_CONFIG_NAME="mt7981"
-+
-+#
-+# Skipping low level initialization functions
-+#
-+# CONFIG_SKIP_LOWLEVEL_INIT is not set
-+# CONFIG_SKIP_LOWLEVEL_INIT_ONLY is not set
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_SYS_NONCACHED_MEMORY=0x100000
-+# CONFIG_SYS_ICACHE_OFF is not set
-+# CONFIG_SYS_DCACHE_OFF is not set
-+
-+#
-+# ARM architecture
-+#
-+CONFIG_ARM64=y
-+CONFIG_ARM64_CRC32=y
-+CONFIG_COUNTER_FREQUENCY=0
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_INIT_SP_RELATIVE=y
-+CONFIG_SYS_INIT_SP_BSS_OFFSET=524288
-+# CONFIG_GIC_V3_ITS is not set
-+CONFIG_STATIC_RELA=y
-+CONFIG_DMA_ADDR_T_64BIT=y
-+CONFIG_GPIO_EXTRA_HEADER=y
-+CONFIG_ARM_ASM_UNIFIED=y
-+# CONFIG_SYS_ARM_CACHE_CP15 is not set
-+# CONFIG_SYS_ARM_MMU is not set
-+# CONFIG_SYS_ARM_MPU is not set
-+CONFIG_SYS_ARM_ARCH=8
-+CONFIG_SYS_ARM_CACHE_WRITEBACK=y
-+# CONFIG_SYS_ARM_CACHE_WRITETHROUGH is not set
-+# CONFIG_SYS_ARM_CACHE_WRITEALLOC is not set
-+# CONFIG_ARCH_CPU_INIT is not set
-+CONFIG_SYS_ARCH_TIMER=y
-+CONFIG_ARM_SMCCC=y
-+# CONFIG_SYS_L2_PL310 is not set
-+# CONFIG_SPL_SYS_L2_PL310 is not set
-+# CONFIG_SYS_L2CACHE_OFF is not set
-+# CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK is not set
-+# CONFIG_USE_ARCH_MEMCPY is not set
-+# CONFIG_USE_ARCH_MEMSET is not set
-+CONFIG_ARM64_SUPPORT_AARCH32=y
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_HISTB is not set
-+# CONFIG_ARCH_KIRKWOOD is not set
-+# CONFIG_ARCH_MVEBU is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_TARGET_STV0991 is not set
-+# CONFIG_ARCH_BCM283X is not set
-+# CONFIG_ARCH_BCMSTB is not set
-+# CONFIG_ARCH_BCMBCA is not set
-+# CONFIG_TARGET_VEXPRESS_CA9X4 is not set
-+# CONFIG_TARGET_BCMNS is not set
-+# CONFIG_TARGET_BCMNS2 is not set
-+# CONFIG_TARGET_BCMNS3 is not set
-+# CONFIG_ARCH_EXYNOS is not set
-+# CONFIG_ARCH_S5PC1XX is not set
-+# CONFIG_ARCH_HIGHBANK is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_IPQ40XX is not set
-+# CONFIG_ARCH_KEYSTONE is not set
-+# CONFIG_ARCH_K3 is not set
-+# CONFIG_ARCH_OMAP2PLUS is not set
-+# CONFIG_ARCH_MESON is not set
-+CONFIG_ARCH_MEDIATEK=y
-+# CONFIG_ARCH_LPC32XX is not set
-+# CONFIG_ARCH_IMX8 is not set
-+# CONFIG_ARCH_IMX8M is not set
-+# CONFIG_ARCH_IMX8ULP is not set
-+# CONFIG_ARCH_IMX9 is not set
-+# CONFIG_ARCH_IMXRT is not set
-+# CONFIG_ARCH_MX23 is not set
-+# CONFIG_ARCH_MX28 is not set
-+# CONFIG_ARCH_MX31 is not set
-+# CONFIG_ARCH_MX7ULP is not set
-+# CONFIG_ARCH_MX7 is not set
-+# CONFIG_ARCH_MX6 is not set
-+# CONFIG_ARCH_MX5 is not set
-+# CONFIG_ARCH_NEXELL is not set
-+# CONFIG_ARCH_NPCM is not set
-+# CONFIG_ARCH_APPLE is not set
-+# CONFIG_ARCH_OWL is not set
-+# CONFIG_ARCH_QEMU is not set
-+# CONFIG_ARCH_RMOBILE is not set
-+# CONFIG_ARCH_SNAPDRAGON is not set
-+# CONFIG_ARCH_SOCFPGA is not set
-+# CONFIG_ARCH_SUNXI is not set
-+# CONFIG_ARCH_U8500 is not set
-+# CONFIG_ARCH_VERSAL is not set
-+# CONFIG_ARCH_VERSAL_NET is not set
-+# CONFIG_ARCH_VF610 is not set
-+# CONFIG_ARCH_ZYNQ is not set
-+# CONFIG_ARCH_ZYNQMP_R5 is not set
-+# CONFIG_ARCH_ZYNQMP is not set
-+# CONFIG_ARCH_TEGRA is not set
-+# CONFIG_ARCH_VEXPRESS64 is not set
-+# CONFIG_TARGET_CORSTONE1000 is not set
-+# CONFIG_TARGET_TOTAL_COMPUTE is not set
-+# CONFIG_TARGET_LS2080A_EMU is not set
-+# CONFIG_TARGET_LS1088AQDS is not set
-+# CONFIG_TARGET_LS2080AQDS is not set
-+# CONFIG_TARGET_LS2080ARDB is not set
-+# CONFIG_TARGET_LS2081ARDB is not set
-+# CONFIG_TARGET_LX2160ARDB is not set
-+# CONFIG_TARGET_LX2160AQDS is not set
-+# CONFIG_TARGET_LX2162AQDS is not set
-+# CONFIG_TARGET_HIKEY is not set
-+# CONFIG_TARGET_HIKEY960 is not set
-+# CONFIG_TARGET_POPLAR is not set
-+# CONFIG_TARGET_LS1012AQDS is not set
-+# CONFIG_TARGET_LS1012ARDB is not set
-+# CONFIG_TARGET_LS1012A2G5RDB is not set
-+# CONFIG_TARGET_LS1012AFRWY is not set
-+# CONFIG_TARGET_LS1012AFRDM is not set
-+# CONFIG_TARGET_LS1028AQDS is not set
-+# CONFIG_TARGET_LS1028ARDB is not set
-+# CONFIG_TARGET_LS1088ARDB is not set
-+# CONFIG_TARGET_LS1021AQDS is not set
-+# CONFIG_TARGET_LS1021ATWR is not set
-+# CONFIG_TARGET_PG_WCOM_SELI8 is not set
-+# CONFIG_TARGET_PG_WCOM_EXPU1 is not set
-+# CONFIG_TARGET_LS1021ATSN is not set
-+# CONFIG_TARGET_LS1021AIOT is not set
-+# CONFIG_TARGET_LS1043AQDS is not set
-+# CONFIG_TARGET_LS1043ARDB is not set
-+# CONFIG_TARGET_LS1046AQDS is not set
-+# CONFIG_TARGET_LS1046ARDB is not set
-+# CONFIG_TARGET_LS1046AFRWY is not set
-+# CONFIG_TARGET_SL28 is not set
-+# CONFIG_TARGET_TEN64 is not set
-+# CONFIG_ARCH_UNIPHIER is not set
-+# CONFIG_ARCH_SYNQUACER is not set
-+# CONFIG_ARCH_STM32 is not set
-+# CONFIG_ARCH_STI is not set
-+# CONFIG_ARCH_STM32MP is not set
-+# CONFIG_ARCH_ROCKCHIP is not set
-+# CONFIG_ARCH_OCTEONTX is not set
-+# CONFIG_ARCH_OCTEONTX2 is not set
-+# CONFIG_TARGET_THUNDERX_88XX is not set
-+# CONFIG_ARCH_ASPEED is not set
-+# CONFIG_TARGET_DURIAN is not set
-+# CONFIG_TARGET_POMELO is not set
-+# CONFIG_TARGET_PRESIDIO_ASIC is not set
-+# CONFIG_TARGET_XENGUEST_ARM64 is not set
-+# CONFIG_ARCH_GXP is not set
-+# CONFIG_STATIC_MACH_TYPE is not set
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_LEN=0x400000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_ENV_SOURCE_FILE=""
-+CONFIG_SF_DEFAULT_SPEED=1000000
-+CONFIG_SF_DEFAULT_MODE=0x0
-+CONFIG_ENV_SIZE=0x8000
-+CONFIG_DM_GPIO=y
-+CONFIG_DEFAULT_DEVICE_TREE="openwrt-one"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
-+CONFIG_DM_RESET=y
-+CONFIG_SYS_MONITOR_LEN=0
-+# CONFIG_MT8512 is not set
-+# CONFIG_TARGET_MT7622 is not set
-+# CONFIG_TARGET_MT7623 is not set
-+# CONFIG_TARGET_MT7629 is not set
-+CONFIG_TARGET_MT7981=y
-+# CONFIG_TARGET_MT7986 is not set
-+# CONFIG_TARGET_MT7988 is not set
-+# CONFIG_TARGET_MT8183 is not set
-+# CONFIG_TARGET_MT8512 is not set
-+# CONFIG_TARGET_MT8516 is not set
-+# CONFIG_TARGET_MT8518 is not set
-+CONFIG_MTK_BROM_HEADER_INFO="media=snand;nandinfo=2k+64"
-+CONFIG_RESET_BUTTON_LABEL="back"
-+CONFIG_RESET_BUTTON_SETTLE_DELAY=0
-+CONFIG_ERR_PTR_OFFSET=0x0
-+# CONFIG_SPL is not set
-+CONFIG_BOOTSTAGE_STASH_ADDR=0x0
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+# CONFIG_DEBUG_UART_BOARD_INIT is not set
-+CONFIG_IDENT_STRING=""
-+CONFIG_SYS_CLK_FREQ=0
-+# CONFIG_CHIP_DIP_SCAN is not set
-+# CONFIG_CMO_BY_VA_ONLY is not set
-+# CONFIG_ARMV8_MULTIENTRY is not set
-+# CONFIG_ARMV8_SET_SMPEN is not set
-+# CONFIG_ARMV8_SWITCH_TO_EL1 is not set
-+
-+#
-+# ARMv8 secure monitor firmware
-+#
-+# CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT is not set
-+CONFIG_PSCI_RESET=y
-+# CONFIG_ARMV8_PSCI is not set
-+# CONFIG_ARMV8_EA_EL3_FIRST is not set
-+# CONFIG_ARMV8_CRYPTO is not set
-+# CONFIG_CMD_DEKBLOB is not set
-+# CONFIG_IMX_CAAM_DEK_ENCAP is not set
-+# CONFIG_IMX_OPTEE_DEK_ENCAP is not set
-+# CONFIG_IMX_SECO_DEK_ENCAP is not set
-+# CONFIG_IMX_ELE_DEK_ENCAP is not set
-+# CONFIG_CMD_HDMIDETECT is not set
-+CONFIG_IMX_DCD_ADDR=0x00910000
-+CONFIG_SYS_MEM_TOP_HIDE=0x0
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+
-+#
-+# ARM debug
-+#
-+CONFIG_BUILD_TARGET=""
-+# CONFIG_PCI is not set
-+CONFIG_FWU_NUM_BANKS=2
-+CONFIG_FWU_NUM_IMAGES_PER_BANK=2
-+CONFIG_DEBUG_UART=y
-+# CONFIG_AHCI is not set
-+# CONFIG_OF_BOARD_FIXUP is not set
-+
-+#
-+# Functionality shared between NXP SoCs
-+#
-+# CONFIG_NXP_ESBC is not set
-+
-+#
-+# General setup
-+#
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_CC_IS_GCC=y
-+CONFIG_GCC_VERSION=130200
-+CONFIG_CLANG_VERSION=0
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
-+# CONFIG_CC_OPTIMIZE_FOR_DEBUG is not set
-+# CONFIG_OPTIMIZE_INLINING is not set
-+CONFIG_ARCH_SUPPORTS_LTO=y
-+# CONFIG_LTO is not set
-+CONFIG_CC_HAS_ASM_INLINE=y
-+# CONFIG_XEN is not set
-+# CONFIG_ENV_VARS_UBOOT_CONFIG is not set
-+# CONFIG_SYS_BOOT_GET_CMDLINE is not set
-+# CONFIG_SYS_BOOT_GET_KBD is not set
-+CONFIG_SYS_MALLOC_F=y
-+# CONFIG_VALGRIND is not set
-+CONFIG_EXPERT=y
-+CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
-+# CONFIG_SYS_MALLOC_DEFAULT_TO_INIT is not set
-+# CONFIG_TOOLS_DEBUG is not set
-+CONFIG_PHYS_64BIT=y
-+CONFIG_FDT_64BIT=y
-+# CONFIG_REMAKE_ELF is not set
-+# CONFIG_HAS_BOARD_SIZE_LIMIT is not set
-+# CONFIG_SYS_CUSTOM_LDSCRIPT is not set
-+CONFIG_PLATFORM_ELFENTRY="_start"
-+CONFIG_STACK_SIZE=0x1000000
-+CONFIG_SYS_SRAM_BASE=0x0
-+CONFIG_SYS_SRAM_SIZE=0x0
-+# CONFIG_MP is not set
-+CONFIG_HAVE_TEXT_BASE=y
-+# CONFIG_HAVE_SYS_UBOOT_START is not set
-+CONFIG_SYS_UBOOT_START=0x41e00000
-+# CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
-+# CONFIG_API is not set
-+
-+#
-+# Boot options
-+#
-+
-+#
-+# Boot images
-+#
-+# CONFIG_ANDROID_BOOT_IMAGE is not set
-+# CONFIG_TIMESTAMP is not set
-+CONFIG_FIT=y
-+CONFIG_FIT_EXTERNAL_OFFSET=0x0
-+CONFIG_FIT_FULL_CHECK=y
-+# CONFIG_FIT_SIGNATURE is not set
-+# CONFIG_FIT_CIPHER is not set
-+# CONFIG_FIT_VERBOSE is not set
-+# CONFIG_FIT_BEST_MATCH is not set
-+CONFIG_FIT_PRINT=y
-+# CONFIG_SPL_LOAD_FIT_FULL is not set
-+CONFIG_PXE_UTILS=y
-+CONFIG_BOOTSTD=y
-+# CONFIG_BOOTSTD_FULL is not set
-+# CONFIG_BOOTSTD_DEFAULTS is not set
-+CONFIG_BOOTSTD_BOOTCOMMAND=y
-+CONFIG_BOOTMETH_GLOBAL=y
-+# CONFIG_BOOTMETH_CROS is not set
-+CONFIG_BOOTMETH_EXTLINUX=y
-+CONFIG_BOOTMETH_EXTLINUX_PXE=y
-+CONFIG_BOOTMETH_EFILOADER=y
-+CONFIG_BOOTMETH_VBE=y
-+CONFIG_BOOTMETH_VBE_REQUEST=y
-+CONFIG_BOOTMETH_VBE_SIMPLE=y
-+CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
-+# CONFIG_BOOTMETH_SCRIPT is not set
-+CONFIG_LEGACY_IMAGE_FORMAT=y
-+# CONFIG_SUPPORT_RAW_INITRD is not set
-+# CONFIG_CHROMEOS is not set
-+# CONFIG_CHROMEOS_VBOOT is not set
-+# CONFIG_RAMBOOT_PBL is not set
-+CONFIG_SYS_BOOT_RAMDISK_HIGH=y
-+# CONFIG_DISTRO_DEFAULTS is not set
-+
-+#
-+# Boot timing
-+#
-+# CONFIG_BOOTSTAGE is not set
-+CONFIG_BOOTSTAGE_STASH_SIZE=0x1000
-+# CONFIG_SHOW_BOOT_PROGRESS is not set
-+
-+#
-+# Boot media
-+#
-+CONFIG_NAND_BOOT=y
-+# CONFIG_ONENAND_BOOT is not set
-+# CONFIG_QSPI_BOOT is not set
-+# CONFIG_SATA_BOOT is not set
-+# CONFIG_SD_BOOT is not set
-+# CONFIG_SD_BOOT_QSPI is not set
-+CONFIG_SPI_BOOT=y
-+
-+#
-+# Autoboot options
-+#
-+CONFIG_AUTOBOOT=y
-+CONFIG_BOOTDELAY=2
-+# CONFIG_AUTOBOOT_KEYED is not set
-+# CONFIG_AUTOBOOT_USE_MENUKEY is not set
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+# CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE is not set
-+# CONFIG_BOOT_RETRY is not set
-+
-+#
-+# Image support
-+#
-+# CONFIG_IMAGE_PRE_LOAD is not set
-+
-+#
-+# Devicetree fixup
-+#
-+# CONFIG_OF_BOARD_SETUP is not set
-+# CONFIG_OF_SYSTEM_SETUP is not set
-+# CONFIG_OF_STDOUT_VIA_ALIAS is not set
-+# CONFIG_FDT_FIXUP_PARTITIONS is not set
-+# CONFIG_FDT_SIMPLEFB is not set
-+CONFIG_ARCH_FIXUP_FDT_MEMORY=y
-+# CONFIG_USE_BOOTARGS is not set
-+# CONFIG_BOOTARGS_SUBST is not set
-+# CONFIG_USE_BOOTCOMMAND is not set
-+CONFIG_USE_PREBOOT=y
-+CONFIG_DEFAULT_FDT_FILE="openwrt-one"
-+# CONFIG_SAVE_PREV_BL_FDT_ADDR is not set
-+# CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR is not set
-+
-+#
-+# Configuration editor
-+#
-+# CONFIG_CEDIT is not set
-+
-+#
-+# Console
-+#
-+CONFIG_MENU=y
-+# CONFIG_CONSOLE_RECORD is not set
-+# CONFIG_DISABLE_CONSOLE is not set
-+CONFIG_LOGLEVEL=7
-+# CONFIG_SILENT_CONSOLE is not set
-+# CONFIG_SPL_SILENT_CONSOLE is not set
-+# CONFIG_TPL_SILENT_CONSOLE is not set
-+# CONFIG_PRE_CONSOLE_BUFFER is not set
-+CONFIG_CONSOLE_FLUSH_SUPPORT=y
-+# CONFIG_CONSOLE_FLUSH_ON_NEWLINE is not set
-+# CONFIG_CONSOLE_MUX is not set
-+# CONFIG_SYS_CONSOLE_IS_IN_ENV is not set
-+# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
-+# CONFIG_SYS_CONSOLE_INFO_QUIET is not set
-+# CONFIG_SYS_STDIO_DEREGISTER is not set
-+# CONFIG_SPL_SYS_STDIO_DEREGISTER is not set
-+# CONFIG_SYS_DEVICE_NULLDEV is not set
-+
-+#
-+# Logging
-+#
-+CONFIG_LOG=y
-+CONFIG_LOG_MAX_LEVEL=6
-+CONFIG_LOG_DEFAULT_LEVEL=6
-+CONFIG_LOG_CONSOLE=y
-+# CONFIG_LOGF_FILE is not set
-+# CONFIG_LOGF_LINE is not set
-+# CONFIG_LOGF_FUNC is not set
-+CONFIG_LOGF_FUNC_PAD=20
-+# CONFIG_LOG_SYSLOG is not set
-+# CONFIG_LOG_ERROR_RETURN is not set
-+
-+#
-+# Init options
-+#
-+# CONFIG_BOARD_TYPES is not set
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DISPLAY_BOARDINFO=y
-+# CONFIG_DISPLAY_BOARDINFO_LATE is not set
-+
-+#
-+# Start-up hooks
-+#
-+# CONFIG_CYCLIC is not set
-+CONFIG_EVENT=y
-+CONFIG_EVENT_DYNAMIC=y
-+# CONFIG_EVENT_DEBUG is not set
-+# CONFIG_ARCH_MISC_INIT is not set
-+# CONFIG_BOARD_EARLY_INIT_F is not set
-+# CONFIG_BOARD_EARLY_INIT_R is not set
-+# CONFIG_BOARD_POSTCLK_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+# CONFIG_CLOCKS is not set
-+# CONFIG_HWCONFIG is not set
-+CONFIG_LAST_STAGE_INIT=y
-+# CONFIG_MISC_INIT_R is not set
-+# CONFIG_SYS_MALLOC_BOOTPARAMS is not set
-+# CONFIG_ID_EEPROM is not set
-+# CONFIG_RESET_PHY_R is not set
-+
-+#
-+# Security support
-+#
-+CONFIG_HASH=y
-+# CONFIG_STACKPROTECTOR is not set
-+# CONFIG_BOARD_RNG_SEED is not set
-+
-+#
-+# Update support
-+#
-+# CONFIG_UPDATE_TFTP is not set
-+# CONFIG_ANDROID_AB is not set
-+
-+#
-+# Blob list
-+#
-+# CONFIG_BLOBLIST is not set
-+CONFIG_SUPPORT_SPL=y
-+# CONFIG_VPL is not set
-+
-+#
-+# Command line interface
-+#
-+CONFIG_CMDLINE=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_CMDLINE_EDITING=y
-+# CONFIG_CMDLINE_PS_SUPPORT is not set
-+CONFIG_AUTO_COMPLETE=y
-+CONFIG_SYS_LONGHELP=y
-+CONFIG_SYS_PROMPT="OpenWrt One> "
-+CONFIG_SYS_PROMPT_HUSH_PS2="> "
-+CONFIG_SYS_MAXARGS=16
-+CONFIG_SYS_CBSIZE=512
-+CONFIG_SYS_PBSIZE=1049
-+CONFIG_SYS_XTRACE=y
-+CONFIG_BUILD_BIN2C=y
-+
-+#
-+# Commands
-+#
-+
-+#
-+# Info commands
-+#
-+CONFIG_CMD_BDI=y
-+# CONFIG_CMD_BDINFO_EXTRA is not set
-+# CONFIG_CMD_CONFIG is not set
-+CONFIG_CMD_CONSOLE=y
-+CONFIG_CMD_CPU=y
-+# CONFIG_CMD_HISTORY is not set
-+CONFIG_CMD_LICENSE=y
-+# CONFIG_CMD_PMC is not set
-+
-+#
-+# Boot commands
-+#
-+CONFIG_CMD_BOOTD=y
-+CONFIG_CMD_BOOTM=y
-+# CONFIG_CMD_BOOTDEV is not set
-+CONFIG_CMD_BOOTFLOW=y
-+# CONFIG_CMD_BOOTMETH is not set
-+CONFIG_BOOTM_EFI=y
-+# CONFIG_CMD_BOOTZ is not set
-+CONFIG_CMD_BOOTI=y
-+CONFIG_BOOTM_LINUX=y
-+# CONFIG_BOOTM_NETBSD is not set
-+# CONFIG_BOOTM_OPENRTOS is not set
-+# CONFIG_BOOTM_OSE is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_CMD_VBE is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+CONFIG_SYS_BOOTM_LEN=0x4000000
-+CONFIG_CMD_BOOTEFI=y
-+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-+# CONFIG_CMD_BOOTEFI_HELLO is not set
-+# CONFIG_CMD_BOOTEFI_SELFTEST is not set
-+CONFIG_CMD_BOOTMENU=y
-+# CONFIG_CMD_ADTIMG is not set
-+CONFIG_CMD_ELF=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_GO=y
-+CONFIG_CMD_RUN=y
-+CONFIG_CMD_IMI=y
-+# CONFIG_CMD_IMLS is not set
-+CONFIG_CMD_XIMG=y
-+# CONFIG_CMD_ZBOOT is not set
-+
-+#
-+# Environment commands
-+#
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_EXPORTENV=y
-+CONFIG_CMD_IMPORTENV=y
-+CONFIG_CMD_EDITENV=y
-+# CONFIG_CMD_GREPENV is not set
-+CONFIG_CMD_SAVEENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_EXISTS=y
-+CONFIG_CMD_ENV_READMEM=y
-+# CONFIG_CMD_ENV_CALLBACK is not set
-+CONFIG_CMD_ENV_FLAGS=y
-+# CONFIG_CMD_NVEDIT_EFI is not set
-+# CONFIG_CMD_NVEDIT_INDIRECT is not set
-+# CONFIG_CMD_NVEDIT_INFO is not set
-+# CONFIG_CMD_NVEDIT_LOAD is not set
-+# CONFIG_CMD_NVEDIT_SELECT is not set
-+
-+#
-+# Memory commands
-+#
-+# CONFIG_CMD_BINOP is not set
-+# CONFIG_CMD_BLOBLIST is not set
-+CONFIG_CMD_CRC32=y
-+# CONFIG_CRC32_VERIFY is not set
-+# CONFIG_CMD_EEPROM is not set
-+# CONFIG_LOOPW is not set
-+# CONFIG_CMD_MD5SUM is not set
-+# CONFIG_CMD_MEMINFO is not set
-+CONFIG_CMD_MEMORY=y
-+# CONFIG_CMD_MEM_SEARCH is not set
-+# CONFIG_CMD_MX_CYCLIC is not set
-+CONFIG_CMD_RANDOM=y
-+# CONFIG_CMD_MEMTEST is not set
-+# CONFIG_CMD_SHA1SUM is not set
-+CONFIG_CMD_STRINGS=y
-+
-+#
-+# Compression commands
-+#
-+CONFIG_CMD_LZMADEC=y
-+# CONFIG_CMD_UNLZ4 is not set
-+# CONFIG_CMD_UNZIP is not set
-+# CONFIG_CMD_ZIP is not set
-+
-+#
-+# Device access commands
-+#
-+# CONFIG_CMD_ARMFLASH is not set
-+# CONFIG_CMD_BIND is not set
-+# CONFIG_CMD_CLK is not set
-+# CONFIG_CMD_DEMO is not set
-+# CONFIG_CMD_DFU is not set
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_FLASH=y
-+# CONFIG_CMD_FPGAD is not set
-+# CONFIG_CMD_FUSE is not set
-+CONFIG_CMD_GPIO=y
-+# CONFIG_CMD_GPIO_READ is not set
-+CONFIG_CMD_PWM=y
-+# CONFIG_CMD_GPT is not set
-+# CONFIG_RANDOM_UUID is not set
-+# CONFIG_CMD_IDE is not set
-+# CONFIG_CMD_IO is not set
-+# CONFIG_CMD_IOTRACE is not set
-+# CONFIG_CMD_I2C is not set
-+CONFIG_CMD_LOADB=y
-+# CONFIG_CMD_LOADM is not set
-+CONFIG_CMD_LOADS=y
-+# CONFIG_LOADS_ECHO is not set
-+# CONFIG_CMD_SAVES is not set
-+# CONFIG_SYS_LOADS_BAUD_CHANGE is not set
-+CONFIG_CMD_LOADXY_TIMEOUT=90
-+# CONFIG_CMD_LSBLK is not set
-+# CONFIG_CMD_MBR is not set
-+# CONFIG_CMD_CLONE is not set
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND_EXT=y
-+# CONFIG_CMD_ONENAND is not set
-+# CONFIG_CMD_OSD is not set
-+# CONFIG_CMD_PART is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PINMUX=y
-+# CONFIG_CMD_POWEROFF is not set
-+# CONFIG_CMD_READ is not set
-+# CONFIG_CMD_SATA is not set
-+# CONFIG_CMD_SDRAM is not set
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_SF_TEST=y
-+# CONFIG_CMD_SPI is not set
-+# CONFIG_CMD_TSI148 is not set
-+# CONFIG_CMD_UNIVERSE is not set
-+CONFIG_CMD_USB=y
-+# CONFIG_CMD_USB_SDP is not set
-+# CONFIG_CMD_RKMTD is not set
-+# CONFIG_CMD_WRITE is not set
-+
-+#
-+# Shell scripting commands
-+#
-+# CONFIG_CMD_CAT is not set
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_SETEXPR=y
-+# CONFIG_CMD_SETEXPR_FMT is not set
-+# CONFIG_CMD_XXD is not set
-+
-+#
-+# Android support commands
-+#
-+CONFIG_CMD_NET=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_DHCP=y
-+# CONFIG_BOOTP_MAY_FAIL is not set
-+CONFIG_BOOTP_BOOTPATH=y
-+# CONFIG_BOOTP_VENDOREX is not set
-+# CONFIG_BOOTP_BOOTFILESIZE is not set
-+CONFIG_BOOTP_DNS=y
-+# CONFIG_BOOTP_DNS2 is not set
-+CONFIG_BOOTP_GATEWAY=y
-+CONFIG_BOOTP_HOSTNAME=y
-+# CONFIG_BOOTP_PREFER_SERVERIP is not set
-+CONFIG_BOOTP_SUBNETMASK=y
-+# CONFIG_BOOTP_NISDOMAIN is not set
-+# CONFIG_BOOTP_NTPSERVER is not set
-+# CONFIG_BOOTP_TIMEOFFSET is not set
-+# CONFIG_CMD_PCAP is not set
-+CONFIG_BOOTP_PXE=y
-+CONFIG_BOOTP_PXE_CLIENTARCH=0x16
-+# CONFIG_BOOTP_PXE_DHCP_OPTION is not set
-+CONFIG_BOOTP_VCI_STRING="U-Boot.armv8"
-+CONFIG_CMD_TFTPBOOT=y
-+# CONFIG_CMD_TFTPPUT is not set
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_NET_TFTP_VARS=y
-+CONFIG_CMD_RARP=y
-+# CONFIG_CMD_NFS is not set
-+# CONFIG_SYS_DISABLE_AUTOLOAD is not set
-+# CONFIG_CMD_WGET is not set
-+# CONFIG_CMD_MII is not set
-+# CONFIG_CMD_MDIO is not set
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_ETHSW is not set
-+CONFIG_CMD_PXE=y
-+# CONFIG_CMD_WOL is not set
-+
-+#
-+# Misc commands
-+#
-+# CONFIG_CMD_2048 is not set
-+# CONFIG_CMD_BSP is not set
-+CONFIG_CMD_BLOCK_CACHE=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+# CONFIG_CMD_CONITRACE is not set
-+# CONFIG_CMD_CLS is not set
-+# CONFIG_CMD_EFIDEBUG is not set
-+CONFIG_CMD_EFICONFIG=y
-+# CONFIG_CMD_EXCEPTION is not set
-+CONFIG_CMD_LED=y
-+# CONFIG_CMD_INI is not set
-+# CONFIG_CMD_DATE is not set
-+# CONFIG_CMD_TIME is not set
-+# CONFIG_CMD_GETTIME is not set
-+# CONFIG_CMD_PAUSE is not set
-+CONFIG_CMD_SLEEP=y
-+# CONFIG_CMD_TIMER is not set
-+# CONFIG_CMD_SYSBOOT is not set
-+# CONFIG_CMD_QFW is not set
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_PSTORE_MEM_SIZE=0x10000
-+CONFIG_CMD_PSTORE_RECORD_SIZE=0x1000
-+CONFIG_CMD_PSTORE_CONSOLE_SIZE=0x1000
-+CONFIG_CMD_PSTORE_FTRACE_SIZE=0x1000
-+CONFIG_CMD_PSTORE_PMSG_SIZE=0x1000
-+CONFIG_CMD_PSTORE_ECC_SIZE=0
-+# CONFIG_CMD_TERMINAL is not set
-+CONFIG_CMD_UUID=y
-+
-+#
-+# TI specific command line interface
-+#
-+
-+#
-+# Power commands
-+#
-+
-+#
-+# Security commands
-+#
-+# CONFIG_CMD_AES is not set
-+# CONFIG_CMD_BLOB is not set
-+CONFIG_CMD_HASH=y
-+# CONFIG_CMD_HVC is not set
-+CONFIG_CMD_SMC=y
-+# CONFIG_HASH_VERIFY is not set
-+
-+#
-+# Firmware commands
-+#
-+
-+#
-+# Filesystem commands
-+#
-+# CONFIG_CMD_BTRFS is not set
-+# CONFIG_CMD_EROFS is not set
-+# CONFIG_CMD_EXT2 is not set
-+# CONFIG_CMD_EXT4 is not set
-+CONFIG_CMD_FAT=y
-+# CONFIG_CMD_SQUASHFS is not set
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+# CONFIG_CMD_JFFS2 is not set
-+# CONFIG_CMD_MTDPARTS is not set
-+CONFIG_MTDIDS_DEFAULT=""
-+CONFIG_MTDPARTS_DEFAULT=""
-+# CONFIG_CMD_REISER is not set
-+# CONFIG_CMD_ZFS is not set
-+
-+#
-+# Debug commands
-+#
-+# CONFIG_CMD_DIAG is not set
-+# CONFIG_CMD_EVENT is not set
-+# CONFIG_CMD_LOG is not set
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITIONS=y
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_DOS_PARTITION=y
-+# CONFIG_ISO_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_SUPPORT_OF_CONTROL=y
-+
-+#
-+# Device Tree Control
-+#
-+CONFIG_OF_CONTROL=y
-+CONFIG_OF_REAL=y
-+# CONFIG_OF_LIVE is not set
-+CONFIG_OF_SEPARATE=y
-+# CONFIG_OF_EMBED is not set
-+# CONFIG_OF_BOARD is not set
-+# CONFIG_OF_OMIT_DTB is not set
-+CONFIG_DEVICE_TREE_INCLUDES=""
-+CONFIG_OF_LIST="openwrt-one"
-+# CONFIG_MULTI_DTB_FIT is not set
-+CONFIG_OF_TAG_MIGRATE=y
-+# CONFIG_OF_DTB_PROPS_REMOVE is not set
-+
-+#
-+# Environment
-+#
-+CONFIG_ENV_SUPPORT=y
-+CONFIG_SAVEENV=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_MIN_ENTRIES=64
-+CONFIG_ENV_MAX_ENTRIES=512
-+CONFIG_ENV_IS_DEFAULT=y
-+CONFIG_ENV_IS_NOWHERE=y
-+# CONFIG_ENV_IS_IN_EEPROM is not set
-+# CONFIG_ENV_IS_IN_FAT is not set
-+# CONFIG_ENV_IS_IN_EXT4 is not set
-+# CONFIG_ENV_IS_IN_FLASH is not set
-+# CONFIG_ENV_IS_IN_MTD is not set
-+# CONFIG_ENV_IS_IN_NAND is not set
-+# CONFIG_ENV_IS_IN_NVRAM is not set
-+# CONFIG_ENV_IS_IN_ONENAND is not set
-+# CONFIG_ENV_IS_IN_REMOTE is not set
-+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
-+# CONFIG_ENV_IS_IN_UBI is not set
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_DEFAULT_ENV_FILE="openwrt-one-nor_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+# CONFIG_ENV_IMPORT_FDT is not set
-+# CONFIG_ENV_APPEND is not set
-+# CONFIG_ENV_WRITEABLE_LIST is not set
-+# CONFIG_ENV_ACCESS_IGNORE_FORCE is not set
-+# CONFIG_USE_BOOTFILE is not set
-+# CONFIG_USE_ETHPRIME is not set
-+# CONFIG_USE_HOSTNAME is not set
-+# CONFIG_VERSION_VARIABLE is not set
-+CONFIG_NET=y
-+CONFIG_ARP_TIMEOUT=5000
-+CONFIG_NET_RETRY_COUNT=5
-+CONFIG_PROT_UDP=y
-+CONFIG_BOOTDEV_ETH=y
-+# CONFIG_BOOTP_SEND_HOSTNAME is not set
-+CONFIG_NET_RANDOM_ETHADDR=y
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_IP_DEFRAG is not set
-+# CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set
-+CONFIG_TFTP_BLOCKSIZE=1468
-+# CONFIG_TFTP_PORT is not set
-+CONFIG_TFTP_WINDOWSIZE=1
-+# CONFIG_TFTP_TSIZE is not set
-+# CONFIG_SERVERIP_FROM_PROXYDHCP is not set
-+CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100
-+# CONFIG_KEEP_SERVERADDR is not set
-+# CONFIG_UDP_CHECKSUM is not set
-+# CONFIG_BOOTP_SERVERIP is not set
-+CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
-+# CONFIG_USE_GATEWAYIP is not set
-+# CONFIG_USE_IPADDR is not set
-+# CONFIG_USE_NETMASK is not set
-+# CONFIG_USE_ROOTPATH is not set
-+# CONFIG_USE_SERVERIP is not set
-+# CONFIG_PROT_TCP is not set
-+# CONFIG_IPV6 is not set
-+CONFIG_SYS_RX_ETH_BUFFER=4
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_DM=y
-+# CONFIG_DM_WARN is not set
-+# CONFIG_DM_DEBUG is not set
-+# CONFIG_DM_STATS is not set
-+CONFIG_DM_DEVICE_REMOVE=y
-+CONFIG_DM_EVENT=y
-+CONFIG_DM_STDIO=y
-+CONFIG_DM_SEQ_ALIAS=y
-+# CONFIG_DM_DMA is not set
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+# CONFIG_DEVRES is not set
-+CONFIG_SIMPLE_BUS=y
-+# CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set
-+# CONFIG_SIMPLE_PM_BUS is not set
-+CONFIG_OF_TRANSLATE=y
-+# CONFIG_TRANSLATION_OFFSET is not set
-+CONFIG_DM_DEV_READ_INLINE=y
-+# CONFIG_OFNODE_MULTI_TREE is not set
-+# CONFIG_BOUNCE_BUFFER is not set
-+# CONFIG_ADC is not set
-+# CONFIG_ADC_EXYNOS is not set
-+# CONFIG_ADC_SANDBOX is not set
-+# CONFIG_SARADC_MESON is not set
-+# CONFIG_SARADC_ROCKCHIP is not set
-+# CONFIG_SATA is not set
-+# CONFIG_SCSI_AHCI is not set
-+
-+#
-+# SATA/SCSI device support
-+#
-+# CONFIG_AXI is not set
-+
-+#
-+# Bus devices
-+#
-+CONFIG_BLK=y
-+CONFIG_BLOCK_CACHE=y
-+# CONFIG_BLKMAP is not set
-+# CONFIG_EFI_MEDIA is not set
-+# CONFIG_IDE is not set
-+# CONFIG_LBA48 is not set
-+# CONFIG_SYS_64BIT_LBA is not set
-+# CONFIG_RKMTD is not set
-+# CONFIG_BOOTCOUNT_LIMIT is not set
-+
-+#
-+# Button Support
-+#
-+CONFIG_BUTTON=y
-+# CONFIG_BUTTON_ADC is not set
-+CONFIG_BUTTON_GPIO=y
-+
-+#
-+# Cache Controller drivers
-+#
-+# CONFIG_CACHE is not set
-+# CONFIG_L2X0_CACHE is not set
-+# CONFIG_V5L2_CACHE is not set
-+# CONFIG_NCORE_CACHE is not set
-+# CONFIG_SIFIVE_CCACHE is not set
-+
-+#
-+# Clock
-+#
-+CONFIG_CLK=y
-+# CONFIG_CLK_CCF is not set
-+# CONFIG_CLK_GPIO is not set
-+# CONFIG_CLK_CDCE9XX is not set
-+# CONFIG_CLK_ICS8N3QV01 is not set
-+# CONFIG_CLK_K210 is not set
-+# CONFIG_CLK_MPC83XX is not set
-+# CONFIG_CLK_XLNX_CLKWZRD is not set
-+# CONFIG_CLK_AT91 is not set
-+# CONFIG_CLK_RCAR is not set
-+# CONFIG_CLK_RCAR_CPG_LIB is not set
-+# CONFIG_CLK_SIFIVE is not set
-+# CONFIG_CLK_TI_AM3_DPLL is not set
-+# CONFIG_CLK_TI_CTRL is not set
-+# CONFIG_CLK_TI_GATE is not set
-+# CONFIG_CLK_K3 is not set
-+CONFIG_CPU=y
-+# CONFIG_CPU_IMX is not set
-+
-+#
-+# Hardware crypto devices
-+#
-+# CONFIG_DM_HASH is not set
-+# CONFIG_FSL_CAAM is not set
-+CONFIG_CAAM_64BIT=y
-+# CONFIG_SYS_FSL_SEC_BE is not set
-+# CONFIG_SYS_FSL_SEC_LE is not set
-+# CONFIG_NPCM_AES is not set
-+# CONFIG_NPCM_SHA is not set
-+# CONFIG_DDR_SPD is not set
-+# CONFIG_IMX_SNPS_DDR_PHY is not set
-+
-+#
-+# Demo for driver model
-+#
-+# CONFIG_DM_DEMO is not set
-+
-+#
-+# DFU support
-+#
-+
-+#
-+# DMA Support
-+#
-+# CONFIG_DMA is not set
-+# CONFIG_DMA_LPC32XX is not set
-+# CONFIG_TI_EDMA3 is not set
-+# CONFIG_DMA_LEGACY is not set
-+
-+#
-+# Extcon Support
-+#
-+# CONFIG_EXTCON is not set
-+
-+#
-+# Fastboot support
-+#
-+# CONFIG_UDP_FUNCTION_FASTBOOT is not set
-+# CONFIG_TCP_FUNCTION_FASTBOOT is not set
-+CONFIG_FIRMWARE=y
-+CONFIG_ARM_PSCI_FW=y
-+# CONFIG_ZYNQMP_FIRMWARE is not set
-+# CONFIG_ARM_SMCCC_FEATURES is not set
-+# CONFIG_ARM_FFA_TRANSPORT is not set
-+# CONFIG_SCMI_FIRMWARE is not set
-+# CONFIG_DM_FUZZING_ENGINE is not set
-+
-+#
-+# FPGA support
-+#
-+# CONFIG_FPGA_ALTERA is not set
-+# CONFIG_FPGA_SOCFPGA is not set
-+# CONFIG_FPGA_LATTICE is not set
-+# CONFIG_FPGA_XILINX is not set
-+# CONFIG_DM_FPGA is not set
-+# CONFIG_FWU_MDATA is not set
-+CONFIG_GPIO=y
-+CONFIG_GPIO_HOG=y
-+# CONFIG_DM_GPIO_LOOKUP_LABEL is not set
-+# CONFIG_ALTERA_PIO is not set
-+# CONFIG_BCM2835_GPIO is not set
-+# CONFIG_DWAPB_GPIO is not set
-+# CONFIG_AT91_GPIO is not set
-+# CONFIG_ATMEL_PIO4 is not set
-+# CONFIG_ASPEED_GPIO is not set
-+# CONFIG_DA8XX_GPIO is not set
-+# CONFIG_HIKEY_GPIO is not set
-+# CONFIG_INTEL_BROADWELL_GPIO is not set
-+# CONFIG_INTEL_GPIO is not set
-+# CONFIG_INTEL_ICH6_GPIO is not set
-+# CONFIG_IMX_RGPIO2P is not set
-+# CONFIG_IPROC_GPIO is not set
-+# CONFIG_HSDK_CREG_GPIO is not set
-+# CONFIG_KIRKWOOD_GPIO is not set
-+# CONFIG_LPC32XX_GPIO is not set
-+# CONFIG_MCP230XX_GPIO is not set
-+# CONFIG_MSM_GPIO is not set
-+# CONFIG_MXC_GPIO is not set
-+# CONFIG_MXS_GPIO is not set
-+# CONFIG_NPCM_GPIO is not set
-+# CONFIG_CMD_PCA953X is not set
-+# CONFIG_ROCKCHIP_GPIO is not set
-+# CONFIG_XILINX_GPIO is not set
-+# CONFIG_TCA642X is not set
-+# CONFIG_TEGRA_GPIO is not set
-+# CONFIG_TEGRA186_GPIO is not set
-+# CONFIG_VYBRID_GPIO is not set
-+# CONFIG_SIFIVE_GPIO is not set
-+# CONFIG_ZYNQ_GPIO is not set
-+# CONFIG_DM_74X164 is not set
-+# CONFIG_PCA953X is not set
-+# CONFIG_MPC8XXX_GPIO is not set
-+# CONFIG_MPC8XX_GPIO is not set
-+# CONFIG_NX_GPIO is not set
-+# CONFIG_NOMADIK_GPIO is not set
-+# CONFIG_ZYNQMP_GPIO_MODEPIN is not set
-+# CONFIG_SLG7XL45106_I2C_GPO is not set
-+# CONFIG_TURRIS_OMNIA_MCU is not set
-+# CONFIG_FTGPIO010 is not set
-+
-+#
-+# Hardware Spinlock Support
-+#
-+# CONFIG_DM_HWSPINLOCK is not set
-+CONFIG_I2C=y
-+# CONFIG_DM_I2C is not set
-+# CONFIG_SYS_I2C_LEGACY is not set
-+# CONFIG_SPL_SYS_I2C_LEGACY is not set
-+# CONFIG_SYS_I2C_FSL is not set
-+# CONFIG_SYS_I2C_DW is not set
-+# CONFIG_SYS_I2C_IMX_LPI2C is not set
-+# CONFIG_SYS_I2C_MTK is not set
-+# CONFIG_SYS_I2C_MICROCHIP is not set
-+# CONFIG_SYS_I2C_MXC is not set
-+# CONFIG_SYS_I2C_NPCM is not set
-+# CONFIG_SYS_I2C_SOFT is not set
-+# CONFIG_SYS_I2C_MV is not set
-+# CONFIG_SYS_I2C_MVTWSI is not set
-+CONFIG_INPUT=y
-+# CONFIG_DM_KEYBOARD is not set
-+# CONFIG_CROS_EC_KEYB is not set
-+# CONFIG_TEGRA_KEYBOARD is not set
-+# CONFIG_TWL4030_INPUT is not set
-+
-+#
-+# IOMMU device drivers
-+#
-+# CONFIG_IOMMU is not set
-+
-+#
-+# LED Support
-+#
-+CONFIG_LED=y
-+# CONFIG_LED_PWM is not set
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_LED_STATUS is not set
-+
-+#
-+# Mailbox Controller Support
-+#
-+# CONFIG_DM_MAILBOX is not set
-+
-+#
-+# Memory Controller drivers
-+#
-+# CONFIG_MEMORY is not set
-+# CONFIG_ATMEL_EBI is not set
-+# CONFIG_MFD_ATMEL_SMC is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MISC is not set
-+# CONFIG_NVMEM is not set
-+# CONFIG_SPL_NVMEM is not set
-+# CONFIG_SMSC_LPC47M is not set
-+# CONFIG_SMSC_SIO1007 is not set
-+# CONFIG_CROS_EC is not set
-+# CONFIG_DS4510 is not set
-+# CONFIG_FSL_SEC_MON is not set
-+# CONFIG_IRQ is not set
-+# CONFIG_NPCM_HOST is not set
-+# CONFIG_NUVOTON_NCT6102D is not set
-+# CONFIG_PWRSEQ is not set
-+# CONFIG_PCA9551_LED is not set
-+# CONFIG_TEST_DRV is not set
-+# CONFIG_USB_HUB_USB251XB is not set
-+# CONFIG_TWL4030_LED is not set
-+# CONFIG_WINBOND_W83627 is not set
-+# CONFIG_FS_LOADER is not set
-+
-+#
-+# MMC Host controller Support
-+#
-+# CONFIG_MMC is not set
-+# CONFIG_MMC_BROKEN_CD is not set
-+# CONFIG_DM_MMC is not set
-+# CONFIG_FSL_ESDHC is not set
-+# CONFIG_FSL_ESDHC_IMX is not set
-+
-+#
-+# MTD Support
-+#
-+CONFIG_MTD_PARTITIONS=y
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+# CONFIG_MTD_NOR_FLASH is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_SYS_MTDPARTS_RUNTIME is not set
-+# CONFIG_FLASH_CFI_DRIVER is not set
-+# CONFIG_CFI_FLASH is not set
-+# CONFIG_ALTERA_QSPI is not set
-+# CONFIG_HBMC_AM654 is not set
-+# CONFIG_SAMSUNG_ONENAND is not set
-+# CONFIG_USE_SYS_MAX_FLASH_BANKS is not set
-+CONFIG_MTD_NAND_CORE=y
-+# CONFIG_MTD_RAW_NAND is not set
-+CONFIG_MTD_SPI_NAND=y
-+
-+#
-+# SPI Flash Support
-+#
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SF_DEFAULT_BUS=0
-+CONFIG_SF_DEFAULT_CS=0
-+# CONFIG_BOOTDEV_SPI_FLASH is not set
-+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-+CONFIG_SPI_FLASH_SMART_HWCAPS=y
-+# CONFIG_SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT is not set
-+# CONFIG_SPI_FLASH_SOFT_RESET is not set
-+# CONFIG_SPI_FLASH_BAR is not set
-+CONFIG_SPI_FLASH_LOCK=y
-+CONFIG_SPI_FLASH_UNLOCK_ALL=y
-+# CONFIG_SPI_FLASH_ATMEL is not set
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_ISSI=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+# CONFIG_SPI_FLASH_S28HX_T is not set
-+CONFIG_SPI_FLASH_STMICRO=y
-+# CONFIG_SPI_FLASH_MT35XU is not set
-+# CONFIG_SPI_FLASH_SST is not set
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_XTX=y
-+# CONFIG_SPI_FLASH_ZBIT is not set
-+CONFIG_SPI_FLASH_USE_4K_SECTORS=y
-+# CONFIG_SPI_FLASH_DATAFLASH is not set
-+CONFIG_SPI_FLASH_MTD=y
-+
-+#
-+# UBI support
-+#
-+CONFIG_UBI_SILENCE_MSG=y
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_MODULE=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_LIMIT=20
-+# CONFIG_MTD_UBI_FASTMAP is not set
-+# CONFIG_NVMXIP is not set
-+# CONFIG_NVMXIP_QSPI is not set
-+# CONFIG_NMBM is not set
-+
-+#
-+# Multiplexer drivers
-+#
-+# CONFIG_MULTIPLEXER is not set
-+# CONFIG_BITBANGMII is not set
-+# CONFIG_MV88E6352_SWITCH is not set
-+CONFIG_PHYLIB=y
-+# CONFIG_PHY_ADDR_ENABLE is not set
-+# CONFIG_B53_SWITCH is not set
-+# CONFIG_MV88E61XX_SWITCH is not set
-+# CONFIG_PHYLIB_10G is not set
-+# CONFIG_PHY_ADIN is not set
-+# CONFIG_PHY_AIROHA is not set
-+# CONFIG_PHY_AQUANTIA is not set
-+# CONFIG_PHY_ATHEROS is not set
-+# CONFIG_SPL_PHY_ATHEROS is not set
-+# CONFIG_PHY_BROADCOM is not set
-+# CONFIG_PHY_CORTINA is not set
-+# CONFIG_PHY_DAVICOM is not set
-+# CONFIG_PHY_ET1011C is not set
-+# CONFIG_PHY_LXT is not set
-+# CONFIG_PHY_MARVELL is not set
-+# CONFIG_PHY_MARVELL_10G is not set
-+# CONFIG_PHY_MESON_GXL is not set
-+# CONFIG_PHY_MICREL is not set
-+# CONFIG_PHY_MOTORCOMM is not set
-+# CONFIG_PHY_MSCC is not set
-+# CONFIG_PHY_NATSEMI is not set
-+# CONFIG_PHY_NXP_C45_TJA11XX is not set
-+# CONFIG_PHY_NXP_TJA11XX is not set
-+# CONFIG_PHY_REALTEK is not set
-+# CONFIG_PHY_SMSC is not set
-+# CONFIG_PHY_TERANETICS is not set
-+# CONFIG_PHY_TI is not set
-+# CONFIG_PHY_TI_DP83867 is not set
-+# CONFIG_PHY_TI_DP83869 is not set
-+# CONFIG_PHY_TI_GENERIC is not set
-+# CONFIG_PHY_VITESSE is not set
-+# CONFIG_PHY_XILINX is not set
-+# CONFIG_PHY_XILINX_GMII2RGMII is not set
-+# CONFIG_PHY_XWAY is not set
-+# CONFIG_PHY_ETHERNET_ID is not set
-+CONFIG_PHY_FIXED=y
-+# CONFIG_PHY_NCSI is not set
-+# CONFIG_FSL_MEMAC is not set
-+CONFIG_PHY_RESET_DELAY=0
-+# CONFIG_FSL_PFE is not set
-+CONFIG_ETH=y
-+CONFIG_DM_ETH=y
-+# CONFIG_DM_MDIO is not set
-+# CONFIG_DM_ETH_PHY is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_PHY_GIGE is not set
-+# CONFIG_ALTERA_TSE is not set
-+# CONFIG_BCM_SF2_ETH is not set
-+# CONFIG_BCMGENET is not set
-+# CONFIG_BNXT_ETH is not set
-+# CONFIG_CALXEDA_XGMAC is not set
-+# CONFIG_DRIVER_DM9000 is not set
-+# CONFIG_DWC_ETH_QOS is not set
-+# CONFIG_EEPRO100 is not set
-+# CONFIG_ETH_DESIGNWARE is not set
-+# CONFIG_ETH_DESIGNWARE_MESON8B is not set
-+# CONFIG_ETHOC is not set
-+# CONFIG_FMAN_ENET is not set
-+# CONFIG_FTMAC100 is not set
-+# CONFIG_FTGMAC100 is not set
-+# CONFIG_MCFFEC is not set
-+# CONFIG_FSLDMAFEC is not set
-+# CONFIG_KS8851_MLL is not set
-+# CONFIG_LITEETH is not set
-+# CONFIG_MACB is not set
-+# CONFIG_NET_NPCM750 is not set
-+# CONFIG_PCH_GBE is not set
-+# CONFIG_RGMII is not set
-+# CONFIG_MII is not set
-+# CONFIG_RMII is not set
-+# CONFIG_PCNET is not set
-+# CONFIG_QE_UEC is not set
-+# CONFIG_RTL8139 is not set
-+# CONFIG_SMC911X is not set
-+# CONFIG_SUN7I_GMAC is not set
-+# CONFIG_SUN4I_EMAC is not set
-+# CONFIG_SUN8I_EMAC is not set
-+# CONFIG_SH_ETHER is not set
-+# CONFIG_DRIVER_TI_CPSW is not set
-+# CONFIG_DRIVER_TI_EMAC is not set
-+# CONFIG_DRIVER_TI_KEYSTONE_NET is not set
-+# CONFIG_TULIP is not set
-+# CONFIG_XILINX_AXIEMAC is not set
-+# CONFIG_VSC7385_ENET is not set
-+# CONFIG_XILINX_EMACLITE is not set
-+# CONFIG_ZYNQ_GEM is not set
-+# CONFIG_SYS_DPAA_QBMAN is not set
-+# CONFIG_TSEC_ENET is not set
-+CONFIG_MEDIATEK_ETH=y
-+# CONFIG_HIFEMAC_ETH is not set
-+# CONFIG_HIGMACV300_ETH is not set
-+# CONFIG_NVME is not set
-+# CONFIG_NVME_APPLE is not set
-+
-+#
-+# PCI Endpoint
-+#
-+# CONFIG_PCI_ENDPOINT is not set
-+# CONFIG_X86_PCH7 is not set
-+# CONFIG_X86_PCH9 is not set
-+
-+#
-+# PHY Subsystem
-+#
-+CONFIG_PHY=y
-+# CONFIG_NOP_PHY is not set
-+# CONFIG_MIPI_DPHY_HELPERS is not set
-+# CONFIG_BCM_SR_PCIE_PHY is not set
-+# CONFIG_OMAP_USB2_PHY is not set
-+CONFIG_PHY_MTK_TPHY=y
-+
-+#
-+# Rockchip PHY driver
-+#
-+# CONFIG_PHY_CADENCE_SIERRA is not set
-+# CONFIG_PHY_CADENCE_TORRENT is not set
-+# CONFIG_MSM8916_USB_PHY is not set
-+# CONFIG_MVEBU_COMPHY_SUPPORT is not set
-+
-+#
-+# Pin controllers
-+#
-+CONFIG_PINCTRL=y
-+CONFIG_PINCTRL_FULL=y
-+CONFIG_PINCTRL_GENERIC=y
-+CONFIG_PINMUX=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCONF_RECURSIVE=y
-+# CONFIG_PINCTRL_AT91 is not set
-+# CONFIG_PINCTRL_AT91PIO4 is not set
-+# CONFIG_PINCTRL_INTEL is not set
-+# CONFIG_PINCTRL_QE is not set
-+# CONFIG_PINCTRL_ROCKCHIP_RV1108 is not set
-+# CONFIG_PINCTRL_SINGLE is not set
-+# CONFIG_PINCTRL_STM32 is not set
-+# CONFIG_PINCTRL_STMFX is not set
-+# CONFIG_PINCTRL_K210 is not set
-+CONFIG_PINCTRL_MTK=y
-+# CONFIG_PINCTRL_MT7622 is not set
-+# CONFIG_PINCTRL_MT7623 is not set
-+# CONFIG_PINCTRL_MT7629 is not set
-+CONFIG_PINCTRL_MT7981=y
-+# CONFIG_PINCTRL_MT7986 is not set
-+# CONFIG_PINCTRL_MT7988 is not set
-+# CONFIG_PINCTRL_MT8512 is not set
-+# CONFIG_PINCTRL_MT8516 is not set
-+# CONFIG_PINCTRL_MT8518 is not set
-+CONFIG_POWER=y
-+# CONFIG_POWER_LEGACY is not set
-+# CONFIG_ACPI_PMC is not set
-+
-+#
-+# Power Domain Support
-+#
-+CONFIG_POWER_DOMAIN=y
-+# CONFIG_APPLE_PMGR_POWER_DOMAIN is not set
-+CONFIG_MTK_POWER_DOMAIN=y
-+# CONFIG_DM_PMIC is not set
-+# CONFIG_PMIC_TPS65217 is not set
-+# CONFIG_POWER_TPS65218 is not set
-+# CONFIG_POWER_TPS62362 is not set
-+# CONFIG_DM_REGULATOR is not set
-+# CONFIG_TPS6586X_POWER is not set
-+# CONFIG_POWER_MT6323 is not set
-+CONFIG_DM_PWM=y
-+# CONFIG_PWM_ASPEED is not set
-+# CONFIG_PWM_CADENCE_TTC is not set
-+# CONFIG_PWM_CROS_EC is not set
-+# CONFIG_PWM_EXYNOS is not set
-+# CONFIG_PWM_IMX is not set
-+# CONFIG_PWM_MESON is not set
-+CONFIG_PWM_MTK=y
-+# CONFIG_PWM_ROCKCHIP is not set
-+# CONFIG_PWM_SANDBOX is not set
-+# CONFIG_PWM_SIFIVE is not set
-+# CONFIG_PWM_TEGRA is not set
-+# CONFIG_PWM_SUNXI is not set
-+# CONFIG_U_QE is not set
-+# CONFIG_RAM is not set
-+
-+#
-+# Reboot Mode Support
-+#
-+# CONFIG_DM_REBOOT_MODE is not set
-+
-+#
-+# Remote Processor drivers
-+#
-+
-+#
-+# Reset Controller Support
-+#
-+# CONFIG_RESET_AST2500 is not set
-+# CONFIG_RESET_AST2600 is not set
-+CONFIG_RESET_MEDIATEK=y
-+# CONFIG_RESET_HISILICON is not set
-+# CONFIG_RESET_SYSCON is not set
-+# CONFIG_RESET_SCMI is not set
-+# CONFIG_RESET_DRA7 is not set
-+# CONFIG_DM_RNG is not set
-+
-+#
-+# Real Time Clock
-+#
-+# CONFIG_DM_RTC is not set
-+# CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set
-+# CONFIG_RTC_DS1337 is not set
-+# CONFIG_RTC_DS1338 is not set
-+# CONFIG_RTC_DS1374 is not set
-+# CONFIG_RTC_DS3231 is not set
-+# CONFIG_RTC_PCF8563 is not set
-+# CONFIG_RTC_PT7C4338 is not set
-+# CONFIG_RTC_PL031 is not set
-+# CONFIG_RTC_S35392A is not set
-+# CONFIG_RTC_MC13XXX is not set
-+# CONFIG_RTC_MC146818 is not set
-+# CONFIG_RTC_M41T62 is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_DM_SCSI is not set
-+CONFIG_SERIAL=y
-+CONFIG_BAUDRATE=115200
-+# CONFIG_DEFAULT_ENV_IS_RW is not set
-+CONFIG_REQUIRE_SERIAL_CONSOLE=y
-+# CONFIG_SPECIFY_CONSOLE_INDEX is not set
-+CONFIG_SERIAL_PRESENT=y
-+CONFIG_DM_SERIAL=y
-+# CONFIG_SERIAL_RX_BUFFER is not set
-+# CONFIG_SERIAL_PUTS is not set
-+# CONFIG_SERIAL_SEARCH_ALL is not set
-+# CONFIG_SERIAL_PROBE_ALL is not set
-+# CONFIG_VPL_DM_SERIAL is not set
-+CONFIG_DEBUG_UART_MTK=y
-+CONFIG_DEBUG_UART_SHIFT=0
-+# CONFIG_DEBUG_UART_ANNOUNCE is not set
-+# CONFIG_DEBUG_UART_SKIP_INIT is not set
-+# CONFIG_ALTERA_JTAG_UART is not set
-+# CONFIG_ALTERA_UART is not set
-+# CONFIG_ARC_SERIAL is not set
-+# CONFIG_ARM_DCC is not set
-+# CONFIG_ATMEL_USART is not set
-+# CONFIG_BCM6345_SERIAL is not set
-+# CONFIG_COREBOOT_SERIAL is not set
-+# CONFIG_CORTINA_UART is not set
-+# CONFIG_FSL_LINFLEXUART is not set
-+# CONFIG_FSL_LPUART is not set
-+# CONFIG_MVEBU_A3700_UART is not set
-+# CONFIG_MCFUART is not set
-+# CONFIG_NULLDEV_SERIAL is not set
-+# CONFIG_SYS_NS16550 is not set
-+# CONFIG_PL01X_SERIAL is not set
-+# CONFIG_ROCKCHIP_SERIAL is not set
-+# CONFIG_XILINX_UARTLITE is not set
-+# CONFIG_MSM_SERIAL is not set
-+# CONFIG_MSM_GENI_SERIAL is not set
-+# CONFIG_MXS_AUART_SERIAL is not set
-+# CONFIG_OMAP_SERIAL is not set
-+# CONFIG_SIFIVE_SERIAL is not set
-+# CONFIG_ZYNQ_SERIAL is not set
-+CONFIG_MTK_SERIAL=y
-+# CONFIG_MT7620_SERIAL is not set
-+# CONFIG_NPCM_SERIAL is not set
-+# CONFIG_SM is not set
-+# CONFIG_MESON_SM is not set
-+# CONFIG_SMEM is not set
-+
-+#
-+# Sound support
-+#
-+# CONFIG_SOUND is not set
-+
-+#
-+# SOC (System On Chip) specific Drivers
-+#
-+# CONFIG_SOC_DEVICE is not set
-+# CONFIG_SOC_TI is not set
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_SPI_MEM=y
-+# CONFIG_SPI_DIRMAP is not set
-+# CONFIG_ALTERA_SPI is not set
-+# CONFIG_APPLE_SPI is not set
-+# CONFIG_ATCSPI200_SPI is not set
-+# CONFIG_ATMEL_SPI is not set
-+# CONFIG_BCMSTB_SPI is not set
-+# CONFIG_CORTINA_SFLASH is not set
-+# CONFIG_CADENCE_QSPI is not set
-+# CONFIG_CF_SPI is not set
-+# CONFIG_DESIGNWARE_SPI is not set
-+# CONFIG_EXYNOS_SPI is not set
-+# CONFIG_FSL_DSPI is not set
-+# CONFIG_FSL_QSPI is not set
-+# CONFIG_GXP_SPI is not set
-+# CONFIG_ICH_SPI is not set
-+# CONFIG_IPROC_QSPI is not set
-+# CONFIG_KIRKWOOD_SPI is not set
-+# CONFIG_MICROCHIP_COREQSPI is not set
-+# CONFIG_MPC8XXX_SPI is not set
-+# CONFIG_MTK_SNOR is not set
-+# CONFIG_MTK_SNFI_SPI is not set
-+CONFIG_MTK_SPIM=y
-+# CONFIG_MVEBU_A3700_SPI is not set
-+# CONFIG_MXS_SPI is not set
-+# CONFIG_SPI_MXIC is not set
-+# CONFIG_NPCM_FIU_SPI is not set
-+# CONFIG_NPCM_PSPI is not set
-+# CONFIG_NXP_FSPI is not set
-+# CONFIG_OMAP3_SPI is not set
-+# CONFIG_PL022_SPI is not set
-+# CONFIG_ROCKCHIP_SFC is not set
-+# CONFIG_ROCKCHIP_SPI is not set
-+# CONFIG_SPI_ASPEED_SMC is not set
-+# CONFIG_SPI_SIFIVE is not set
-+# CONFIG_SOFT_SPI is not set
-+# CONFIG_SPI_SN_F_OSPI is not set
-+# CONFIG_SPI_SUNXI is not set
-+# CONFIG_TEGRA114_SPI is not set
-+# CONFIG_TEGRA20_SFLASH is not set
-+# CONFIG_TEGRA20_SLINK is not set
-+# CONFIG_TEGRA210_QSPI is not set
-+# CONFIG_TI_QSPI is not set
-+# CONFIG_XILINX_SPI is not set
-+# CONFIG_ZYNQ_SPI is not set
-+# CONFIG_ZYNQ_QSPI is not set
-+# CONFIG_ZYNQMP_GQSPI is not set
-+# CONFIG_SH_QSPI is not set
-+# CONFIG_MXC_SPI is not set
-+
-+#
-+# SPMI support
-+#
-+# CONFIG_SPMI is not set
-+# CONFIG_SYSINFO is not set
-+
-+#
-+# System reset device drivers
-+#
-+# CONFIG_SYSRESET is not set
-+# CONFIG_TEE is not set
-+# CONFIG_DM_THERMAL is not set
-+
-+#
-+# Timer Support
-+#
-+# CONFIG_TIMER is not set
-+
-+#
-+# TPM support
-+#
-+CONFIG_USB=y
-+CONFIG_DM_USB=y
-+# CONFIG_DM_USB_GADGET is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+# CONFIG_USB_XHCI_DWC3 is not set
-+# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
-+CONFIG_USB_XHCI_MTK=y
-+# CONFIG_USB_XHCI_FSL is not set
-+# CONFIG_USB_XHCI_BRCM is not set
-+# CONFIG_USB_EHCI_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_DWC2 is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+# CONFIG_USB_ISP1760 is not set
-+# CONFIG_USB_CDNS3 is not set
-+# CONFIG_USB_DWC3 is not set
-+# CONFIG_USB_MTU3 is not set
-+
-+#
-+# Legacy MUSB Support
-+#
-+# CONFIG_USB_MUSB_HCD is not set
-+# CONFIG_USB_MUSB_UDC is not set
-+
-+#
-+# MUSB Controller Driver
-+#
-+# CONFIG_USB_MUSB_HOST is not set
-+# CONFIG_USB_MUSB_PIO_ONLY is not set
-+
-+#
-+# USB Phy
-+#
-+# CONFIG_TWL4030_USB is not set
-+# CONFIG_ROCKCHIP_USB2_PHY is not set
-+
-+#
-+# ULPI drivers
-+#
-+
-+#
-+# USB peripherals
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_KEYBOARD is not set
-+# CONFIG_USB_ONBOARD_HUB is not set
-+CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
-+# CONFIG_USB_HOST_ETHER is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_SPL_USB_GADGET is not set
-+
-+#
-+# UFS Host Controller Support
-+#
-+# CONFIG_TI_J721E_UFS is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VIDEO is not set
-+
-+#
-+# VirtIO Drivers
-+#
-+# CONFIG_VIRTIO_MMIO is not set
-+
-+#
-+# 1-Wire support
-+#
-+# CONFIG_W1 is not set
-+
-+#
-+# 1-wire EEPROM support
-+#
-+# CONFIG_W1_EEPROM is not set
-+
-+#
-+# Watchdog Timer Support
-+#
-+# CONFIG_WATCHDOG is not set
-+CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
-+# CONFIG_IMX_WATCHDOG is not set
-+# CONFIG_ULP_WATCHDOG is not set
-+# CONFIG_WDT is not set
-+# CONFIG_PHYS_TO_BUS is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_FS_BTRFS is not set
-+# CONFIG_FS_CBFS is not set
-+# CONFIG_FS_EXT4 is not set
-+CONFIG_FS_FAT=y
-+CONFIG_FAT_WRITE=y
-+CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
-+# CONFIG_FS_JFFS2 is not set
-+CONFIG_UBIFS_SILENCE_MSG=y
-+CONFIG_UBIFS_SILENCE_DEBUG_DUMP=y
-+# CONFIG_FS_CRAMFS is not set
-+# CONFIG_YAFFS2 is not set
-+# CONFIG_FS_SQUASHFS is not set
-+# CONFIG_FS_EROFS is not set
-+
-+#
-+# Library routines
-+#
-+# CONFIG_ADDR_MAP is not set
-+# CONFIG_SYS_TIMER_COUNTS_DOWN is not set
-+# CONFIG_PHYSMEM is not set
-+# CONFIG_BCH is not set
-+# CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
-+CONFIG_CHARSET=y
-+# CONFIG_DYNAMIC_CRC_TABLE is not set
-+CONFIG_LIB_UUID=y
-+# CONFIG_SEMIHOSTING is not set
-+CONFIG_PRINTF=y
-+CONFIG_SPRINTF=y
-+CONFIG_STRTO=y
-+CONFIG_SYS_HZ=1000
-+# CONFIG_PANIC_HANG is not set
-+CONFIG_REGEX=y
-+CONFIG_LIB_RAND=y
-+# CONFIG_LIB_HW_RAND is not set
-+CONFIG_SUPPORT_ACPI=y
-+# CONFIG_ACPI is not set
-+CONFIG_RBTREE=y
-+# CONFIG_BITREVERSE is not set
-+# CONFIG_TRACE is not set
-+# CONFIG_CIRCBUF is not set
-+# CONFIG_CMD_DHRYSTONE is not set
-+
-+#
-+# Security support
-+#
-+# CONFIG_AES is not set
-+# CONFIG_ECDSA is not set
-+# CONFIG_RSA is not set
-+# CONFIG_TPM is not set
-+
-+#
-+# Android Verified Boot
-+#
-+
-+#
-+# Hashing Support
-+#
-+# CONFIG_BLAKE2 is not set
-+CONFIG_SHA1=y
-+CONFIG_SHA256=y
-+# CONFIG_SHA512 is not set
-+# CONFIG_SHA384 is not set
-+# CONFIG_SHA_HW_ACCEL is not set
-+CONFIG_MD5=y
-+CONFIG_CRC8=y
-+CONFIG_CRC32=y
-+
-+#
-+# Compression Support
-+#
-+# CONFIG_LZ4 is not set
-+CONFIG_LZMA=y
-+CONFIG_LZO=y
-+CONFIG_GZIP=y
-+# CONFIG_ZLIB_UNCOMPRESS is not set
-+# CONFIG_BZIP2 is not set
-+CONFIG_ZLIB=y
-+# CONFIG_ZSTD is not set
-+CONFIG_VPL_LZMA=y
-+# CONFIG_SPL_GZIP is not set
-+# CONFIG_ERRNO_STR is not set
-+CONFIG_HEXDUMP=y
-+# CONFIG_GETOPT is not set
-+CONFIG_OF_LIBFDT=y
-+CONFIG_OF_LIBFDT_ASSUME_MASK=0x0
-+CONFIG_SYS_FDT_PAD=0x3000
-+
-+#
-+# System tables
-+#
-+CONFIG_GENERATE_SMBIOS_TABLE=y
-+# CONFIG_LIB_RATIONAL is not set
-+CONFIG_SMBIOS=y
-+# CONFIG_SMBIOS_PARSER is not set
-+CONFIG_EFI_LOADER=y
-+CONFIG_CMD_BOOTEFI_BOOTMGR=y
-+CONFIG_EFI_VARIABLE_FILE_STORE=y
-+# CONFIG_EFI_VARIABLE_NO_STORE is not set
-+# CONFIG_EFI_VARIABLES_PRESEED is not set
-+CONFIG_EFI_VAR_BUF_SIZE=131072
-+# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
-+# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
-+CONFIG_EFI_CAPSULE_MAX=15
-+CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-+CONFIG_EFI_DEVICE_PATH_UTIL=y
-+CONFIG_EFI_DT_FIXUP=y
-+CONFIG_EFI_LOADER_HII=y
-+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-+CONFIG_EFI_UNICODE_CAPITALIZATION=y
-+# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
-+CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
-+CONFIG_EFI_HAVE_RUNTIME_RESET=y
-+CONFIG_EFI_LOAD_FILE2_INITRD=y
-+CONFIG_EFI_ECPT=y
-+CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
-+# CONFIG_OPTEE_LIB is not set
-+# CONFIG_OPTEE_IMAGE is not set
-+# CONFIG_BOOTM_OPTEE is not set
-+# CONFIG_TEST_FDTDEC is not set
-+CONFIG_LIB_ELF=y
-+CONFIG_LMB=y
-+CONFIG_LMB_USE_MAX_REGIONS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+# CONFIG_PHANDLE_CHECK_SEQ is not set
-+
-+#
-+# Testing
-+#
-+# CONFIG_UNIT_TEST is not set
-+# CONFIG_POST is not set
-+
-+#
-+# Tools options
-+#
-+CONFIG_MKIMAGE_DTC_PATH="dtc"
-+CONFIG_TOOLS_CRC32=y
-+# CONFIG_TOOLS_LIBCRYPTO is not set
-+CONFIG_TOOLS_FIT=y
-+CONFIG_TOOLS_FIT_FULL_CHECK=y
-+CONFIG_TOOLS_FIT_PRINT=y
-+CONFIG_TOOLS_FIT_RSASSA_PSS=y
-+CONFIG_TOOLS_FIT_SIGNATURE=y
-+CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE=0x10000000
-+CONFIG_TOOLS_FIT_VERBOSE=y
-+CONFIG_TOOLS_MD5=y
-+CONFIG_TOOLS_OF_LIBFDT=y
-+CONFIG_TOOLS_SHA1=y
-+CONFIG_TOOLS_SHA256=y
-+CONFIG_TOOLS_SHA384=y
-+CONFIG_TOOLS_SHA512=y
-+# CONFIG_TOOLS_MKEFICAPSULE is not set
-+# CONFIG_FSPI_CONF_HEADER is not set
-+# CONFIG_TOOLS_MKFWUMDATA is not set
---- /dev/null
-+++ b/configs/mt7981_openwrt-one-spi-nand_defconfig
-@@ -0,0 +1,1815 @@
-+#
-+# Automatically generated file; DO NOT EDIT.
-+# U-Boot 2024.01 Configuration
-+#
-+
-+#
-+# Compiler: aarch64-openwrt-linux-musl-gcc (OpenWrt GCC 12.3.0 r25206+8-d5e2177a6b) 12.3.0
-+#
-+CONFIG_CREATE_ARCH_SYMLINK=y
-+CONFIG_SYS_CACHE_SHIFT_6=y
-+CONFIG_SYS_CACHELINE_SIZE=64
-+CONFIG_LINKER_LIST_ALIGN=8
-+# CONFIG_ARC is not set
-+CONFIG_ARM=y
-+# CONFIG_M68K is not set
-+# CONFIG_MICROBLAZE is not set
-+# CONFIG_MIPS is not set
-+# CONFIG_NIOS2 is not set
-+# CONFIG_PPC is not set
-+# CONFIG_RISCV is not set
-+# CONFIG_SANDBOX is not set
-+# CONFIG_SH is not set
-+# CONFIG_X86 is not set
-+# CONFIG_XTENSA is not set
-+CONFIG_SYS_ARCH="arm"
-+CONFIG_SYS_CPU="armv8"
-+CONFIG_SYS_SOC="mediatek"
-+CONFIG_SYS_VENDOR="mediatek"
-+CONFIG_SYS_BOARD="mt7981"
-+CONFIG_SYS_CONFIG_NAME="mt7981"
-+
-+#
-+# Skipping low level initialization functions
-+#
-+# CONFIG_SKIP_LOWLEVEL_INIT is not set
-+# CONFIG_SKIP_LOWLEVEL_INIT_ONLY is not set
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_SYS_NONCACHED_MEMORY=0x100000
-+# CONFIG_SYS_ICACHE_OFF is not set
-+# CONFIG_SYS_DCACHE_OFF is not set
-+
-+#
-+# ARM architecture
-+#
-+CONFIG_ARM64=y
-+CONFIG_ARM64_CRC32=y
-+CONFIG_COUNTER_FREQUENCY=0
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_INIT_SP_RELATIVE=y
-+CONFIG_SYS_INIT_SP_BSS_OFFSET=524288
-+# CONFIG_GIC_V3_ITS is not set
-+CONFIG_STATIC_RELA=y
-+CONFIG_DMA_ADDR_T_64BIT=y
-+CONFIG_GPIO_EXTRA_HEADER=y
-+CONFIG_ARM_ASM_UNIFIED=y
-+# CONFIG_SYS_ARM_CACHE_CP15 is not set
-+# CONFIG_SYS_ARM_MMU is not set
-+# CONFIG_SYS_ARM_MPU is not set
-+CONFIG_SYS_ARM_ARCH=8
-+CONFIG_SYS_ARM_CACHE_WRITEBACK=y
-+# CONFIG_SYS_ARM_CACHE_WRITETHROUGH is not set
-+# CONFIG_SYS_ARM_CACHE_WRITEALLOC is not set
-+# CONFIG_ARCH_CPU_INIT is not set
-+CONFIG_SYS_ARCH_TIMER=y
-+CONFIG_ARM_SMCCC=y
-+# CONFIG_SYS_L2_PL310 is not set
-+# CONFIG_SPL_SYS_L2_PL310 is not set
-+# CONFIG_SYS_L2CACHE_OFF is not set
-+# CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK is not set
-+# CONFIG_USE_ARCH_MEMCPY is not set
-+# CONFIG_USE_ARCH_MEMSET is not set
-+CONFIG_ARM64_SUPPORT_AARCH32=y
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_HISTB is not set
-+# CONFIG_ARCH_KIRKWOOD is not set
-+# CONFIG_ARCH_MVEBU is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_TARGET_STV0991 is not set
-+# CONFIG_ARCH_BCM283X is not set
-+# CONFIG_ARCH_BCMSTB is not set
-+# CONFIG_ARCH_BCMBCA is not set
-+# CONFIG_TARGET_VEXPRESS_CA9X4 is not set
-+# CONFIG_TARGET_BCMNS is not set
-+# CONFIG_TARGET_BCMNS2 is not set
-+# CONFIG_TARGET_BCMNS3 is not set
-+# CONFIG_ARCH_EXYNOS is not set
-+# CONFIG_ARCH_S5PC1XX is not set
-+# CONFIG_ARCH_HIGHBANK is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_IPQ40XX is not set
-+# CONFIG_ARCH_KEYSTONE is not set
-+# CONFIG_ARCH_K3 is not set
-+# CONFIG_ARCH_OMAP2PLUS is not set
-+# CONFIG_ARCH_MESON is not set
-+CONFIG_ARCH_MEDIATEK=y
-+# CONFIG_ARCH_LPC32XX is not set
-+# CONFIG_ARCH_IMX8 is not set
-+# CONFIG_ARCH_IMX8M is not set
-+# CONFIG_ARCH_IMX8ULP is not set
-+# CONFIG_ARCH_IMX9 is not set
-+# CONFIG_ARCH_IMXRT is not set
-+# CONFIG_ARCH_MX23 is not set
-+# CONFIG_ARCH_MX28 is not set
-+# CONFIG_ARCH_MX31 is not set
-+# CONFIG_ARCH_MX7ULP is not set
-+# CONFIG_ARCH_MX7 is not set
-+# CONFIG_ARCH_MX6 is not set
-+# CONFIG_ARCH_MX5 is not set
-+# CONFIG_ARCH_NEXELL is not set
-+# CONFIG_ARCH_NPCM is not set
-+# CONFIG_ARCH_APPLE is not set
-+# CONFIG_ARCH_OWL is not set
-+# CONFIG_ARCH_QEMU is not set
-+# CONFIG_ARCH_RMOBILE is not set
-+# CONFIG_ARCH_SNAPDRAGON is not set
-+# CONFIG_ARCH_SOCFPGA is not set
-+# CONFIG_ARCH_SUNXI is not set
-+# CONFIG_ARCH_U8500 is not set
-+# CONFIG_ARCH_VERSAL is not set
-+# CONFIG_ARCH_VERSAL_NET is not set
-+# CONFIG_ARCH_VF610 is not set
-+# CONFIG_ARCH_ZYNQ is not set
-+# CONFIG_ARCH_ZYNQMP_R5 is not set
-+# CONFIG_ARCH_ZYNQMP is not set
-+# CONFIG_ARCH_TEGRA is not set
-+# CONFIG_ARCH_VEXPRESS64 is not set
-+# CONFIG_TARGET_CORSTONE1000 is not set
-+# CONFIG_TARGET_TOTAL_COMPUTE is not set
-+# CONFIG_TARGET_LS2080A_EMU is not set
-+# CONFIG_TARGET_LS1088AQDS is not set
-+# CONFIG_TARGET_LS2080AQDS is not set
-+# CONFIG_TARGET_LS2080ARDB is not set
-+# CONFIG_TARGET_LS2081ARDB is not set
-+# CONFIG_TARGET_LX2160ARDB is not set
-+# CONFIG_TARGET_LX2160AQDS is not set
-+# CONFIG_TARGET_LX2162AQDS is not set
-+# CONFIG_TARGET_HIKEY is not set
-+# CONFIG_TARGET_HIKEY960 is not set
-+# CONFIG_TARGET_POPLAR is not set
-+# CONFIG_TARGET_LS1012AQDS is not set
-+# CONFIG_TARGET_LS1012ARDB is not set
-+# CONFIG_TARGET_LS1012A2G5RDB is not set
-+# CONFIG_TARGET_LS1012AFRWY is not set
-+# CONFIG_TARGET_LS1012AFRDM is not set
-+# CONFIG_TARGET_LS1028AQDS is not set
-+# CONFIG_TARGET_LS1028ARDB is not set
-+# CONFIG_TARGET_LS1088ARDB is not set
-+# CONFIG_TARGET_LS1021AQDS is not set
-+# CONFIG_TARGET_LS1021ATWR is not set
-+# CONFIG_TARGET_PG_WCOM_SELI8 is not set
-+# CONFIG_TARGET_PG_WCOM_EXPU1 is not set
-+# CONFIG_TARGET_LS1021ATSN is not set
-+# CONFIG_TARGET_LS1021AIOT is not set
-+# CONFIG_TARGET_LS1043AQDS is not set
-+# CONFIG_TARGET_LS1043ARDB is not set
-+# CONFIG_TARGET_LS1046AQDS is not set
-+# CONFIG_TARGET_LS1046ARDB is not set
-+# CONFIG_TARGET_LS1046AFRWY is not set
-+# CONFIG_TARGET_SL28 is not set
-+# CONFIG_TARGET_TEN64 is not set
-+# CONFIG_ARCH_UNIPHIER is not set
-+# CONFIG_ARCH_SYNQUACER is not set
-+# CONFIG_ARCH_STM32 is not set
-+# CONFIG_ARCH_STI is not set
-+# CONFIG_ARCH_STM32MP is not set
-+# CONFIG_ARCH_ROCKCHIP is not set
-+# CONFIG_ARCH_OCTEONTX is not set
-+# CONFIG_ARCH_OCTEONTX2 is not set
-+# CONFIG_TARGET_THUNDERX_88XX is not set
-+# CONFIG_ARCH_ASPEED is not set
-+# CONFIG_TARGET_DURIAN is not set
-+# CONFIG_TARGET_POMELO is not set
-+# CONFIG_TARGET_PRESIDIO_ASIC is not set
-+# CONFIG_TARGET_XENGUEST_ARM64 is not set
-+# CONFIG_ARCH_GXP is not set
-+# CONFIG_STATIC_MACH_TYPE is not set
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_LEN=0x400000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_ENV_SOURCE_FILE=""
-+CONFIG_SF_DEFAULT_SPEED=1000000
-+CONFIG_SF_DEFAULT_MODE=0x0
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_DM_GPIO=y
-+CONFIG_DEFAULT_DEVICE_TREE="openwrt-one"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
-+CONFIG_DM_RESET=y
-+CONFIG_SYS_MONITOR_LEN=0
-+# CONFIG_MT8512 is not set
-+# CONFIG_TARGET_MT7622 is not set
-+# CONFIG_TARGET_MT7623 is not set
-+# CONFIG_TARGET_MT7629 is not set
-+CONFIG_TARGET_MT7981=y
-+# CONFIG_TARGET_MT7986 is not set
-+# CONFIG_TARGET_MT7988 is not set
-+# CONFIG_TARGET_MT8183 is not set
-+# CONFIG_TARGET_MT8512 is not set
-+# CONFIG_TARGET_MT8516 is not set
-+# CONFIG_TARGET_MT8518 is not set
-+CONFIG_MTK_BROM_HEADER_INFO="media=snand;nandinfo=2k+64"
-+CONFIG_RESET_BUTTON_LABEL="back"
-+CONFIG_RESET_BUTTON_SETTLE_DELAY=0
-+CONFIG_ERR_PTR_OFFSET=0x0
-+# CONFIG_SPL is not set
-+CONFIG_BOOTSTAGE_STASH_ADDR=0x0
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+# CONFIG_DEBUG_UART_BOARD_INIT is not set
-+CONFIG_IDENT_STRING=""
-+CONFIG_SYS_CLK_FREQ=0
-+# CONFIG_CHIP_DIP_SCAN is not set
-+# CONFIG_CMO_BY_VA_ONLY is not set
-+# CONFIG_ARMV8_MULTIENTRY is not set
-+# CONFIG_ARMV8_SET_SMPEN is not set
-+# CONFIG_ARMV8_SWITCH_TO_EL1 is not set
-+
-+#
-+# ARMv8 secure monitor firmware
-+#
-+# CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT is not set
-+CONFIG_PSCI_RESET=y
-+# CONFIG_ARMV8_PSCI is not set
-+# CONFIG_ARMV8_EA_EL3_FIRST is not set
-+# CONFIG_ARMV8_CRYPTO is not set
-+# CONFIG_CMD_DEKBLOB is not set
-+# CONFIG_IMX_CAAM_DEK_ENCAP is not set
-+# CONFIG_IMX_OPTEE_DEK_ENCAP is not set
-+# CONFIG_IMX_SECO_DEK_ENCAP is not set
-+# CONFIG_IMX_ELE_DEK_ENCAP is not set
-+# CONFIG_CMD_HDMIDETECT is not set
-+CONFIG_IMX_DCD_ADDR=0x00910000
-+CONFIG_SYS_MEM_TOP_HIDE=0x0
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+
-+#
-+# ARM debug
-+#
-+CONFIG_BUILD_TARGET=""
-+# CONFIG_PCI is not set
-+CONFIG_FWU_NUM_BANKS=2
-+CONFIG_FWU_NUM_IMAGES_PER_BANK=2
-+CONFIG_DEBUG_UART=y
-+# CONFIG_AHCI is not set
-+# CONFIG_OF_BOARD_FIXUP is not set
-+
-+#
-+# Functionality shared between NXP SoCs
-+#
-+# CONFIG_NXP_ESBC is not set
-+
-+#
-+# General setup
-+#
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+CONFIG_CC_IS_GCC=y
-+CONFIG_GCC_VERSION=120300
-+CONFIG_CLANG_VERSION=0
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
-+# CONFIG_CC_OPTIMIZE_FOR_DEBUG is not set
-+# CONFIG_OPTIMIZE_INLINING is not set
-+CONFIG_ARCH_SUPPORTS_LTO=y
-+# CONFIG_LTO is not set
-+CONFIG_CC_HAS_ASM_INLINE=y
-+# CONFIG_XEN is not set
-+# CONFIG_ENV_VARS_UBOOT_CONFIG is not set
-+# CONFIG_SYS_BOOT_GET_CMDLINE is not set
-+# CONFIG_SYS_BOOT_GET_KBD is not set
-+CONFIG_SYS_MALLOC_F=y
-+# CONFIG_VALGRIND is not set
-+CONFIG_EXPERT=y
-+CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
-+# CONFIG_SYS_MALLOC_DEFAULT_TO_INIT is not set
-+# CONFIG_TOOLS_DEBUG is not set
-+CONFIG_PHYS_64BIT=y
-+CONFIG_FDT_64BIT=y
-+# CONFIG_REMAKE_ELF is not set
-+# CONFIG_HAS_BOARD_SIZE_LIMIT is not set
-+# CONFIG_SYS_CUSTOM_LDSCRIPT is not set
-+CONFIG_PLATFORM_ELFENTRY="_start"
-+CONFIG_STACK_SIZE=0x1000000
-+CONFIG_SYS_SRAM_BASE=0x0
-+CONFIG_SYS_SRAM_SIZE=0x0
-+# CONFIG_MP is not set
-+CONFIG_HAVE_TEXT_BASE=y
-+# CONFIG_HAVE_SYS_UBOOT_START is not set
-+CONFIG_SYS_UBOOT_START=0x41e00000
-+# CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
-+# CONFIG_API is not set
-+
-+#
-+# Boot options
-+#
-+
-+#
-+# Boot images
-+#
-+# CONFIG_ANDROID_BOOT_IMAGE is not set
-+# CONFIG_TIMESTAMP is not set
-+CONFIG_FIT=y
-+CONFIG_FIT_EXTERNAL_OFFSET=0x0
-+CONFIG_FIT_FULL_CHECK=y
-+# CONFIG_FIT_SIGNATURE is not set
-+# CONFIG_FIT_CIPHER is not set
-+# CONFIG_FIT_VERBOSE is not set
-+# CONFIG_FIT_BEST_MATCH is not set
-+CONFIG_FIT_PRINT=y
-+# CONFIG_SPL_LOAD_FIT_FULL is not set
-+CONFIG_PXE_UTILS=y
-+CONFIG_BOOTSTD=y
-+# CONFIG_BOOTSTD_FULL is not set
-+# CONFIG_BOOTSTD_DEFAULTS is not set
-+CONFIG_BOOTSTD_BOOTCOMMAND=y
-+CONFIG_BOOTMETH_GLOBAL=y
-+# CONFIG_BOOTMETH_CROS is not set
-+CONFIG_BOOTMETH_EXTLINUX=y
-+CONFIG_BOOTMETH_EXTLINUX_PXE=y
-+CONFIG_BOOTMETH_EFILOADER=y
-+CONFIG_BOOTMETH_VBE=y
-+CONFIG_BOOTMETH_VBE_REQUEST=y
-+CONFIG_BOOTMETH_VBE_SIMPLE=y
-+CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
-+# CONFIG_BOOTMETH_SCRIPT is not set
-+CONFIG_LEGACY_IMAGE_FORMAT=y
-+# CONFIG_SUPPORT_RAW_INITRD is not set
-+# CONFIG_CHROMEOS is not set
-+# CONFIG_CHROMEOS_VBOOT is not set
-+# CONFIG_RAMBOOT_PBL is not set
-+CONFIG_SYS_BOOT_RAMDISK_HIGH=y
-+# CONFIG_DISTRO_DEFAULTS is not set
-+
-+#
-+# Boot timing
-+#
-+# CONFIG_BOOTSTAGE is not set
-+CONFIG_BOOTSTAGE_STASH_SIZE=0x1000
-+# CONFIG_SHOW_BOOT_PROGRESS is not set
-+
-+#
-+# Boot media
-+#
-+CONFIG_NAND_BOOT=y
-+# CONFIG_ONENAND_BOOT is not set
-+# CONFIG_QSPI_BOOT is not set
-+# CONFIG_SATA_BOOT is not set
-+# CONFIG_SD_BOOT is not set
-+# CONFIG_SD_BOOT_QSPI is not set
-+CONFIG_SPI_BOOT=y
-+
-+#
-+# Autoboot options
-+#
-+CONFIG_AUTOBOOT=y
-+CONFIG_BOOTDELAY=2
-+# CONFIG_AUTOBOOT_KEYED is not set
-+# CONFIG_AUTOBOOT_USE_MENUKEY is not set
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+# CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE is not set
-+# CONFIG_BOOT_RETRY is not set
-+
-+#
-+# Image support
-+#
-+# CONFIG_IMAGE_PRE_LOAD is not set
-+
-+#
-+# Devicetree fixup
-+#
-+# CONFIG_OF_BOARD_SETUP is not set
-+# CONFIG_OF_SYSTEM_SETUP is not set
-+# CONFIG_OF_STDOUT_VIA_ALIAS is not set
-+# CONFIG_FDT_FIXUP_PARTITIONS is not set
-+# CONFIG_FDT_SIMPLEFB is not set
-+CONFIG_ARCH_FIXUP_FDT_MEMORY=y
-+# CONFIG_USE_BOOTARGS is not set
-+# CONFIG_BOOTARGS_SUBST is not set
-+# CONFIG_USE_BOOTCOMMAND is not set
-+CONFIG_USE_PREBOOT=y
-+CONFIG_DEFAULT_FDT_FILE="openwrt-one"
-+# CONFIG_SAVE_PREV_BL_FDT_ADDR is not set
-+# CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR is not set
-+
-+#
-+# Configuration editor
-+#
-+# CONFIG_CEDIT is not set
-+
-+#
-+# Console
-+#
-+CONFIG_MENU=y
-+# CONFIG_CONSOLE_RECORD is not set
-+# CONFIG_DISABLE_CONSOLE is not set
-+CONFIG_LOGLEVEL=7
-+# CONFIG_SILENT_CONSOLE is not set
-+# CONFIG_SPL_SILENT_CONSOLE is not set
-+# CONFIG_TPL_SILENT_CONSOLE is not set
-+# CONFIG_PRE_CONSOLE_BUFFER is not set
-+CONFIG_CONSOLE_FLUSH_SUPPORT=y
-+# CONFIG_CONSOLE_FLUSH_ON_NEWLINE is not set
-+# CONFIG_CONSOLE_MUX is not set
-+# CONFIG_SYS_CONSOLE_IS_IN_ENV is not set
-+# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
-+# CONFIG_SYS_CONSOLE_INFO_QUIET is not set
-+# CONFIG_SYS_STDIO_DEREGISTER is not set
-+# CONFIG_SPL_SYS_STDIO_DEREGISTER is not set
-+# CONFIG_SYS_DEVICE_NULLDEV is not set
-+
-+#
-+# Logging
-+#
-+CONFIG_LOG=y
-+CONFIG_LOG_MAX_LEVEL=6
-+CONFIG_LOG_DEFAULT_LEVEL=6
-+CONFIG_LOG_CONSOLE=y
-+# CONFIG_LOGF_FILE is not set
-+# CONFIG_LOGF_LINE is not set
-+# CONFIG_LOGF_FUNC is not set
-+CONFIG_LOGF_FUNC_PAD=20
-+# CONFIG_LOG_SYSLOG is not set
-+# CONFIG_LOG_ERROR_RETURN is not set
-+
-+#
-+# Init options
-+#
-+# CONFIG_BOARD_TYPES is not set
-+CONFIG_DISPLAY_CPUINFO=y
-+CONFIG_DISPLAY_BOARDINFO=y
-+# CONFIG_DISPLAY_BOARDINFO_LATE is not set
-+
-+#
-+# Start-up hooks
-+#
-+# CONFIG_CYCLIC is not set
-+CONFIG_EVENT=y
-+CONFIG_EVENT_DYNAMIC=y
-+# CONFIG_EVENT_DEBUG is not set
-+# CONFIG_ARCH_MISC_INIT is not set
-+# CONFIG_BOARD_EARLY_INIT_F is not set
-+# CONFIG_BOARD_EARLY_INIT_R is not set
-+# CONFIG_BOARD_POSTCLK_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+# CONFIG_CLOCKS is not set
-+# CONFIG_HWCONFIG is not set
-+CONFIG_LAST_STAGE_INIT=y
-+# CONFIG_MISC_INIT_R is not set
-+# CONFIG_SYS_MALLOC_BOOTPARAMS is not set
-+# CONFIG_ID_EEPROM is not set
-+# CONFIG_RESET_PHY_R is not set
-+
-+#
-+# Security support
-+#
-+CONFIG_HASH=y
-+# CONFIG_STACKPROTECTOR is not set
-+# CONFIG_BOARD_RNG_SEED is not set
-+
-+#
-+# Update support
-+#
-+# CONFIG_UPDATE_TFTP is not set
-+# CONFIG_ANDROID_AB is not set
-+
-+#
-+# Blob list
-+#
-+# CONFIG_BLOBLIST is not set
-+CONFIG_SUPPORT_SPL=y
-+# CONFIG_VPL is not set
-+
-+#
-+# Command line interface
-+#
-+CONFIG_CMDLINE=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_CMDLINE_EDITING=y
-+# CONFIG_CMDLINE_PS_SUPPORT is not set
-+CONFIG_AUTO_COMPLETE=y
-+CONFIG_SYS_LONGHELP=y
-+CONFIG_SYS_PROMPT="OpenWrt One> "
-+CONFIG_SYS_PROMPT_HUSH_PS2="> "
-+CONFIG_SYS_MAXARGS=16
-+CONFIG_SYS_CBSIZE=512
-+CONFIG_SYS_PBSIZE=1049
-+CONFIG_SYS_XTRACE=y
-+CONFIG_BUILD_BIN2C=y
-+
-+#
-+# Commands
-+#
-+
-+#
-+# Info commands
-+#
-+CONFIG_CMD_BDI=y
-+# CONFIG_CMD_BDINFO_EXTRA is not set
-+# CONFIG_CMD_CONFIG is not set
-+CONFIG_CMD_CONSOLE=y
-+CONFIG_CMD_CPU=y
-+# CONFIG_CMD_HISTORY is not set
-+CONFIG_CMD_LICENSE=y
-+# CONFIG_CMD_PMC is not set
-+
-+#
-+# Boot commands
-+#
-+CONFIG_CMD_BOOTD=y
-+CONFIG_CMD_BOOTM=y
-+# CONFIG_CMD_BOOTDEV is not set
-+CONFIG_CMD_BOOTFLOW=y
-+# CONFIG_CMD_BOOTMETH is not set
-+CONFIG_BOOTM_EFI=y
-+# CONFIG_CMD_BOOTZ is not set
-+CONFIG_CMD_BOOTI=y
-+CONFIG_BOOTM_LINUX=y
-+# CONFIG_BOOTM_NETBSD is not set
-+# CONFIG_BOOTM_OPENRTOS is not set
-+# CONFIG_BOOTM_OSE is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_CMD_VBE is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+CONFIG_SYS_BOOTM_LEN=0x4000000
-+CONFIG_CMD_BOOTEFI=y
-+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-+# CONFIG_CMD_BOOTEFI_HELLO is not set
-+# CONFIG_CMD_BOOTEFI_SELFTEST is not set
-+CONFIG_CMD_BOOTMENU=y
-+# CONFIG_CMD_ADTIMG is not set
-+CONFIG_CMD_ELF=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_GO=y
-+CONFIG_CMD_RUN=y
-+CONFIG_CMD_IMI=y
-+# CONFIG_CMD_IMLS is not set
-+CONFIG_CMD_XIMG=y
-+# CONFIG_CMD_ZBOOT is not set
-+
-+#
-+# Environment commands
-+#
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_EXPORTENV=y
-+CONFIG_CMD_IMPORTENV=y
-+CONFIG_CMD_EDITENV=y
-+# CONFIG_CMD_GREPENV is not set
-+CONFIG_CMD_SAVEENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_EXISTS=y
-+CONFIG_CMD_ENV_READMEM=y
-+# CONFIG_CMD_ENV_CALLBACK is not set
-+CONFIG_CMD_ENV_FLAGS=y
-+# CONFIG_CMD_NVEDIT_EFI is not set
-+# CONFIG_CMD_NVEDIT_INDIRECT is not set
-+# CONFIG_CMD_NVEDIT_INFO is not set
-+# CONFIG_CMD_NVEDIT_LOAD is not set
-+# CONFIG_CMD_NVEDIT_SELECT is not set
-+
-+#
-+# Memory commands
-+#
-+# CONFIG_CMD_BINOP is not set
-+# CONFIG_CMD_BLOBLIST is not set
-+CONFIG_CMD_CRC32=y
-+# CONFIG_CRC32_VERIFY is not set
-+# CONFIG_CMD_EEPROM is not set
-+# CONFIG_LOOPW is not set
-+# CONFIG_CMD_MD5SUM is not set
-+# CONFIG_CMD_MEMINFO is not set
-+CONFIG_CMD_MEMORY=y
-+# CONFIG_CMD_MEM_SEARCH is not set
-+# CONFIG_CMD_MX_CYCLIC is not set
-+CONFIG_CMD_RANDOM=y
-+# CONFIG_CMD_MEMTEST is not set
-+# CONFIG_CMD_SHA1SUM is not set
-+CONFIG_CMD_STRINGS=y
-+
-+#
-+# Compression commands
-+#
-+CONFIG_CMD_LZMADEC=y
-+# CONFIG_CMD_UNLZ4 is not set
-+# CONFIG_CMD_UNZIP is not set
-+# CONFIG_CMD_ZIP is not set
-+
-+#
-+# Device access commands
-+#
-+# CONFIG_CMD_ARMFLASH is not set
-+# CONFIG_CMD_BIND is not set
-+# CONFIG_CMD_CLK is not set
-+# CONFIG_CMD_DEMO is not set
-+# CONFIG_CMD_DFU is not set
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_FLASH=y
-+# CONFIG_CMD_FPGAD is not set
-+# CONFIG_CMD_FUSE is not set
-+CONFIG_CMD_GPIO=y
-+# CONFIG_CMD_GPIO_READ is not set
-+CONFIG_CMD_PWM=y
-+# CONFIG_CMD_GPT is not set
-+# CONFIG_RANDOM_UUID is not set
-+# CONFIG_CMD_IDE is not set
-+# CONFIG_CMD_IO is not set
-+# CONFIG_CMD_IOTRACE is not set
-+# CONFIG_CMD_I2C is not set
-+CONFIG_CMD_LOADB=y
-+# CONFIG_CMD_LOADM is not set
-+CONFIG_CMD_LOADS=y
-+# CONFIG_LOADS_ECHO is not set
-+# CONFIG_CMD_SAVES is not set
-+# CONFIG_SYS_LOADS_BAUD_CHANGE is not set
-+CONFIG_CMD_LOADXY_TIMEOUT=90
-+# CONFIG_CMD_LSBLK is not set
-+# CONFIG_CMD_MBR is not set
-+# CONFIG_CMD_CLONE is not set
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND_EXT=y
-+# CONFIG_CMD_ONENAND is not set
-+# CONFIG_CMD_OSD is not set
-+# CONFIG_CMD_PART is not set
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PINMUX=y
-+# CONFIG_CMD_POWEROFF is not set
-+# CONFIG_CMD_READ is not set
-+# CONFIG_CMD_SATA is not set
-+# CONFIG_CMD_SDRAM is not set
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_SF_TEST=y
-+# CONFIG_CMD_SPI is not set
-+# CONFIG_CMD_TSI148 is not set
-+# CONFIG_CMD_UNIVERSE is not set
-+CONFIG_CMD_USB=y
-+# CONFIG_CMD_USB_SDP is not set
-+# CONFIG_CMD_RKMTD is not set
-+# CONFIG_CMD_WRITE is not set
-+
-+#
-+# Shell scripting commands
-+#
-+# CONFIG_CMD_CAT is not set
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_SETEXPR=y
-+# CONFIG_CMD_SETEXPR_FMT is not set
-+# CONFIG_CMD_XXD is not set
-+
-+#
-+# Android support commands
-+#
-+CONFIG_CMD_NET=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_DHCP=y
-+# CONFIG_BOOTP_MAY_FAIL is not set
-+CONFIG_BOOTP_BOOTPATH=y
-+# CONFIG_BOOTP_VENDOREX is not set
-+# CONFIG_BOOTP_BOOTFILESIZE is not set
-+CONFIG_BOOTP_DNS=y
-+# CONFIG_BOOTP_DNS2 is not set
-+CONFIG_BOOTP_GATEWAY=y
-+CONFIG_BOOTP_HOSTNAME=y
-+# CONFIG_BOOTP_PREFER_SERVERIP is not set
-+CONFIG_BOOTP_SUBNETMASK=y
-+# CONFIG_BOOTP_NISDOMAIN is not set
-+# CONFIG_BOOTP_NTPSERVER is not set
-+# CONFIG_BOOTP_TIMEOFFSET is not set
-+# CONFIG_CMD_PCAP is not set
-+CONFIG_BOOTP_PXE=y
-+CONFIG_BOOTP_PXE_CLIENTARCH=0x16
-+# CONFIG_BOOTP_PXE_DHCP_OPTION is not set
-+CONFIG_BOOTP_VCI_STRING="U-Boot.armv8"
-+CONFIG_CMD_TFTPBOOT=y
-+# CONFIG_CMD_TFTPPUT is not set
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_NET_TFTP_VARS=y
-+CONFIG_CMD_RARP=y
-+# CONFIG_CMD_NFS is not set
-+# CONFIG_SYS_DISABLE_AUTOLOAD is not set
-+# CONFIG_CMD_WGET is not set
-+# CONFIG_CMD_MII is not set
-+# CONFIG_CMD_MDIO is not set
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_LINK_LOCAL=y
-+# CONFIG_CMD_ETHSW is not set
-+CONFIG_CMD_PXE=y
-+# CONFIG_CMD_WOL is not set
-+
-+#
-+# Misc commands
-+#
-+# CONFIG_CMD_2048 is not set
-+# CONFIG_CMD_BSP is not set
-+CONFIG_CMD_BLOCK_CACHE=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+# CONFIG_CMD_CONITRACE is not set
-+# CONFIG_CMD_CLS is not set
-+# CONFIG_CMD_EFIDEBUG is not set
-+CONFIG_CMD_EFICONFIG=y
-+# CONFIG_CMD_EXCEPTION is not set
-+CONFIG_CMD_LED=y
-+# CONFIG_CMD_INI is not set
-+# CONFIG_CMD_DATE is not set
-+# CONFIG_CMD_TIME is not set
-+# CONFIG_CMD_GETTIME is not set
-+# CONFIG_CMD_PAUSE is not set
-+CONFIG_CMD_SLEEP=y
-+# CONFIG_CMD_TIMER is not set
-+# CONFIG_CMD_SYSBOOT is not set
-+# CONFIG_CMD_QFW is not set
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_PSTORE_MEM_SIZE=0x10000
-+CONFIG_CMD_PSTORE_RECORD_SIZE=0x1000
-+CONFIG_CMD_PSTORE_CONSOLE_SIZE=0x1000
-+CONFIG_CMD_PSTORE_FTRACE_SIZE=0x1000
-+CONFIG_CMD_PSTORE_PMSG_SIZE=0x1000
-+CONFIG_CMD_PSTORE_ECC_SIZE=0
-+# CONFIG_CMD_TERMINAL is not set
-+CONFIG_CMD_UUID=y
-+
-+#
-+# TI specific command line interface
-+#
-+
-+#
-+# Power commands
-+#
-+
-+#
-+# Security commands
-+#
-+# CONFIG_CMD_AES is not set
-+# CONFIG_CMD_BLOB is not set
-+CONFIG_CMD_HASH=y
-+# CONFIG_CMD_HVC is not set
-+CONFIG_CMD_SMC=y
-+# CONFIG_HASH_VERIFY is not set
-+
-+#
-+# Firmware commands
-+#
-+
-+#
-+# Filesystem commands
-+#
-+# CONFIG_CMD_BTRFS is not set
-+# CONFIG_CMD_EROFS is not set
-+# CONFIG_CMD_EXT2 is not set
-+# CONFIG_CMD_EXT4 is not set
-+CONFIG_CMD_FAT=y
-+# CONFIG_CMD_SQUASHFS is not set
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+# CONFIG_CMD_JFFS2 is not set
-+# CONFIG_CMD_MTDPARTS is not set
-+CONFIG_MTDIDS_DEFAULT=""
-+CONFIG_MTDPARTS_DEFAULT=""
-+# CONFIG_CMD_REISER is not set
-+# CONFIG_CMD_ZFS is not set
-+
-+#
-+# Debug commands
-+#
-+# CONFIG_CMD_DIAG is not set
-+# CONFIG_CMD_EVENT is not set
-+# CONFIG_CMD_LOG is not set
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITIONS=y
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_DOS_PARTITION=y
-+# CONFIG_ISO_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+CONFIG_PARTITION_UUIDS=y
-+CONFIG_SUPPORT_OF_CONTROL=y
-+
-+#
-+# Device Tree Control
-+#
-+CONFIG_OF_CONTROL=y
-+CONFIG_OF_REAL=y
-+# CONFIG_OF_LIVE is not set
-+CONFIG_OF_SEPARATE=y
-+# CONFIG_OF_EMBED is not set
-+# CONFIG_OF_BOARD is not set
-+# CONFIG_OF_OMIT_DTB is not set
-+CONFIG_DEVICE_TREE_INCLUDES=""
-+CONFIG_OF_LIST="openwrt-one"
-+# CONFIG_MULTI_DTB_FIT is not set
-+CONFIG_OF_TAG_MIGRATE=y
-+# CONFIG_OF_DTB_PROPS_REMOVE is not set
-+
-+#
-+# Environment
-+#
-+CONFIG_ENV_SUPPORT=y
-+CONFIG_SAVEENV=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_MIN_ENTRIES=64
-+CONFIG_ENV_MAX_ENTRIES=512
-+# CONFIG_ENV_IS_NOWHERE is not set
-+# CONFIG_ENV_IS_IN_EEPROM is not set
-+# CONFIG_ENV_IS_IN_FAT is not set
-+# CONFIG_ENV_IS_IN_EXT4 is not set
-+# CONFIG_ENV_IS_IN_FLASH is not set
-+# CONFIG_ENV_IS_IN_MTD is not set
-+# CONFIG_ENV_IS_IN_NAND is not set
-+# CONFIG_ENV_IS_IN_NVRAM is not set
-+# CONFIG_ENV_IS_IN_ONENAND is not set
-+# CONFIG_ENV_IS_IN_REMOTE is not set
-+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+# CONFIG_ENV_UBI_VOLUME_CREATE is not set
-+CONFIG_ENV_UBI_VID_OFFSET=0
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_DEFAULT_ENV_FILE="openwrt-one-spi-nand_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+# CONFIG_ENV_IMPORT_FDT is not set
-+# CONFIG_ENV_APPEND is not set
-+# CONFIG_ENV_WRITEABLE_LIST is not set
-+# CONFIG_ENV_ACCESS_IGNORE_FORCE is not set
-+# CONFIG_USE_BOOTFILE is not set
-+# CONFIG_USE_ETHPRIME is not set
-+# CONFIG_USE_HOSTNAME is not set
-+# CONFIG_VERSION_VARIABLE is not set
-+CONFIG_NET=y
-+CONFIG_ARP_TIMEOUT=5000
-+CONFIG_NET_RETRY_COUNT=5
-+CONFIG_PROT_UDP=y
-+CONFIG_BOOTDEV_ETH=y
-+# CONFIG_BOOTP_SEND_HOSTNAME is not set
-+CONFIG_NET_RANDOM_ETHADDR=y
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_IP_DEFRAG is not set
-+# CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set
-+CONFIG_TFTP_BLOCKSIZE=1468
-+# CONFIG_TFTP_PORT is not set
-+CONFIG_TFTP_WINDOWSIZE=1
-+# CONFIG_TFTP_TSIZE is not set
-+# CONFIG_SERVERIP_FROM_PROXYDHCP is not set
-+CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100
-+# CONFIG_KEEP_SERVERADDR is not set
-+# CONFIG_UDP_CHECKSUM is not set
-+# CONFIG_BOOTP_SERVERIP is not set
-+CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
-+# CONFIG_USE_GATEWAYIP is not set
-+# CONFIG_USE_IPADDR is not set
-+# CONFIG_USE_NETMASK is not set
-+# CONFIG_USE_ROOTPATH is not set
-+# CONFIG_USE_SERVERIP is not set
-+# CONFIG_PROT_TCP is not set
-+# CONFIG_IPV6 is not set
-+CONFIG_SYS_RX_ETH_BUFFER=4
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_DM=y
-+# CONFIG_DM_WARN is not set
-+# CONFIG_DM_DEBUG is not set
-+# CONFIG_DM_STATS is not set
-+CONFIG_DM_DEVICE_REMOVE=y
-+CONFIG_DM_EVENT=y
-+CONFIG_DM_STDIO=y
-+CONFIG_DM_SEQ_ALIAS=y
-+# CONFIG_DM_DMA is not set
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+# CONFIG_DEVRES is not set
-+CONFIG_SIMPLE_BUS=y
-+# CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set
-+# CONFIG_SIMPLE_PM_BUS is not set
-+CONFIG_OF_TRANSLATE=y
-+# CONFIG_TRANSLATION_OFFSET is not set
-+CONFIG_DM_DEV_READ_INLINE=y
-+# CONFIG_OFNODE_MULTI_TREE is not set
-+# CONFIG_BOUNCE_BUFFER is not set
-+# CONFIG_ADC is not set
-+# CONFIG_ADC_EXYNOS is not set
-+# CONFIG_ADC_SANDBOX is not set
-+# CONFIG_SARADC_MESON is not set
-+# CONFIG_SARADC_ROCKCHIP is not set
-+# CONFIG_SATA is not set
-+# CONFIG_SCSI_AHCI is not set
-+
-+#
-+# SATA/SCSI device support
-+#
-+# CONFIG_AXI is not set
-+
-+#
-+# Bus devices
-+#
-+CONFIG_BLK=y
-+CONFIG_BLOCK_CACHE=y
-+# CONFIG_BLKMAP is not set
-+# CONFIG_EFI_MEDIA is not set
-+# CONFIG_IDE is not set
-+# CONFIG_LBA48 is not set
-+# CONFIG_SYS_64BIT_LBA is not set
-+# CONFIG_RKMTD is not set
-+# CONFIG_BOOTCOUNT_LIMIT is not set
-+
-+#
-+# Button Support
-+#
-+CONFIG_BUTTON=y
-+# CONFIG_BUTTON_ADC is not set
-+CONFIG_BUTTON_GPIO=y
-+
-+#
-+# Cache Controller drivers
-+#
-+# CONFIG_CACHE is not set
-+# CONFIG_L2X0_CACHE is not set
-+# CONFIG_V5L2_CACHE is not set
-+# CONFIG_NCORE_CACHE is not set
-+# CONFIG_SIFIVE_CCACHE is not set
-+
-+#
-+# Clock
-+#
-+CONFIG_CLK=y
-+# CONFIG_CLK_CCF is not set
-+# CONFIG_CLK_GPIO is not set
-+# CONFIG_CLK_CDCE9XX is not set
-+# CONFIG_CLK_ICS8N3QV01 is not set
-+# CONFIG_CLK_K210 is not set
-+# CONFIG_CLK_MPC83XX is not set
-+# CONFIG_CLK_XLNX_CLKWZRD is not set
-+# CONFIG_CLK_AT91 is not set
-+# CONFIG_CLK_RCAR is not set
-+# CONFIG_CLK_RCAR_CPG_LIB is not set
-+# CONFIG_CLK_SIFIVE is not set
-+# CONFIG_CLK_TI_AM3_DPLL is not set
-+# CONFIG_CLK_TI_CTRL is not set
-+# CONFIG_CLK_TI_GATE is not set
-+# CONFIG_CLK_K3 is not set
-+CONFIG_CPU=y
-+# CONFIG_CPU_IMX is not set
-+
-+#
-+# Hardware crypto devices
-+#
-+# CONFIG_DM_HASH is not set
-+# CONFIG_FSL_CAAM is not set
-+CONFIG_CAAM_64BIT=y
-+# CONFIG_SYS_FSL_SEC_BE is not set
-+# CONFIG_SYS_FSL_SEC_LE is not set
-+# CONFIG_NPCM_AES is not set
-+# CONFIG_NPCM_SHA is not set
-+# CONFIG_DDR_SPD is not set
-+# CONFIG_IMX_SNPS_DDR_PHY is not set
-+
-+#
-+# Demo for driver model
-+#
-+# CONFIG_DM_DEMO is not set
-+
-+#
-+# DFU support
-+#
-+
-+#
-+# DMA Support
-+#
-+# CONFIG_DMA is not set
-+# CONFIG_DMA_LPC32XX is not set
-+# CONFIG_TI_EDMA3 is not set
-+# CONFIG_DMA_LEGACY is not set
-+
-+#
-+# Extcon Support
-+#
-+# CONFIG_EXTCON is not set
-+
-+#
-+# Fastboot support
-+#
-+# CONFIG_UDP_FUNCTION_FASTBOOT is not set
-+# CONFIG_TCP_FUNCTION_FASTBOOT is not set
-+CONFIG_FIRMWARE=y
-+CONFIG_ARM_PSCI_FW=y
-+# CONFIG_ZYNQMP_FIRMWARE is not set
-+# CONFIG_ARM_SMCCC_FEATURES is not set
-+# CONFIG_ARM_FFA_TRANSPORT is not set
-+# CONFIG_SCMI_FIRMWARE is not set
-+# CONFIG_DM_FUZZING_ENGINE is not set
-+
-+#
-+# FPGA support
-+#
-+# CONFIG_FPGA_ALTERA is not set
-+# CONFIG_FPGA_SOCFPGA is not set
-+# CONFIG_FPGA_LATTICE is not set
-+# CONFIG_FPGA_XILINX is not set
-+# CONFIG_DM_FPGA is not set
-+# CONFIG_FWU_MDATA is not set
-+CONFIG_GPIO=y
-+CONFIG_GPIO_HOG=y
-+# CONFIG_DM_GPIO_LOOKUP_LABEL is not set
-+# CONFIG_ALTERA_PIO is not set
-+# CONFIG_BCM2835_GPIO is not set
-+# CONFIG_DWAPB_GPIO is not set
-+# CONFIG_AT91_GPIO is not set
-+# CONFIG_ATMEL_PIO4 is not set
-+# CONFIG_ASPEED_GPIO is not set
-+# CONFIG_DA8XX_GPIO is not set
-+# CONFIG_HIKEY_GPIO is not set
-+# CONFIG_INTEL_BROADWELL_GPIO is not set
-+# CONFIG_INTEL_GPIO is not set
-+# CONFIG_INTEL_ICH6_GPIO is not set
-+# CONFIG_IMX_RGPIO2P is not set
-+# CONFIG_IPROC_GPIO is not set
-+# CONFIG_HSDK_CREG_GPIO is not set
-+# CONFIG_KIRKWOOD_GPIO is not set
-+# CONFIG_LPC32XX_GPIO is not set
-+# CONFIG_MCP230XX_GPIO is not set
-+# CONFIG_MSM_GPIO is not set
-+# CONFIG_MXC_GPIO is not set
-+# CONFIG_MXS_GPIO is not set
-+# CONFIG_NPCM_GPIO is not set
-+# CONFIG_CMD_PCA953X is not set
-+# CONFIG_ROCKCHIP_GPIO is not set
-+# CONFIG_XILINX_GPIO is not set
-+# CONFIG_TCA642X is not set
-+# CONFIG_TEGRA_GPIO is not set
-+# CONFIG_TEGRA186_GPIO is not set
-+# CONFIG_VYBRID_GPIO is not set
-+# CONFIG_SIFIVE_GPIO is not set
-+# CONFIG_ZYNQ_GPIO is not set
-+# CONFIG_DM_74X164 is not set
-+# CONFIG_PCA953X is not set
-+# CONFIG_MPC8XXX_GPIO is not set
-+# CONFIG_MPC8XX_GPIO is not set
-+# CONFIG_NX_GPIO is not set
-+# CONFIG_NOMADIK_GPIO is not set
-+# CONFIG_ZYNQMP_GPIO_MODEPIN is not set
-+# CONFIG_SLG7XL45106_I2C_GPO is not set
-+# CONFIG_TURRIS_OMNIA_MCU is not set
-+# CONFIG_FTGPIO010 is not set
-+
-+#
-+# Hardware Spinlock Support
-+#
-+# CONFIG_DM_HWSPINLOCK is not set
-+CONFIG_I2C=y
-+# CONFIG_DM_I2C is not set
-+# CONFIG_SYS_I2C_LEGACY is not set
-+# CONFIG_SPL_SYS_I2C_LEGACY is not set
-+# CONFIG_SYS_I2C_FSL is not set
-+# CONFIG_SYS_I2C_DW is not set
-+# CONFIG_SYS_I2C_IMX_LPI2C is not set
-+# CONFIG_SYS_I2C_MTK is not set
-+# CONFIG_SYS_I2C_MICROCHIP is not set
-+# CONFIG_SYS_I2C_MXC is not set
-+# CONFIG_SYS_I2C_NPCM is not set
-+# CONFIG_SYS_I2C_SOFT is not set
-+# CONFIG_SYS_I2C_MV is not set
-+# CONFIG_SYS_I2C_MVTWSI is not set
-+CONFIG_INPUT=y
-+# CONFIG_DM_KEYBOARD is not set
-+# CONFIG_CROS_EC_KEYB is not set
-+# CONFIG_TEGRA_KEYBOARD is not set
-+# CONFIG_TWL4030_INPUT is not set
-+
-+#
-+# IOMMU device drivers
-+#
-+# CONFIG_IOMMU is not set
-+
-+#
-+# LED Support
-+#
-+CONFIG_LED=y
-+# CONFIG_LED_PWM is not set
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_LED_STATUS is not set
-+
-+#
-+# Mailbox Controller Support
-+#
-+# CONFIG_DM_MAILBOX is not set
-+
-+#
-+# Memory Controller drivers
-+#
-+# CONFIG_MEMORY is not set
-+# CONFIG_ATMEL_EBI is not set
-+# CONFIG_MFD_ATMEL_SMC is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MISC is not set
-+# CONFIG_NVMEM is not set
-+# CONFIG_SPL_NVMEM is not set
-+# CONFIG_SMSC_LPC47M is not set
-+# CONFIG_SMSC_SIO1007 is not set
-+# CONFIG_CROS_EC is not set
-+# CONFIG_DS4510 is not set
-+# CONFIG_FSL_SEC_MON is not set
-+# CONFIG_IRQ is not set
-+# CONFIG_NPCM_HOST is not set
-+# CONFIG_NUVOTON_NCT6102D is not set
-+# CONFIG_PWRSEQ is not set
-+# CONFIG_PCA9551_LED is not set
-+# CONFIG_TEST_DRV is not set
-+# CONFIG_USB_HUB_USB251XB is not set
-+# CONFIG_TWL4030_LED is not set
-+# CONFIG_WINBOND_W83627 is not set
-+# CONFIG_FS_LOADER is not set
-+
-+#
-+# MMC Host controller Support
-+#
-+# CONFIG_MMC is not set
-+# CONFIG_MMC_BROKEN_CD is not set
-+# CONFIG_DM_MMC is not set
-+# CONFIG_FSL_ESDHC is not set
-+# CONFIG_FSL_ESDHC_IMX is not set
-+
-+#
-+# MTD Support
-+#
-+CONFIG_MTD_PARTITIONS=y
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+# CONFIG_MTD_NOR_FLASH is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_SYS_MTDPARTS_RUNTIME is not set
-+# CONFIG_FLASH_CFI_DRIVER is not set
-+# CONFIG_CFI_FLASH is not set
-+# CONFIG_ALTERA_QSPI is not set
-+# CONFIG_HBMC_AM654 is not set
-+# CONFIG_SAMSUNG_ONENAND is not set
-+# CONFIG_USE_SYS_MAX_FLASH_BANKS is not set
-+CONFIG_MTD_NAND_CORE=y
-+# CONFIG_MTD_RAW_NAND is not set
-+CONFIG_MTD_SPI_NAND=y
-+
-+#
-+# SPI Flash Support
-+#
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SF_DEFAULT_BUS=0
-+CONFIG_SF_DEFAULT_CS=0
-+# CONFIG_BOOTDEV_SPI_FLASH is not set
-+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-+CONFIG_SPI_FLASH_SMART_HWCAPS=y
-+# CONFIG_SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT is not set
-+# CONFIG_SPI_FLASH_SOFT_RESET is not set
-+# CONFIG_SPI_FLASH_BAR is not set
-+CONFIG_SPI_FLASH_LOCK=y
-+CONFIG_SPI_FLASH_UNLOCK_ALL=y
-+# CONFIG_SPI_FLASH_ATMEL is not set
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_ISSI=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+# CONFIG_SPI_FLASH_S28HX_T is not set
-+CONFIG_SPI_FLASH_STMICRO=y
-+# CONFIG_SPI_FLASH_MT35XU is not set
-+# CONFIG_SPI_FLASH_SST is not set
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_XTX=y
-+# CONFIG_SPI_FLASH_ZBIT is not set
-+CONFIG_SPI_FLASH_USE_4K_SECTORS=y
-+# CONFIG_SPI_FLASH_DATAFLASH is not set
-+CONFIG_SPI_FLASH_MTD=y
-+
-+#
-+# UBI support
-+#
-+CONFIG_UBI_SILENCE_MSG=y
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_MODULE=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_LIMIT=20
-+# CONFIG_MTD_UBI_FASTMAP is not set
-+# CONFIG_NVMXIP is not set
-+# CONFIG_NVMXIP_QSPI is not set
-+# CONFIG_NMBM is not set
-+
-+#
-+# Multiplexer drivers
-+#
-+# CONFIG_MULTIPLEXER is not set
-+# CONFIG_BITBANGMII is not set
-+# CONFIG_MV88E6352_SWITCH is not set
-+CONFIG_PHYLIB=y
-+# CONFIG_PHY_ADDR_ENABLE is not set
-+# CONFIG_B53_SWITCH is not set
-+# CONFIG_MV88E61XX_SWITCH is not set
-+# CONFIG_PHYLIB_10G is not set
-+# CONFIG_PHY_ADIN is not set
-+# CONFIG_PHY_AIROHA is not set
-+# CONFIG_PHY_AQUANTIA is not set
-+# CONFIG_PHY_ATHEROS is not set
-+# CONFIG_SPL_PHY_ATHEROS is not set
-+# CONFIG_PHY_BROADCOM is not set
-+# CONFIG_PHY_CORTINA is not set
-+# CONFIG_PHY_DAVICOM is not set
-+# CONFIG_PHY_ET1011C is not set
-+# CONFIG_PHY_LXT is not set
-+# CONFIG_PHY_MARVELL is not set
-+# CONFIG_PHY_MARVELL_10G is not set
-+# CONFIG_PHY_MESON_GXL is not set
-+# CONFIG_PHY_MICREL is not set
-+# CONFIG_PHY_MOTORCOMM is not set
-+# CONFIG_PHY_MSCC is not set
-+# CONFIG_PHY_NATSEMI is not set
-+# CONFIG_PHY_NXP_C45_TJA11XX is not set
-+# CONFIG_PHY_NXP_TJA11XX is not set
-+# CONFIG_PHY_REALTEK is not set
-+# CONFIG_PHY_SMSC is not set
-+# CONFIG_PHY_TERANETICS is not set
-+# CONFIG_PHY_TI is not set
-+# CONFIG_PHY_TI_DP83867 is not set
-+# CONFIG_PHY_TI_DP83869 is not set
-+# CONFIG_PHY_TI_GENERIC is not set
-+# CONFIG_PHY_VITESSE is not set
-+# CONFIG_PHY_XILINX is not set
-+# CONFIG_PHY_XILINX_GMII2RGMII is not set
-+# CONFIG_PHY_XWAY is not set
-+# CONFIG_PHY_ETHERNET_ID is not set
-+CONFIG_PHY_FIXED=y
-+# CONFIG_PHY_NCSI is not set
-+# CONFIG_FSL_MEMAC is not set
-+CONFIG_PHY_RESET_DELAY=0
-+# CONFIG_FSL_PFE is not set
-+CONFIG_ETH=y
-+CONFIG_DM_ETH=y
-+# CONFIG_DM_MDIO is not set
-+# CONFIG_DM_ETH_PHY is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_PHY_GIGE is not set
-+# CONFIG_ALTERA_TSE is not set
-+# CONFIG_BCM_SF2_ETH is not set
-+# CONFIG_BCMGENET is not set
-+# CONFIG_BNXT_ETH is not set
-+# CONFIG_CALXEDA_XGMAC is not set
-+# CONFIG_DRIVER_DM9000 is not set
-+# CONFIG_DWC_ETH_QOS is not set
-+# CONFIG_EEPRO100 is not set
-+# CONFIG_ETH_DESIGNWARE is not set
-+# CONFIG_ETH_DESIGNWARE_MESON8B is not set
-+# CONFIG_ETHOC is not set
-+# CONFIG_FMAN_ENET is not set
-+# CONFIG_FTMAC100 is not set
-+# CONFIG_FTGMAC100 is not set
-+# CONFIG_MCFFEC is not set
-+# CONFIG_FSLDMAFEC is not set
-+# CONFIG_KS8851_MLL is not set
-+# CONFIG_LITEETH is not set
-+# CONFIG_MACB is not set
-+# CONFIG_NET_NPCM750 is not set
-+# CONFIG_PCH_GBE is not set
-+# CONFIG_RGMII is not set
-+# CONFIG_MII is not set
-+# CONFIG_RMII is not set
-+# CONFIG_PCNET is not set
-+# CONFIG_QE_UEC is not set
-+# CONFIG_RTL8139 is not set
-+# CONFIG_SMC911X is not set
-+# CONFIG_SUN7I_GMAC is not set
-+# CONFIG_SUN4I_EMAC is not set
-+# CONFIG_SUN8I_EMAC is not set
-+# CONFIG_SH_ETHER is not set
-+# CONFIG_DRIVER_TI_CPSW is not set
-+# CONFIG_DRIVER_TI_EMAC is not set
-+# CONFIG_DRIVER_TI_KEYSTONE_NET is not set
-+# CONFIG_TULIP is not set
-+# CONFIG_XILINX_AXIEMAC is not set
-+# CONFIG_VSC7385_ENET is not set
-+# CONFIG_XILINX_EMACLITE is not set
-+# CONFIG_ZYNQ_GEM is not set
-+# CONFIG_SYS_DPAA_QBMAN is not set
-+# CONFIG_TSEC_ENET is not set
-+CONFIG_MEDIATEK_ETH=y
-+# CONFIG_HIFEMAC_ETH is not set
-+# CONFIG_HIGMACV300_ETH is not set
-+# CONFIG_NVME is not set
-+# CONFIG_NVME_APPLE is not set
-+
-+#
-+# PCI Endpoint
-+#
-+# CONFIG_PCI_ENDPOINT is not set
-+# CONFIG_X86_PCH7 is not set
-+# CONFIG_X86_PCH9 is not set
-+
-+#
-+# PHY Subsystem
-+#
-+CONFIG_PHY=y
-+# CONFIG_NOP_PHY is not set
-+# CONFIG_MIPI_DPHY_HELPERS is not set
-+# CONFIG_BCM_SR_PCIE_PHY is not set
-+# CONFIG_OMAP_USB2_PHY is not set
-+CONFIG_PHY_MTK_TPHY=y
-+
-+#
-+# Rockchip PHY driver
-+#
-+# CONFIG_PHY_CADENCE_SIERRA is not set
-+# CONFIG_PHY_CADENCE_TORRENT is not set
-+# CONFIG_MSM8916_USB_PHY is not set
-+# CONFIG_MVEBU_COMPHY_SUPPORT is not set
-+
-+#
-+# Pin controllers
-+#
-+CONFIG_PINCTRL=y
-+CONFIG_PINCTRL_FULL=y
-+CONFIG_PINCTRL_GENERIC=y
-+CONFIG_PINMUX=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCONF_RECURSIVE=y
-+# CONFIG_PINCTRL_AT91 is not set
-+# CONFIG_PINCTRL_AT91PIO4 is not set
-+# CONFIG_PINCTRL_INTEL is not set
-+# CONFIG_PINCTRL_QE is not set
-+# CONFIG_PINCTRL_ROCKCHIP_RV1108 is not set
-+# CONFIG_PINCTRL_SINGLE is not set
-+# CONFIG_PINCTRL_STM32 is not set
-+# CONFIG_PINCTRL_STMFX is not set
-+# CONFIG_PINCTRL_K210 is not set
-+CONFIG_PINCTRL_MTK=y
-+# CONFIG_PINCTRL_MT7622 is not set
-+# CONFIG_PINCTRL_MT7623 is not set
-+# CONFIG_PINCTRL_MT7629 is not set
-+CONFIG_PINCTRL_MT7981=y
-+# CONFIG_PINCTRL_MT7986 is not set
-+# CONFIG_PINCTRL_MT7988 is not set
-+# CONFIG_PINCTRL_MT8512 is not set
-+# CONFIG_PINCTRL_MT8516 is not set
-+# CONFIG_PINCTRL_MT8518 is not set
-+CONFIG_POWER=y
-+# CONFIG_POWER_LEGACY is not set
-+# CONFIG_ACPI_PMC is not set
-+
-+#
-+# Power Domain Support
-+#
-+CONFIG_POWER_DOMAIN=y
-+# CONFIG_APPLE_PMGR_POWER_DOMAIN is not set
-+CONFIG_MTK_POWER_DOMAIN=y
-+# CONFIG_DM_PMIC is not set
-+# CONFIG_PMIC_TPS65217 is not set
-+# CONFIG_POWER_TPS65218 is not set
-+# CONFIG_POWER_TPS62362 is not set
-+# CONFIG_DM_REGULATOR is not set
-+# CONFIG_TPS6586X_POWER is not set
-+# CONFIG_POWER_MT6323 is not set
-+CONFIG_DM_PWM=y
-+# CONFIG_PWM_ASPEED is not set
-+# CONFIG_PWM_CADENCE_TTC is not set
-+# CONFIG_PWM_CROS_EC is not set
-+# CONFIG_PWM_EXYNOS is not set
-+# CONFIG_PWM_IMX is not set
-+# CONFIG_PWM_MESON is not set
-+CONFIG_PWM_MTK=y
-+# CONFIG_PWM_ROCKCHIP is not set
-+# CONFIG_PWM_SANDBOX is not set
-+# CONFIG_PWM_SIFIVE is not set
-+# CONFIG_PWM_TEGRA is not set
-+# CONFIG_PWM_SUNXI is not set
-+# CONFIG_U_QE is not set
-+# CONFIG_RAM is not set
-+
-+#
-+# Reboot Mode Support
-+#
-+# CONFIG_DM_REBOOT_MODE is not set
-+
-+#
-+# Remote Processor drivers
-+#
-+
-+#
-+# Reset Controller Support
-+#
-+# CONFIG_RESET_AST2500 is not set
-+# CONFIG_RESET_AST2600 is not set
-+CONFIG_RESET_MEDIATEK=y
-+# CONFIG_RESET_HISILICON is not set
-+# CONFIG_RESET_SYSCON is not set
-+# CONFIG_RESET_SCMI is not set
-+# CONFIG_RESET_DRA7 is not set
-+# CONFIG_DM_RNG is not set
-+
-+#
-+# Real Time Clock
-+#
-+# CONFIG_DM_RTC is not set
-+# CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set
-+# CONFIG_RTC_DS1337 is not set
-+# CONFIG_RTC_DS1338 is not set
-+# CONFIG_RTC_DS1374 is not set
-+# CONFIG_RTC_DS3231 is not set
-+# CONFIG_RTC_PCF8563 is not set
-+# CONFIG_RTC_PT7C4338 is not set
-+# CONFIG_RTC_PL031 is not set
-+# CONFIG_RTC_S35392A is not set
-+# CONFIG_RTC_MC13XXX is not set
-+# CONFIG_RTC_MC146818 is not set
-+# CONFIG_RTC_M41T62 is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_DM_SCSI is not set
-+CONFIG_SERIAL=y
-+CONFIG_BAUDRATE=115200
-+# CONFIG_DEFAULT_ENV_IS_RW is not set
-+CONFIG_REQUIRE_SERIAL_CONSOLE=y
-+# CONFIG_SPECIFY_CONSOLE_INDEX is not set
-+CONFIG_SERIAL_PRESENT=y
-+CONFIG_DM_SERIAL=y
-+# CONFIG_SERIAL_RX_BUFFER is not set
-+# CONFIG_SERIAL_PUTS is not set
-+# CONFIG_SERIAL_SEARCH_ALL is not set
-+# CONFIG_SERIAL_PROBE_ALL is not set
-+# CONFIG_VPL_DM_SERIAL is not set
-+CONFIG_DEBUG_UART_MTK=y
-+CONFIG_DEBUG_UART_SHIFT=0
-+# CONFIG_DEBUG_UART_ANNOUNCE is not set
-+# CONFIG_DEBUG_UART_SKIP_INIT is not set
-+# CONFIG_ALTERA_JTAG_UART is not set
-+# CONFIG_ALTERA_UART is not set
-+# CONFIG_ARC_SERIAL is not set
-+# CONFIG_ARM_DCC is not set
-+# CONFIG_ATMEL_USART is not set
-+# CONFIG_BCM6345_SERIAL is not set
-+# CONFIG_COREBOOT_SERIAL is not set
-+# CONFIG_CORTINA_UART is not set
-+# CONFIG_FSL_LINFLEXUART is not set
-+# CONFIG_FSL_LPUART is not set
-+# CONFIG_MVEBU_A3700_UART is not set
-+# CONFIG_MCFUART is not set
-+# CONFIG_NULLDEV_SERIAL is not set
-+# CONFIG_SYS_NS16550 is not set
-+# CONFIG_PL01X_SERIAL is not set
-+# CONFIG_ROCKCHIP_SERIAL is not set
-+# CONFIG_XILINX_UARTLITE is not set
-+# CONFIG_MSM_SERIAL is not set
-+# CONFIG_MSM_GENI_SERIAL is not set
-+# CONFIG_MXS_AUART_SERIAL is not set
-+# CONFIG_OMAP_SERIAL is not set
-+# CONFIG_SIFIVE_SERIAL is not set
-+# CONFIG_ZYNQ_SERIAL is not set
-+CONFIG_MTK_SERIAL=y
-+# CONFIG_MT7620_SERIAL is not set
-+# CONFIG_NPCM_SERIAL is not set
-+# CONFIG_SM is not set
-+# CONFIG_MESON_SM is not set
-+# CONFIG_SMEM is not set
-+
-+#
-+# Sound support
-+#
-+# CONFIG_SOUND is not set
-+
-+#
-+# SOC (System On Chip) specific Drivers
-+#
-+# CONFIG_SOC_DEVICE is not set
-+# CONFIG_SOC_TI is not set
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_SPI_MEM=y
-+# CONFIG_SPI_DIRMAP is not set
-+# CONFIG_ALTERA_SPI is not set
-+# CONFIG_APPLE_SPI is not set
-+# CONFIG_ATCSPI200_SPI is not set
-+# CONFIG_ATMEL_SPI is not set
-+# CONFIG_BCMSTB_SPI is not set
-+# CONFIG_CORTINA_SFLASH is not set
-+# CONFIG_CADENCE_QSPI is not set
-+# CONFIG_CF_SPI is not set
-+# CONFIG_DESIGNWARE_SPI is not set
-+# CONFIG_EXYNOS_SPI is not set
-+# CONFIG_FSL_DSPI is not set
-+# CONFIG_FSL_QSPI is not set
-+# CONFIG_GXP_SPI is not set
-+# CONFIG_ICH_SPI is not set
-+# CONFIG_IPROC_QSPI is not set
-+# CONFIG_KIRKWOOD_SPI is not set
-+# CONFIG_MICROCHIP_COREQSPI is not set
-+# CONFIG_MPC8XXX_SPI is not set
-+# CONFIG_MTK_SNOR is not set
-+# CONFIG_MTK_SNFI_SPI is not set
-+CONFIG_MTK_SPIM=y
-+# CONFIG_MVEBU_A3700_SPI is not set
-+# CONFIG_MXS_SPI is not set
-+# CONFIG_SPI_MXIC is not set
-+# CONFIG_NPCM_FIU_SPI is not set
-+# CONFIG_NPCM_PSPI is not set
-+# CONFIG_NXP_FSPI is not set
-+# CONFIG_OMAP3_SPI is not set
-+# CONFIG_PL022_SPI is not set
-+# CONFIG_ROCKCHIP_SFC is not set
-+# CONFIG_ROCKCHIP_SPI is not set
-+# CONFIG_SPI_ASPEED_SMC is not set
-+# CONFIG_SPI_SIFIVE is not set
-+# CONFIG_SOFT_SPI is not set
-+# CONFIG_SPI_SN_F_OSPI is not set
-+# CONFIG_SPI_SUNXI is not set
-+# CONFIG_TEGRA114_SPI is not set
-+# CONFIG_TEGRA20_SFLASH is not set
-+# CONFIG_TEGRA20_SLINK is not set
-+# CONFIG_TEGRA210_QSPI is not set
-+# CONFIG_TI_QSPI is not set
-+# CONFIG_XILINX_SPI is not set
-+# CONFIG_ZYNQ_SPI is not set
-+# CONFIG_ZYNQ_QSPI is not set
-+# CONFIG_ZYNQMP_GQSPI is not set
-+# CONFIG_SH_QSPI is not set
-+# CONFIG_MXC_SPI is not set
-+
-+#
-+# SPMI support
-+#
-+# CONFIG_SPMI is not set
-+# CONFIG_SYSINFO is not set
-+
-+#
-+# System reset device drivers
-+#
-+# CONFIG_SYSRESET is not set
-+# CONFIG_TEE is not set
-+# CONFIG_DM_THERMAL is not set
-+
-+#
-+# Timer Support
-+#
-+# CONFIG_TIMER is not set
-+
-+#
-+# TPM support
-+#
-+CONFIG_USB=y
-+CONFIG_DM_USB=y
-+# CONFIG_DM_USB_GADGET is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+CONFIG_USB_HOST=y
-+CONFIG_USB_XHCI_HCD=y
-+# CONFIG_USB_XHCI_DWC3 is not set
-+# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
-+CONFIG_USB_XHCI_MTK=y
-+# CONFIG_USB_XHCI_FSL is not set
-+# CONFIG_USB_XHCI_BRCM is not set
-+# CONFIG_USB_EHCI_HCD is not set
-+# CONFIG_USB_OHCI_HCD is not set
-+# CONFIG_USB_UHCI_HCD is not set
-+# CONFIG_USB_DWC2 is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+# CONFIG_USB_ISP1760 is not set
-+# CONFIG_USB_CDNS3 is not set
-+# CONFIG_USB_DWC3 is not set
-+# CONFIG_USB_MTU3 is not set
-+
-+#
-+# Legacy MUSB Support
-+#
-+# CONFIG_USB_MUSB_HCD is not set
-+# CONFIG_USB_MUSB_UDC is not set
-+
-+#
-+# MUSB Controller Driver
-+#
-+# CONFIG_USB_MUSB_HOST is not set
-+# CONFIG_USB_MUSB_PIO_ONLY is not set
-+
-+#
-+# USB Phy
-+#
-+# CONFIG_TWL4030_USB is not set
-+# CONFIG_ROCKCHIP_USB2_PHY is not set
-+
-+#
-+# ULPI drivers
-+#
-+
-+#
-+# USB peripherals
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_KEYBOARD is not set
-+# CONFIG_USB_ONBOARD_HUB is not set
-+CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
-+# CONFIG_USB_HOST_ETHER is not set
-+# CONFIG_USB_GADGET is not set
-+# CONFIG_SPL_USB_GADGET is not set
-+
-+#
-+# UFS Host Controller Support
-+#
-+# CONFIG_TI_J721E_UFS is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VIDEO is not set
-+
-+#
-+# VirtIO Drivers
-+#
-+# CONFIG_VIRTIO_MMIO is not set
-+
-+#
-+# 1-Wire support
-+#
-+# CONFIG_W1 is not set
-+
-+#
-+# 1-wire EEPROM support
-+#
-+# CONFIG_W1_EEPROM is not set
-+
-+#
-+# Watchdog Timer Support
-+#
-+# CONFIG_WATCHDOG is not set
-+CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
-+# CONFIG_IMX_WATCHDOG is not set
-+# CONFIG_ULP_WATCHDOG is not set
-+# CONFIG_WDT is not set
-+# CONFIG_PHYS_TO_BUS is not set
-+
-+#
-+# File systems
-+#
-+# CONFIG_FS_BTRFS is not set
-+# CONFIG_FS_CBFS is not set
-+# CONFIG_FS_EXT4 is not set
-+CONFIG_FS_FAT=y
-+CONFIG_FAT_WRITE=y
-+CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
-+# CONFIG_FS_JFFS2 is not set
-+CONFIG_UBIFS_SILENCE_MSG=y
-+CONFIG_UBIFS_SILENCE_DEBUG_DUMP=y
-+# CONFIG_FS_CRAMFS is not set
-+# CONFIG_YAFFS2 is not set
-+# CONFIG_FS_SQUASHFS is not set
-+# CONFIG_FS_EROFS is not set
-+
-+#
-+# Library routines
-+#
-+# CONFIG_ADDR_MAP is not set
-+# CONFIG_SYS_TIMER_COUNTS_DOWN is not set
-+# CONFIG_PHYSMEM is not set
-+# CONFIG_BCH is not set
-+# CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
-+CONFIG_CHARSET=y
-+# CONFIG_DYNAMIC_CRC_TABLE is not set
-+CONFIG_LIB_UUID=y
-+# CONFIG_SEMIHOSTING is not set
-+CONFIG_PRINTF=y
-+CONFIG_SPRINTF=y
-+CONFIG_STRTO=y
-+CONFIG_SYS_HZ=1000
-+# CONFIG_PANIC_HANG is not set
-+CONFIG_REGEX=y
-+CONFIG_LIB_RAND=y
-+# CONFIG_LIB_HW_RAND is not set
-+CONFIG_SUPPORT_ACPI=y
-+# CONFIG_ACPI is not set
-+CONFIG_RBTREE=y
-+# CONFIG_BITREVERSE is not set
-+# CONFIG_TRACE is not set
-+# CONFIG_CIRCBUF is not set
-+# CONFIG_CMD_DHRYSTONE is not set
-+
-+#
-+# Security support
-+#
-+# CONFIG_AES is not set
-+# CONFIG_ECDSA is not set
-+# CONFIG_RSA is not set
-+# CONFIG_TPM is not set
-+
-+#
-+# Android Verified Boot
-+#
-+
-+#
-+# Hashing Support
-+#
-+# CONFIG_BLAKE2 is not set
-+CONFIG_SHA1=y
-+CONFIG_SHA256=y
-+# CONFIG_SHA512 is not set
-+# CONFIG_SHA384 is not set
-+# CONFIG_SHA_HW_ACCEL is not set
-+CONFIG_MD5=y
-+CONFIG_CRC8=y
-+CONFIG_CRC32=y
-+
-+#
-+# Compression Support
-+#
-+# CONFIG_LZ4 is not set
-+CONFIG_LZMA=y
-+CONFIG_LZO=y
-+CONFIG_GZIP=y
-+# CONFIG_ZLIB_UNCOMPRESS is not set
-+# CONFIG_BZIP2 is not set
-+CONFIG_ZLIB=y
-+# CONFIG_ZSTD is not set
-+CONFIG_VPL_LZMA=y
-+# CONFIG_SPL_GZIP is not set
-+# CONFIG_ERRNO_STR is not set
-+CONFIG_HEXDUMP=y
-+# CONFIG_GETOPT is not set
-+CONFIG_OF_LIBFDT=y
-+CONFIG_OF_LIBFDT_ASSUME_MASK=0x0
-+CONFIG_SYS_FDT_PAD=0x3000
-+
-+#
-+# System tables
-+#
-+CONFIG_GENERATE_SMBIOS_TABLE=y
-+# CONFIG_LIB_RATIONAL is not set
-+CONFIG_SMBIOS=y
-+# CONFIG_SMBIOS_PARSER is not set
-+CONFIG_EFI_LOADER=y
-+CONFIG_CMD_BOOTEFI_BOOTMGR=y
-+CONFIG_EFI_VARIABLE_FILE_STORE=y
-+# CONFIG_EFI_VARIABLE_NO_STORE is not set
-+# CONFIG_EFI_VARIABLES_PRESEED is not set
-+CONFIG_EFI_VAR_BUF_SIZE=131072
-+# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
-+# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
-+CONFIG_EFI_CAPSULE_MAX=15
-+CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-+CONFIG_EFI_DEVICE_PATH_UTIL=y
-+CONFIG_EFI_DT_FIXUP=y
-+CONFIG_EFI_LOADER_HII=y
-+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-+CONFIG_EFI_UNICODE_CAPITALIZATION=y
-+# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
-+CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
-+CONFIG_EFI_HAVE_RUNTIME_RESET=y
-+CONFIG_EFI_LOAD_FILE2_INITRD=y
-+CONFIG_EFI_ECPT=y
-+CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
-+# CONFIG_OPTEE_LIB is not set
-+# CONFIG_OPTEE_IMAGE is not set
-+# CONFIG_BOOTM_OPTEE is not set
-+# CONFIG_TEST_FDTDEC is not set
-+CONFIG_LIB_ELF=y
-+CONFIG_LMB=y
-+CONFIG_LMB_USE_MAX_REGIONS=y
-+CONFIG_LMB_MAX_REGIONS=64
-+# CONFIG_PHANDLE_CHECK_SEQ is not set
-+
-+#
-+# Testing
-+#
-+# CONFIG_UNIT_TEST is not set
-+# CONFIG_POST is not set
-+
-+#
-+# Tools options
-+#
-+CONFIG_MKIMAGE_DTC_PATH="dtc"
-+CONFIG_TOOLS_CRC32=y
-+CONFIG_TOOLS_LIBCRYPTO=y
-+CONFIG_TOOLS_FIT=y
-+CONFIG_TOOLS_FIT_FULL_CHECK=y
-+CONFIG_TOOLS_FIT_PRINT=y
-+CONFIG_TOOLS_FIT_RSASSA_PSS=y
-+CONFIG_TOOLS_FIT_SIGNATURE=y
-+CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE=0x10000000
-+CONFIG_TOOLS_FIT_VERBOSE=y
-+CONFIG_TOOLS_MD5=y
-+CONFIG_TOOLS_OF_LIBFDT=y
-+CONFIG_TOOLS_SHA1=y
-+CONFIG_TOOLS_SHA256=y
-+CONFIG_TOOLS_SHA384=y
-+CONFIG_TOOLS_SHA512=y
-+# CONFIG_TOOLS_MKEFICAPSULE is not set
-+# CONFIG_FSPI_CONF_HEADER is not set
-+# CONFIG_TOOLS_MKFWUMDATA is not set
---- /dev/null
-+++ b/openwrt-one-nor_env
-@@ -0,0 +1,46 @@
-+bl2_mtd_write=mtd erase bl2-nor &&  mtd write bl2-nor $loadaddr 0x0 0x40000
-+bl2_tftp_write=tftpboot $loadaddr $bootfile_bl2_nor && run bl2_mtd_write
-+bootcmd=run check_button ; run led_start ; mtd read recovery ${loadaddr} ; bootm ; run led_loop_error
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-openwrt_one-initramfs.itb
-+bootfile_bl2_nor=openwrt-mediatek-filogic-openwrt_one-nor-preloader.bin
-+bootfile_fip_nor=openwrt-mediatek-filogic-openwrt_one-nor-bl31-uboot.fip
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run bootcmd
-+bootmenu_1=Boot system via TFTP.=run tftp_boot ; run bootmenu_confirm_return
-+bootmenu_2=Unlock NOR. (Make sure the NOR/WP jumper is populated)=sf probe 1:0 && sf protect unlock 0x0 0x1000000 ; run bootmenu_confirm_return
-+bootmenu_3=Load BL31+U-Boot FIP via TFTP then write to NOR.=run fip_tftp_write ; run bootmenu_confirm_return
-+bootmenu_4=Load BL2 preloader via TFTP then write to NOR.=run bl2_tftp_write ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NOR.=run tftp_write ; run bootmenu_confirm_return
-+bootmenu_6=Lock NOR. (Remove jumper afterwards)=sf probe 1:0 && sf protect lock 0x0 0x1000000 ; run bootmenu_confirm_return
-+bootmenu_7=Reboot.=reset
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )  [SPI-NOR]
-+check_button=if button front ; then run usb_recovery ; run led_loop_error ; fi
-+fip_mtd_write=mtd erase fip-nor && mtd write fip-nor $loadaddr
-+fip_tftp_write=tftpboot $loadaddr $bootfile_fip_nor && run fip_mtd_write
-+ipaddr=192.168.11.11
-+led_done=led green off ; led white on
-+led_loop_done=led white off ; led green on ; echo done ; while true ; do  sleep 1 ; done
-+led_loop_error=led white off ; led green off ; while true ; do led red on ; sleep 1 ; led red off ; sleep 1 ; done
-+led_boot=led green on ; led white on ; led red on
-+led_start=led green off ; led red off; led white on
-+loadaddr=0x46000000
-+preboot=run led_boot
-+recoverfile_bl2=openwrt-mediatek-filogic-openwrt_one-snand-preloader.bin
-+recoverfile_ubi=openwrt-mediatek-filogic-openwrt_one-factory.ubi
-+recovery_write_bl2=mtd erase bl2 && for offset in 0x0 0x40000 0x80000; do mtd write bl2 $loadaddr $offset 0x40000 ; done
-+recovery_write_ubi=mtd erase ubi && mtd write ubi $loadaddr 0 ${filesize}
-+serverip=192.168.11.23
-+tftp_boot=run led_start ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+tftp_write=run led_start ; tftpboot $loadaddr $bootfile && mtd erase recovery 0x0 ${filesize} && mtd write recovery $loadaddr 0x0 ${filesize}
-+usb_recovery=run led_start ; usb start && run usb_recovery_bl2 && run usb_recovery_ubi && run led_loop_done
-+usb_recovery_bl2=fatload usb 0:1 ${loadaddr} ${recoverfile_bl2} && run recovery_write_bl2
-+usb_recovery_ubi=fatload usb 0:1 ${loadaddr} ${recoverfile_ubi} && run recovery_write_ubi
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; bootmenu
-+_init_env=setenv _init_env ; echo Initialize Env ; run ubi_create_env ; saveenv
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
---- /dev/null
-+++ b/openwrt-one-spi-nand_env
-@@ -0,0 +1,59 @@
-+ipaddr=192.168.11.11
-+serverip=192.168.11.23
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=run check_buttons ; run led_start ; run boot_calibration ; run boot_production ; run boot_recovery
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-openwrt_one-initramfs.itb
-+bootfile_bl2=openwrt-mediatek-filogic-openwrt_one-snand-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-openwrt_one-snand-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-openwrt_one-squashfs-sysupgrade.itb
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; run led_boot ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )  [SPI-NAND]
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=noboot=1 ; replacevol=1 ; run boot_tftp_production ; noboot= ; replacevol= ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=noboot=1 ; replacevol=1 ; run boot_tftp_recovery ; noboot= ; replacevol= ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_default=run bootcmd ; run boot_recovery ; replacevol=1 ; run boot_tftp_forever
-+boot_calibration=ubi read $loadaddr calibration && bootm $loadaddr#$bootconf
-+boot_production=led white on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led white off
-+boot_recovery=led green on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led green off
-+boot_tftp=run led_start ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_forever=led green off ; led white off ; led red on ; while true ; do run boot_tftp_recovery ; led red off ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && test $replacevol = 1 && iminfo $loadaddr && run ubi_write_production ; if test $noboot = 1 ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && test $replacevol = 1 && iminfo $loadaddr && run ubi_write_recovery ; if test $noboot = 1 ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run ubi_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run snand_write_bl2
-+check_buttons=if button front ; then run boot_recovery ; run boot_tftp ; run led_loop_error ; else if button back ; then ; run usb_recover ; run led_loop_error ; fi ; fi
-+led_boot=led green on ; led white on ; led red on
-+led_done=led green on ; led white off ; led red off
-+led_loop_error=led white off ; led green off ; while true ; do led red on ; sleep 1 ; led red off ; sleep 1 ; done
-+led_start=led white on ; led green off ; led red off
-+preboot=run led_boot
-+reset_factory=mw $loadaddr 0xff 0x1f000 ; ubi write $loadaddr ubootenv 0x1f000 ; ubi write $loadaddr ubootenv2 0x1f000 ; ubi remove rootfs_data
-+snand_write_bl2=mtd erase bl2 && for offset in 0x0 0x40000 0x80000 0xc0000 ; do mtd write bl2 $loadaddr $offset 0x40000 ; done
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x1f000 dynamic ; ubi check ubootenv2 || ubi create ubootenv2 0x1f000 dynamic
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+usb_recover=run led_start ; usb start && run usb_recover_production && run led_loop_done
-+usb_recover_production=fatload usb 0:1 ${loadaddr} ${bootfile_upg} && iminfo $loadaddr && run ubi_write_production
-+ubi_write_fip=run ubi_remove_rootfs ; ubi check fip && ubi remove fip ; ubi create fip $filesize static && ubi write $loadaddr fip $filesize
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; bootmenu
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
diff --git a/lede/package/kernel/cryptodev-linux/Makefile b/lede/package/kernel/cryptodev-linux/Makefile
index 0b794a3cd9..d04aaeacec 100644
--- a/lede/package/kernel/cryptodev-linux/Makefile
+++ b/lede/package/kernel/cryptodev-linux/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=cryptodev-linux
 PKG_VERSION:=1.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/lede/package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch b/lede/package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch
new file mode 100644
index 0000000000..3d25653177
--- /dev/null
+++ b/lede/package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch
@@ -0,0 +1,11 @@
+--- a/ioctl.c
++++ b/ioctl.c
+@@ -933,7 +933,7 @@
+ 		if (unlikely(ret)) {
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0))
+ 			sys_close(fd);
+-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 220))
+ 			ksys_close(fd);
+ #else
+ 			close_fd(fd);
diff --git a/lede/package/system/fstools/Makefile b/lede/package/system/fstools/Makefile
index 7277741928..a61d4bb5a0 100644
--- a/lede/package/system/fstools/Makefile
+++ b/lede/package/system/fstools/Makefile
@@ -12,16 +12,15 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
-PKG_MIRROR_HASH:=cf9e09885954e0e43b58126ce4b6f5552462cf1495b89330ce4e66056249787e
-PKG_SOURCE_DATE:=2024-01-22
-PKG_SOURCE_VERSION:=08cd7083cac4bddf88459efa0881ee52858e7d0a
+PKG_MIRROR_HASH:=edda9151c73c1adfe369f5e315347344727a540ad57d3e2b41b9f57f9d4313fe
+PKG_SOURCE_DATE:=2023-01-22
+PKG_SOURCE_VERSION:=1ea5855e980cd88766dd9f615e78e7dd6edfbb74
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
 PKG_USE_MIPS16:=0
-PKG_BUILD_FLAGS:=no-mips16
 PKG_FLAGS:=nonshared
 
 PKG_BUILD_DEPENDS := util-linux
@@ -49,7 +48,7 @@ define Package/fstools/config
 		depends on PACKAGE_fstools
 		depends on NAND_SUPPORT
 		bool "Support extroot functionality with UBIFS"
-		default y
+		default n
 		help
 			This option makes it possible to use extroot functionality if the root filesystem resides on an UBIFS partition
 
@@ -83,7 +82,7 @@ define Package/block-mount
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=Block device mounting and checking
-  DEPENDS:=+ubox +libubox +libuci +libblobmsg-json +libjson-c
+  DEPENDS:=+fstools +ubox +libubox +libuci +libblobmsg-json +libjson-c
 endef
 
 define Package/blockd
diff --git a/lede/package/system/fstools/patches/0001-fstools-support-extroot-for-non-MTD-rootfs_data.patch b/lede/package/system/fstools/patches/0001-fstools-support-extroot-for-non-MTD-rootfs_data.patch
new file mode 100644
index 0000000000..20a68484d3
--- /dev/null
+++ b/lede/package/system/fstools/patches/0001-fstools-support-extroot-for-non-MTD-rootfs_data.patch
@@ -0,0 +1,129 @@
+From: Qi Liu <liuqi_colin@msn.com>
+
+In order to support extroot, block extroot command has to be able to
+discover and properly mount the rootfs_data volume in order to discover
+the extroot volume. Currently this process can only discover MTD devices.
+This patch leverages libfstools in a similar way as mount_root to
+discover, initialize, and mount rootfs_data volume. It would enable any
+device with non-MTD rootfs_data volume to support extroot, including x86.
+
+Signed-off-by: Qi Liu <liuqi_colin@msn.com>
+---
+ CMakeLists.txt          |  4 ++--
+ block.c                 | 40 ++++++++++++++++++++++++++++++++++++++++
+ libfstools/fstype.h     | 12 ++++++++++++
+ libfstools/libfstools.h | 11 +----------
+ 4 files changed, 55 insertions(+), 12 deletions(-)
+ create mode 100644 libfstools/fstype.h
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,9 +78,9 @@ INSTALL(TARGETS blockd RUNTIME DESTINATI
+ ADD_EXECUTABLE(block block.c probe.c probe-libblkid.c)
+ IF(DEFINED CMAKE_UBIFS_EXTROOT)
+ 	ADD_DEFINITIONS(-DUBIFS_EXTROOT)
+-	TARGET_LINK_LIBRARIES(block blkid-tiny dl uci ubox ubus blobmsg_json ubi-utils ${json})
++	TARGET_LINK_LIBRARIES(block fstools blkid-tiny dl uci ubox ubus blobmsg_json ubi-utils ${json})
+ ELSE(DEFINED CMAKE_UBIFS_EXTROOT)
+-	TARGET_LINK_LIBRARIES(block blkid-tiny dl uci ubox ubus blobmsg_json ${json})
++	TARGET_LINK_LIBRARIES(block fstools blkid-tiny dl uci ubox ubus blobmsg_json ${json})
+ ENDIF(DEFINED CMAKE_UBIFS_EXTROOT)
+ INSTALL(TARGETS block RUNTIME DESTINATION sbin)
+ 
+--- a/block.c
++++ b/block.c
+@@ -44,6 +44,8 @@
+ #include <libubox/vlist.h>
+ #include <libubus.h>
+ 
++#include "libfstools/fstype.h"
++#include "libfstools/volume.h"
+ #include "probe.h"
+ 
+ #define AUTOFS_MOUNT_PATH       "/tmp/run/blockd/"
+@@ -1696,6 +1698,44 @@ static int main_extroot(int argc, char *
+        }
+ #endif
+ 
++  /* Find volume using libfstools */
++	struct volume *data = volume_find("rootfs_data");
++	if (data) {
++		volume_init(data);
++
++	  switch (volume_identify(data)) {
++		case FS_EXT4: {
++			char cfg[] = "/tmp/ext4_cfg";
++
++			/* Mount volume and try extroot (using fstab from that vol) */
++			mkdir_p(cfg, 0755);
++			if (!mount(data->blk, cfg, "ext4", MS_NOATIME, NULL)) {
++				err = mount_extroot(cfg);
++				umount2(cfg, MNT_DETACH);
++			}
++			if (err < 0)
++				rmdir("/tmp/overlay");
++			rmdir(cfg);
++			return err;
++		}
++
++		case FS_F2FS: {
++			char cfg[] = "/tmp/f2fs_cfg";
++
++			/* Mount volume and try extroot (using fstab from that vol) */
++			mkdir_p(cfg, 0755);
++			if (!mount(data->blk, cfg, "f2fs", MS_NOATIME, NULL)) {
++				err = mount_extroot(cfg);
++				umount2(cfg, MNT_DETACH);
++			}
++			if (err < 0)
++				rmdir("/tmp/overlay");
++			rmdir(cfg);
++			return err;
++		}
++		}
++	}
++
+ 	/* As a last resort look for /etc/config/fstab on "rootfs" partition */
+ 	return mount_extroot(NULL);
+ }
+--- /dev/null
++++ b/libfstools/fstype.h
+@@ -0,0 +1,13 @@
++#ifndef _FS_TYPE_H__
++#define _FS_TYPE_H__
++enum {
++	FS_NONE,
++	FS_SNAPSHOT,
++	FS_JFFS2,
++	FS_DEADCODE,
++	FS_UBIFS,
++	FS_F2FS,
++	FS_EXT4,
++	FS_TARGZ,
++};
++#endif
+\ No newline at end of file
+--- a/libfstools/libfstools.h
++++ b/libfstools/libfstools.h
+@@ -18,20 +18,10 @@
+ #include <libubox/blob.h>
+ #include <libubox/ulog.h>
+ #include <libubox/utils.h>
++#include "fstype.h"
+ 
+ struct volume;
+ 
+-enum {
+-	FS_NONE,
+-	FS_SNAPSHOT,
+-	FS_JFFS2,
+-	FS_DEADCODE,
+-	FS_UBIFS,
+-	FS_F2FS,
+-	FS_EXT4,
+-	FS_TARGZ,
+-};
+-
+ enum fs_state {
+ 	FS_STATE_UNKNOWN,
+ 	FS_STATE_PENDING,
diff --git a/lede/package/utils/fitblk/Makefile b/lede/package/utils/fitblk/Makefile
index 4da4dc46f1..cb9e7ebb40 100644
--- a/lede/package/utils/fitblk/Makefile
+++ b/lede/package/utils/fitblk/Makefile
@@ -16,7 +16,7 @@ define Package/fitblk
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=fitblk firmware release tool
-  DEPENDS:=@!LINUX_5_15
+  DEPENDS:=@LINUX_6_1
 endef
 
 define Package/fitblk/description
diff --git a/lede/target/linux/generic/config-5.15 b/lede/target/linux/generic/config-5.15
index 7daac70a4d..cd2f3f7f70 100644
--- a/lede/target/linux/generic/config-5.15
+++ b/lede/target/linux/generic/config-5.15
@@ -2050,7 +2050,6 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FIT_PARTITION is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/lede/target/linux/generic/config-6.1 b/lede/target/linux/generic/config-6.1
index 50740c4d40..33bceba08c 100644
--- a/lede/target/linux/generic/config-6.1
+++ b/lede/target/linux/generic/config-6.1
@@ -2167,7 +2167,6 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FIT_PARTITION is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/lede/target/linux/generic/config-6.6 b/lede/target/linux/generic/config-6.6
index 20fe98099f..6ae27dbadd 100644
--- a/lede/target/linux/generic/config-6.6
+++ b/lede/target/linux/generic/config-6.6
@@ -1,11 +1,13 @@
 # CONFIG_104_QUAD_8 is not set
 CONFIG_32BIT=y
+CONFIG_64BIT_TIME=y
 # CONFIG_6LOWPAN is not set
 # CONFIG_6LOWPAN_DEBUGFS is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_9P_FS is not set
+# CONFIG_AB3100_CORE is not set
 # CONFIG_AB8500_CORE is not set
 # CONFIG_ABP060MG is not set
 # CONFIG_ABX500_CORE is not set
@@ -58,6 +60,7 @@ CONFIG_32BIT=y
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7124 is not set
 # CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
@@ -91,6 +94,7 @@ CONFIG_32BIT=y
 # CONFIG_AD9834 is not set
 # CONFIG_ADA4250 is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_ADE7854 is not set
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADF4377 is not set
@@ -157,7 +161,6 @@ CONFIG_AF_UNIX_OOB=y
 CONFIG_AIO=y
 # CONFIG_AIRO is not set
 # CONFIG_AIRO_CS is not set
-# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -184,7 +187,9 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_AMILO_RFKILL is not set
 # CONFIG_AMPERE_ERRATUM_AC03_CPU_38 is not set
 # CONFIG_AMT is not set
+# CONFIG_ANDROID is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
+CONFIG_ANON_INODES=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_APDS9300 is not set
 # CONFIG_APDS9802ALS is not set
@@ -202,6 +207,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_AR8216_PHY is not set
 # CONFIG_AR8216_PHY_LEDS is not set
 # CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_AGILEX is not set
 # CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
@@ -211,12 +217,14 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_ARCH_AXXIA is not set
 # CONFIG_ARCH_BCM is not set
 # CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BCMBCA is not set
 # CONFIG_ARCH_BCM_21664 is not set
 # CONFIG_ARCH_BCM_23550 is not set
 # CONFIG_ARCH_BCM_281XX is not set
 # CONFIG_ARCH_BCM_5301X is not set
 # CONFIG_ARCH_BCM_53573 is not set
+# CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
 # CONFIG_ARCH_BCM_HR2 is not set
 # CONFIG_ARCH_BCM_IPROC is not set
@@ -226,10 +234,12 @@ CONFIG_ARCH_BINFMT_ELF_STATE=y
 # CONFIG_ARCH_BITMAIN is not set
 # CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_DIGICOLOR is not set
 # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 # CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_EXYNOS is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -242,10 +252,14 @@ CONFIG_ARCH_FORCE_MAX_ORDER=11
 # CONFIG_ARCH_HPE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_INTEL_SOCFPGA is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -268,6 +282,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+# CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_NPCM is not set
 # CONFIG_ARCH_NSPIRE is not set
@@ -279,8 +294,12 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARCH_OMAP3 is not set
 # CONFIG_ARCH_OMAP4 is not set
 # CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_OXNAS is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_PRIMA2 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_RANDOM is not set
 # CONFIG_ARCH_RDA is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_REALVIEW is not set
@@ -288,21 +307,27 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S32 is not set
+# CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SEATTLE is not set
 # CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_SPARX5 is not set
 # CONFIG_ARCH_SPRD is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_STM32 is not set
+# CONFIG_ARCH_STRATIX10 is not set
 # CONFIG_ARCH_SUNPLUS is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_SYNQUACER is not set
+# CONFIG_ARCH_TANGO is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_THUNDER is not set
 # CONFIG_ARCH_THUNDER2 is not set
+# CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_VERSATILE is not set
@@ -310,11 +335,14 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARCH_VIRT is not set
 # CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_VULCAN is not set
+# CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WM8505 is not set
 # CONFIG_ARCH_WM8750 is not set
 # CONFIG_ARCH_WM8850 is not set
 # CONFIG_ARCH_XGENE is not set
+# CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCNET is not set
@@ -324,6 +352,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_64K_PAGES is not set
 # CONFIG_ARM64_AMU_EXTN is not set
 # CONFIG_ARM64_BTI is not set
+# CONFIG_ARM64_CRYPTO is not set
 # CONFIG_ARM64_E0PD is not set
 # CONFIG_ARM64_ERRATUM_1024718 is not set
 # CONFIG_ARM64_ERRATUM_1165522 is not set
@@ -356,31 +385,37 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_ERRATUM_858921 is not set
 # CONFIG_ARM64_HW_AFDBM is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
+CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_MTE is not set
 # CONFIG_ARM64_PAN is not set
 # CONFIG_ARM64_PMEM is not set
 # CONFIG_ARM64_PSEUDO_NMI is not set
+# CONFIG_ARM64_PTDUMP_DEBUGFS is not set
 # CONFIG_ARM64_PTR_AUTH is not set
+# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
 # CONFIG_ARM64_RAS_EXTN is not set
 # CONFIG_ARM64_RELOC_TEST is not set
 # CONFIG_ARM64_SME is not set
 # CONFIG_ARM64_SVE is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
 # CONFIG_ARM64_TLB_RANGE is not set
+# CONFIG_ARM64_UAO is not set
 # CONFIG_ARM64_USE_LSE_ATOMICS is not set
 # CONFIG_ARM64_VA_BITS_48 is not set
+# CONFIG_ARM64_VHE is not set
 # CONFIG_ARM_APPENDED_DTB is not set
 # CONFIG_ARM_ARCH_TIMER is not set
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 # CONFIG_ARM_CCI is not set
 # CONFIG_ARM_CCI400_PMU is not set
 # CONFIG_ARM_CCI5xx_PMU is not set
 # CONFIG_ARM_CCI_PMU is not set
 # CONFIG_ARM_CCN is not set
 # CONFIG_ARM_CMN is not set
-# CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set
 # CONFIG_ARM_CPUIDLE is not set
 CONFIG_ARM_CPU_TOPOLOGY=y
+# CONFIG_ARM_CRYPTO is not set
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_ERRATA_326103 is not set
@@ -429,7 +464,6 @@ CONFIG_ARM_MODULE_PLTS=y
 # CONFIG_ARM_SDE_INTERFACE is not set
 # CONFIG_ARM_SMCCC_SOC_ID is not set
 # CONFIG_ARM_SMC_WATCHDOG is not set
-# CONFIG_ARM_SMMU_V3_PMU is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
 # CONFIG_ARM_SPE_PMU is not set
 # CONFIG_ARM_THUMBEE is not set
@@ -482,6 +516,7 @@ CONFIG_ATA_SFF=y
 # CONFIG_ATMEL is not set
 # CONFIG_ATMEL_PIT is not set
 # CONFIG_ATMEL_SSC is not set
+# CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_ATM_BR2684 is not set
 CONFIG_ATM_BR2684_IPFILTER=y
 # CONFIG_ATM_CLIP is not set
@@ -489,8 +524,10 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_DRIVERS is not set
 # CONFIG_ATM_DUMMY is not set
 # CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
 # CONFIG_ATM_FORE200E is not set
 # CONFIG_ATM_HE is not set
+# CONFIG_ATM_HORIZON is not set
 # CONFIG_ATM_IA is not set
 # CONFIG_ATM_IDT77252 is not set
 # CONFIG_ATM_LANAI is not set
@@ -499,10 +536,13 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_ATM_NICSTAR is not set
 # CONFIG_ATM_SOLOS is not set
 # CONFIG_ATM_TCP is not set
+# CONFIG_ATM_ZATM is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ATP is not set
 # CONFIG_AUDIT is not set
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+# CONFIG_AURORA_NB8800 is not set
+# CONFIG_AUTOFS4_FS is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTO_ZRELADDR is not set
 # CONFIG_AUXDISPLAY is not set
@@ -529,17 +569,21 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_BACKLIGHT_ARCXCNN is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTZ8866 is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 # CONFIG_BACKLIGHT_LED is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
+# CONFIG_BACKLIGHT_RPI is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_BACKTRACE_VERBOSE is not set
@@ -569,6 +613,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 # CONFIG_BCACHE is not set
+# CONFIG_BCM2712_MIP is not set
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM54140_PHY is not set
 # CONFIG_BCM63XX is not set
@@ -598,6 +643,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_BIG_KEYS is not set
 # CONFIG_BIG_LITTLE is not set
 CONFIG_BINARY_PRINTF=y
+# CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_ELF_FDPIC is not set
 # CONFIG_BINFMT_FLAT is not set
@@ -607,35 +653,92 @@ CONFIG_BITREVERSE=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOPRIO is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
 # CONFIG_BLK_DEBUG_FS is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_DM is not set
 # CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
 # CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
+# CONFIG_BLK_DEV_IDEACPI is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_IT8172 is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_LOOP is not set
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_MD is not set
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_NVME is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_BLK_DEV_PMEM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_SD is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SKD is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_SR is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
 # CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_UBLK is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
 # CONFIG_BLK_DEV_ZONED is not set
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLOCK_NOTIFIERS is not set
+# CONFIG_BLK_NVMEM is not set
 # CONFIG_BLK_SED_OPAL is not set
 # CONFIG_BLK_WBT is not set
 CONFIG_BLOCK=y
@@ -761,6 +864,7 @@ CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIUART_RTL is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_BT_HIDP is not set
+# CONFIG_BT_HS is not set
 # CONFIG_BT_LE is not set
 # CONFIG_BT_LEDS is not set
 CONFIG_BT_LE_L2CAP_ECRED=y
@@ -775,7 +879,9 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BUILDTIME_TABLE_SORT=y
+# CONFIG_BUILD_BIN2C is not set
 CONFIG_BUILD_SALT=""
 # CONFIG_C2PORT is not set
 # CONFIG_CACHESTAT_SYSCALL is not set
@@ -812,8 +918,12 @@ CONFIG_CACHE_L2X0_PMU=y
 # CONFIG_CAN_UCAN is not set
 # CONFIG_CAN_VCAN is not set
 # CONFIG_CAN_VXCAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
 CONFIG_CARDBUS=y
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
 # CONFIG_CARL9170 is not set
 # CONFIG_CASSINI is not set
 # CONFIG_CAVIUM_CPT is not set
@@ -856,6 +966,7 @@ CONFIG_CFG80211_HEADERS=y
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_MAX77976 is not set
@@ -869,27 +980,35 @@ CONFIG_CFG80211_HEADERS=y
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_UCS1002 is not set
+# CONFIG_CHASH_SELFTEST is not set
+# CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHELSIO_T4 is not set
 # CONFIG_CHELSIO_T4VF is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CHR_DEV_OSST is not set
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_CHR_DEV_SG is not set
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_CIFS is not set
+# CONFIG_CIFS_ACL is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_NFSD_EXPORT is not set
 CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_SMB2 is not set
+# CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_STATS2 is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
 CONFIG_CIFS_XATTR=y
 # CONFIG_CIO_DAC is not set
+# CONFIG_CLEANCACHE is not set
 # CONFIG_CLKSRC_PISTACHIO is not set
 # CONFIG_CLKSRC_VERSATILE is not set
 # CONFIG_CLK_GFM_LPASS_SM8250 is not set
@@ -897,6 +1016,7 @@ CONFIG_CIFS_XATTR=y
 # CONFIG_CLK_ICST is not set
 # CONFIG_CLK_QORIQ is not set
 # CONFIG_CLK_SP810 is not set
+# CONFIG_CLOCK_THERMAL is not set
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CM32181 is not set
@@ -939,6 +1059,8 @@ CONFIG_CMDLINE=""
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_QCOM is not set
+# CONFIG_COMMON_CLK_RP1 is not set
+# CONFIG_COMMON_CLK_RP1_SDIO  is not set
 # CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI521XX is not set
@@ -982,6 +1104,7 @@ CONFIG_CONSTRUCTORS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
 # CONFIG_CPU_FREQ_THERMAL is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
@@ -1015,7 +1138,7 @@ CONFIG_CRC32_SARWATE=y
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC_ITU_T is not set
 # CONFIG_CRC_T10DIF is not set
-# CONFIG_CROS_HPS_I2C is not set
+CONFIG_CROSS_COMPILE=""
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_842 is not set
@@ -1024,8 +1147,13 @@ CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
 # CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
 # CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
 CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_AES_ARM is not set
 # CONFIG_CRYPTO_AES_ARM64 is not set
 # CONFIG_CRYPTO_AES_ARM64_BS is not set
@@ -1091,14 +1219,14 @@ CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_DEV_CCREE is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 # CONFIG_CRYPTO_DEV_HISI_ZIP is not set
 # CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
+# CONFIG_CRYPTO_DEV_MEDIATEK is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
+# CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_CRYPTO_DEV_OCTEONTX_CPT is not set
@@ -1129,6 +1257,7 @@ CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_GHASH_ARM64_CE is not set
 # CONFIG_CRYPTO_GHASH_ARM_CE is not set
@@ -1159,14 +1288,22 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MCRYPTD is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
 # CONFIG_CRYPTO_NHPOLY1305_NEON is not set
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_OFB is not set
 # CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
 CONFIG_CRYPTO_PCRYPT=y
 # CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_POLY1305_ARM is not set
@@ -1211,6 +1348,7 @@ CONFIG_CRYPTO_SKCIPHER2=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
+# CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_STATS is not set
 # CONFIG_CRYPTO_STREEBOG is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1230,6 +1368,7 @@ CONFIG_CRYPTO_SKCIPHER2=y
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_XXHASH is not set
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYPTO_ZSTD is not set
 # CONFIG_CS5535_MFGPT is not set
 # CONFIG_CS89x0 is not set
@@ -1238,8 +1377,12 @@ CONFIG_CRYPTO_SKCIPHER2=y
 # CONFIG_CUSE is not set
 # CONFIG_CW1200 is not set
 # CONFIG_CXD2880_SPI_DRV is not set
+# CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_BUS is not set
+# CONFIG_CXL_EEH is not set
+# CONFIG_CXL_KERNEL_API is not set
+# CONFIG_CXL_LIB is not set
 # CONFIG_CYPRESS_FIRMWARE is not set
 # CONFIG_DA280 is not set
 # CONFIG_DA311 is not set
@@ -1250,11 +1393,14 @@ CONFIG_CRYPTO_SKCIPHER2=y
 # CONFIG_DDR is not set
 # CONFIG_DEBUG_ALIGN_RODATA is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_CGROUP_REF is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_EFI is not set
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
 # CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_DEBUG_FS=y
@@ -1294,12 +1440,14 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NET is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -1314,10 +1462,12 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
 # CONFIG_DEBUG_UART_8250_PALMCHIP is not set
 # CONFIG_DEBUG_UART_8250_WORD is not set
+# CONFIG_DEBUG_UART_BCM63XX is not set
 # CONFIG_DEBUG_UART_FLOW_CONTROL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_VIRTUAL is not set
@@ -1326,12 +1476,15 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_VM_PGFLAGS is not set
 # CONFIG_DEBUG_VM_PGTABLE is not set
 # CONFIG_DEBUG_VM_RB is not set
+# CONFIG_DEBUG_VM_VMACACHE is not set
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # 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_FQ_PIE is not set
@@ -1340,12 +1493,15 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_DEFAULT_NET_SCH="fq_codel"
+# CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_PFIFO_FAST is not set
 # CONFIG_DEFAULT_RENO is not set
+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
 # CONFIG_DELL_LAPTOP is not set
 # CONFIG_DELL_RBTN is not set
@@ -1353,13 +1509,27 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_DELL_SMO8800 is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_DEVMEM is not set
 CONFIG_DEVPORT=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DEVTMPFS is not set
 # CONFIG_DEVTMPFS_MOUNT is not set
 # CONFIG_DEVTMPFS_SAFE is not set
 # CONFIG_DEV_DAX is not set
+# CONFIG_DGAP is not set
+# CONFIG_DGNC is not set
 # CONFIG_DHT11 is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
+# CONFIG_DISPLAY_CONNECTOR_DVI is not set
+# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
+# CONFIG_DISPLAY_ENCODER_TFP410 is not set
+# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
+# CONFIG_DISPLAY_PANEL_DPI is not set
+# CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DL2K is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DLM is not set
@@ -1376,6 +1546,7 @@ CONFIG_DEVPORT=y
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
 # CONFIG_DMARD10 is not set
+# CONFIG_DMASCC is not set
 # CONFIG_DMATEST is not set
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_COHERENT_POOL=y
@@ -1385,8 +1556,11 @@ CONFIG_DMA_DECLARE_COHERENT=y
 # CONFIG_DMA_JZ4780 is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
+# CONFIG_DMA_NOOP_OPS is not set
+# CONFIG_DMA_PERNUMA_CMA is not set
 # CONFIG_DMA_RESTRICTED_POOL is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DMA_VIRT_OPS is not set
 # CONFIG_DM_CACHE is not set
 # CONFIG_DM_CLONE is not set
 # CONFIG_DM_DEBUG is not set
@@ -1398,6 +1572,7 @@ CONFIG_DMA_NONCOHERENT_MMAP=y
 # CONFIG_DM_INTEGRITY is not set
 # CONFIG_DM_LOG_USERSPACE is not set
 # CONFIG_DM_LOG_WRITES is not set
+# CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_MULTIPATH is not set
 # CONFIG_DM_RAID is not set
 # CONFIG_DM_SWITCH is not set
@@ -1411,6 +1586,7 @@ CONFIG_DMA_NONCOHERENT_MMAP=y
 # CONFIG_DNET is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_DNS_RESOLVER is not set
+CONFIG_DOUBLEFAULT=y
 # CONFIG_DP83640_PHY is not set
 # CONFIG_DP83822_PHY is not set
 # CONFIG_DP83848_PHY is not set
@@ -1427,10 +1603,14 @@ CONFIG_DQL=y
 # CONFIG_DRM_ACCEL is not set
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_AMDGPU_CIK is not set
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 # CONFIG_DRM_AMDGPU_SI is not set
 # CONFIG_DRM_AMDGPU_USERPTR is not set
 # CONFIG_DRM_AMDGPU_WERROR is not set
 # CONFIG_DRM_AMD_ACP is not set
+# CONFIG_DRM_AMD_DC_DCN2_0 is not set
+# CONFIG_DRM_AMD_DC_DCN3_0 is not set
+# CONFIG_DRM_AMD_DC_HDCP is not set
 # CONFIG_DRM_AMD_DC_SI is not set
 # CONFIG_DRM_AMD_SECURE_DISPLAY is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
@@ -1449,9 +1629,11 @@ CONFIG_DQL=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DP_CEC is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_CEC is not set
 # CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_EXYNOS is not set
@@ -1485,6 +1667,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
 # CONFIG_DRM_LOONGSON is not set
 # CONFIG_DRM_LVDS_CODEC is not set
+# CONFIG_DRM_LVDS_ENCODER is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1510,6 +1693,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -1543,6 +1727,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -1565,6 +1750,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
@@ -1573,10 +1759,12 @@ CONFIG_DQL=y
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_TPO_Y17P is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
+# CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # CONFIG_DRM_PANFROST is not set
@@ -1591,6 +1779,9 @@ CONFIG_DQL=y
 # CONFIG_DRM_RCAR_USE_LVDS is not set
 # CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
 # CONFIG_DRM_ROCKCHIP is not set
+# CONFIG_DRM_RP1_DPI is not set
+# CONFIG_DRM_RP1_DSI is not set
+# CONFIG_DRM_RP1_VEC is not set
 # CONFIG_DRM_SAMSUNG_DSIM is not set
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_SII9234 is not set
@@ -1604,6 +1795,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_TILCDC is not set
+# CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_TI_DLPC3433 is not set
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
@@ -1818,7 +2010,9 @@ CONFIG_EFI_PARTITION=y
 CONFIG_ELFCORE=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_EMAC_ROCKCHIP is not set
+CONFIG_EMBEDDED=y
 # CONFIG_EM_TIMER_STI is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENA_ETHERNET is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
@@ -1846,12 +2040,14 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT2_FS_XATTR=y
 # CONFIG_EXT3_FS is not set
 # CONFIG_EXT4_DEBUG is not set
+# CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_FS is not set
 # CONFIG_EXT4_FS_POSIX_ACL is not set
 # CONFIG_EXT4_FS_SECURITY is not set
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON is not set
 # CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_ARIZONA is not set
 # CONFIG_EXTCON_AXP288 is not set
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON_GPIO is not set
@@ -1866,16 +2062,19 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 # CONFIG_EXYNOS_ADC is not set
+# CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
+# CONFIG_F2FS_FS_ENCRYPTION is not set
 # CONFIG_F2FS_FS_POSIX_ACL is not set
 # CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IOSTAT is not set
+# CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
 # CONFIG_FAILOVER is not set
@@ -1896,8 +2095,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_ATMEL is not set
 # CONFIG_FB_ATY is not set
 # CONFIG_FB_ATY128 is not set
+# CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_BIG_ENDIAN is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 # CONFIG_FB_BOTH_ENDIAN is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_CARMINE is not set
@@ -1910,6 +2111,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_DA8XX is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_DEVICE is not set
+# CONFIG_FB_FLEX is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_FSL_DIU is not set
 # CONFIG_FB_GEODE is not set
@@ -1927,6 +2129,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_MXS is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_NEOMAGIC is not set
 CONFIG_FB_NOTIFY=y
@@ -1940,6 +2143,7 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_PXA is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_RIVA is not set
+# CONFIG_FB_RPISENSE is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_S3 is not set
 # CONFIG_FB_SAVAGE is not set
@@ -1957,6 +2161,7 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_TFT is not set
 # CONFIG_FB_TFT_AGM1264K_FL is not set
 # CONFIG_FB_TFT_BD663474 is not set
+# CONFIG_FB_TFT_FBTFT_DEVICE is not set
 # CONFIG_FB_TFT_HX8340BN is not set
 # CONFIG_FB_TFT_HX8347D is not set
 # CONFIG_FB_TFT_HX8353D is not set
@@ -1977,6 +2182,7 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_TFT_SSD1289 is not set
 # CONFIG_FB_TFT_SSD1305 is not set
 # CONFIG_FB_TFT_SSD1306 is not set
+# CONFIG_FB_TFT_SSD1325 is not set
 # CONFIG_FB_TFT_SSD1331 is not set
 # CONFIG_FB_TFT_SSD1351 is not set
 # CONFIG_FB_TFT_ST7735R is not set
@@ -1986,7 +2192,9 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_TFT_UC1611 is not set
 # CONFIG_FB_TFT_UC1701 is not set
 # CONFIG_FB_TFT_UPD161704 is not set
+# CONFIG_FB_TFT_WATTEROTT is not set
 # CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_TMIO is not set
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
@@ -1995,10 +2203,12 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
+# CONFIG_FB_XGI is not set
 # CONFIG_FCOE is not set
 # CONFIG_FCOE_FNIC is not set
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
+# CONFIG_FENCE_TRACE is not set
 # CONFIG_FHANDLE is not set
 CONFIG_FIB_RULES=y
 # CONFIG_FIELDBUS_DEV is not set
@@ -2006,12 +2216,16 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
 # CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FM10K is not set
+# CONFIG_FMC is not set
 # CONFIG_FONTS is not set
 # CONFIG_FONT_6x8 is not set
 # CONFIG_FONT_TER16x32 is not set
@@ -2025,6 +2239,7 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_FREEZER is not set
+# CONFIG_FRONTSWAP is not set
 # CONFIG_FSCACHE is not set
 # CONFIG_FSI is not set
 # CONFIG_FSL_DPAA2_SWITCH is not set
@@ -2084,6 +2299,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_GACT_PROB=y
 # CONFIG_GADGET_UAC1 is not set
 # CONFIG_GAMEPORT is not set
+# CONFIG_GATEWORKS_GW16083 is not set
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV is not set
 # CONFIG_GCOV_KERNEL is not set
@@ -2104,6 +2320,9 @@ CONFIG_GENERIC_VDSO_TIME_NS=y
 # CONFIG_GENEVE is not set
 # CONFIG_GENWQE is not set
 # CONFIG_GFS2_FS is not set
+# CONFIG_GIGASET_CAPI is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GIGASET_DUMMYLL is not set
 # CONFIG_GLOB_SELFTEST is not set
 # CONFIG_GNSS is not set
 # CONFIG_GOLDFISH is not set
@@ -2123,6 +2342,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 # CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMD8111 is not set
@@ -2153,6 +2373,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 # CONFIG_GPIO_IT87 is not set
 # CONFIG_GPIO_LATCH is not set
 # CONFIG_GPIO_LOGICVC is not set
+# CONFIG_GPIO_LYNXPOINT is not set
 # CONFIG_GPIO_MAX3191X is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
@@ -2171,6 +2392,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_PWM is not set
 # CONFIG_GPIO_RCAR is not set
 # CONFIG_GPIO_RDC321X is not set
 # CONFIG_GPIO_SAMA5D2_PIOBU is not set
@@ -2178,6 +2400,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SIM is not set
+# CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
 CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
@@ -2192,17 +2415,24 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_XRA1403 is not set
 # CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_ZX is not set
 # CONFIG_GP_PCI1XXXX is not set
 # CONFIG_GREENASIA_FF is not set
 # CONFIG_GREYBUS is not set
+# CONFIG_GS_FPGABOOT is not set
 # CONFIG_GTP is not set
+# CONFIG_GUP_BENCHMARK is not set
 # CONFIG_GUP_TEST is not set
 # CONFIG_GVE is not set
+# CONFIG_HABANA_AI is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HAPPYMEAL is not set
 CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_HARDEN_BRANCH_HISTORY=y
+CONFIG_HARDEN_EL2_VECTORS=y
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_HAVE_ARM_ARCH_TIMER is not set
 # CONFIG_HCALL_STATS is not set
@@ -2216,10 +2446,14 @@ CONFIG_HARDEN_BRANCH_HISTORY=y
 # CONFIG_HDLC_RAW_ETH is not set
 # CONFIG_HDMI_LPE_AUDIO is not set
 # CONFIG_HDQ_MASTER_OMAP is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_HEADERS_INSTALL is not set
+# CONFIG_HEADER_TEST is not set
 # CONFIG_HERMES is not set
 # CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
 # CONFIG_HFS_FS is not set
+# CONFIG_HFS_FS_POSIX_ACL is not set
 # CONFIG_HI6421V600_IRQ is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HIBERNATION is not set
@@ -2366,15 +2600,19 @@ CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HOTPLUG_CPU is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HP03 is not set
+# CONFIG_HP100 is not set
 # CONFIG_HP206C is not set
 CONFIG_HPET_MMAP_DEFAULT=y
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_HP_WATCHDOG is not set
+# CONFIG_HP_WIRELESS is not set
 # CONFIG_HSA_AMD is not set
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTE is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
@@ -2414,6 +2652,8 @@ CONFIG_HW_RANDOM_TPM=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_HX711 is not set
 # CONFIG_HYPERV is not set
+# CONFIG_HYPERV_TSCPAGE is not set
+# CONFIG_HYSDN is not set
 CONFIG_HZ=100
 CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
@@ -2490,6 +2730,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_OCTEON is not set
 # CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PCA_ISA is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PCI1XXXX is not set
@@ -2538,7 +2779,12 @@ CONFIG_HZ_100=y
 # CONFIG_ICP10100 is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_ICS932S401 is not set
+# CONFIG_ICST is not set
+# CONFIG_IDE is not set
 # CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_IDE_GD is not set
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 # CONFIG_IEEE802154 is not set
 # CONFIG_IEEE802154_ADF7242 is not set
@@ -2555,6 +2801,7 @@ CONFIG_HZ_100=y
 # CONFIG_IIO_BUFFER_CB is not set
 # CONFIG_IIO_BUFFER_DMA is not set
 # CONFIG_IIO_BUFFER_DMAENGINE is not set
+# CONFIG_IIO_BUFFER_HDC2010 is not set
 # CONFIG_IIO_BUFFER_HW_CONSUMER is not set
 # CONFIG_IIO_CONFIGFS is not set
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -2563,6 +2810,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_IIO_KX022A_I2C is not set
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
+# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_IIO_RESCALE is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
@@ -2581,11 +2829,11 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IKHEADERS is not set
 # CONFIG_IMA is not set
+# CONFIG_IMAGE_CMDLINE_HACK is not set
 # CONFIG_IMGPDC_WDT is not set
 # CONFIG_IMG_MDC_DMA is not set
 # CONFIG_IMX7D_ADC is not set
 # CONFIG_IMX8QXP_ADC is not set
-# CONFIG_IMX93_ADC is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_THERMAL is not set
 # CONFIG_INA2XX_ADC is not set
@@ -2602,6 +2850,7 @@ CONFIG_INET=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_ESPINTCP is not set
 # CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
 CONFIG_INET_TABLE_PERTURB_ORDER=16
 # CONFIG_INET_TCP_DIAG is not set
 # CONFIG_INET_TUNNEL is not set
@@ -2650,9 +2899,11 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_EVBUG is not set
 # CONFIG_INPUT_EVDEV is not set
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
 # CONFIG_INPUT_GPIO_VIBRA is not set
 # CONFIG_INPUT_IBM_PANEL is not set
 # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
@@ -2672,14 +2923,18 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 # CONFIG_INPUT_PALMAS_PWRBUTTON is not set
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
 # CONFIG_INPUT_PM8941_PWRKEY is not set
 # CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+# CONFIG_INPUT_POLLDEV is not set
 # CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
 # CONFIG_INPUT_PWM_VIBRA is not set
+# CONFIG_INPUT_RASPBERRYPI_BUTTON is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 # CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
@@ -2698,6 +2953,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
 # CONFIG_INTEL_ATOMISP2_LED is not set
 # CONFIG_INTEL_ATOMISP2_PM is not set
+# CONFIG_INTEL_CHT_INT33FE is not set
 # CONFIG_INTEL_HID_EVENT is not set
 # CONFIG_INTEL_IDLE is not set
 # CONFIG_INTEL_IDMA64 is not set
@@ -2707,6 +2963,9 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MEI_ME is not set
 # CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MIC_CARD is not set
+# CONFIG_INTEL_MIC_HOST is not set
+# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_INTEL_OAKTRAIL is not set
 # CONFIG_INTEL_PMC_CORE is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
@@ -2791,6 +3050,7 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IPW2200_QOS is not set
 # CONFIG_IPW2200_RADIOTAP is not set
 # CONFIG_IPWIRELESS is not set
+# CONFIG_IPX is not set
 CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_FIB_TRIE_STATS is not set
@@ -2810,6 +3070,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_MATCH_TTL is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_MASQUERADE is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
@@ -2829,8 +3090,10 @@ CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_VS_MH is not set
 CONFIG_IP_VS_MH_TAB_INDEX=10
 # CONFIG_IP_VS_TWOS is not set
+# CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_IRQ_ALL_CPUS is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_IRQ_POLL is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_IRSD200 is not set
@@ -2842,12 +3105,14 @@ CONFIG_IP_VS_MH_TAB_INDEX=10
 # CONFIG_IR_IMON is not set
 # CONFIG_IR_IMON_RAW is not set
 # CONFIG_IR_JVC_DECODER is not set
+# CONFIG_IR_LIRC_CODEC is not set
 # CONFIG_IR_MCEUSB is not set
 # CONFIG_IR_NEC_DECODER is not set
 # CONFIG_IR_RC5_DECODER is not set
 # CONFIG_IR_RC6_DECODER is not set
 # CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
 # CONFIG_IR_SONY_DECODER is not set
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_IR_TOY is not set
@@ -2857,7 +3122,18 @@ CONFIG_IP_VS_MH_TAB_INDEX=10
 # CONFIG_ISCSI_BOOT_SYSFS is not set
 # CONFIG_ISCSI_TCP is not set
 CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
 # CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_GIGASET is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_I4L is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISL29020 is not set
 # CONFIG_ISL29125 is not set
@@ -2867,6 +3143,7 @@ CONFIG_ISDN=y
 # CONFIG_ITG3200 is not set
 # CONFIG_IWL3945 is not set
 # CONFIG_IWLWIFI is not set
+# CONFIG_IXGB is not set
 # CONFIG_IXGBE is not set
 # CONFIG_IXGBEVF is not set
 # CONFIG_JAILHOUSE_GUEST is not set
@@ -2899,6 +3176,7 @@ CONFIG_JOLIET=y
 # CONFIG_JSA1212 is not set
 # CONFIG_JUMP_LABEL is not set
 # CONFIG_JZ4740_WDT is not set
+# CONFIG_JZ4770_PHY is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
 # CONFIG_KALLSYMS_ALL is not set
@@ -2914,6 +3192,7 @@ CONFIG_KASAN_STACK=y
 CONFIG_KCOV_IRQ_AREA_SIZE=0x40000
 # CONFIG_KCSAN is not set
 # CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_CAT is not set
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZ4 is not set
 # CONFIG_KERNEL_LZMA is not set
@@ -2969,7 +3248,9 @@ CONFIG_KERNFS=y
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_KFENCE is not set
 # CONFIG_KGDB is not set
+# CONFIG_KMEMCHECK is not set
 # CONFIG_KMX61 is not set
+# CONFIG_KPC2000 is not set
 # CONFIG_KPROBES is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -2996,20 +3277,25 @@ CONFIG_KUSER_HELPERS=y
 # CONFIG_L2TP_V3 is not set
 # CONFIG_LAN743X is not set
 # CONFIG_LAN966X_SWITCH is not set
+# CONFIG_LANMEDIA is not set
 # CONFIG_LANTIQ is not set
 # CONFIG_LAPB is not set
+# CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_LBDAF=y
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_LCD_HX8357 is not set
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
+# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LDISC_AUTOLOAD=y
@@ -3093,6 +3379,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LED_TRIGGER_PHY is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LGUEST is not set
 # CONFIG_LIB80211 is not set
 # CONFIG_LIB80211_CRYPT_CCMP is not set
 # CONFIG_LIB80211_CRYPT_TKIP is not set
@@ -3106,11 +3393,13 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LIBFCOE is not set
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
+CONFIG_LIB_MEMNEQ=y
 # CONFIG_LIDAR_LITE_V2 is not set
 CONFIG_LINEAR_RANGES=y
 # CONFIG_LIQUIDIO is not set
 # CONFIG_LIQUIDIO_VF is not set
 # CONFIG_LIRC is not set
+# CONFIG_LIS3L02DQ is not set
 # CONFIG_LIST_HARDENED is not set
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
@@ -3120,6 +3409,7 @@ CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 # CONFIG_LMK04832 is not set
 # CONFIG_LMP91000 is not set
+# CONFIG_LNET is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_LOCKD is not set
@@ -3135,6 +3425,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_LOGFS is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -3162,8 +3453,10 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_LTC2983 is not set
 # CONFIG_LTE_GDM724X is not set
 CONFIG_LTO_NONE=y
+# CONFIG_LTPC is not set
 # CONFIG_LTR501 is not set
 # CONFIG_LTRF216A is not set
+# CONFIG_LUSTRE_FS is not set
 # CONFIG_LV0104CS is not set
 # CONFIG_LWTUNNEL is not set
 # CONFIG_LXT_PHY is not set
@@ -3190,8 +3483,12 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_MACH_LOONGSON64 is not set
 # CONFIG_MACH_NINTENDO64 is not set
 # CONFIG_MACH_PIC32 is not set
+# CONFIG_MACH_PISTACHIO is not set
 # CONFIG_MACH_REALTEK_RTL is not set
+# CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_MACH_XILFPGA is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MACSEC is not set
 # CONFIG_MACVLAN is not set
@@ -3205,6 +3502,7 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 # CONFIG_MAILBOX is not set
 # CONFIG_MANAGER_SBS is not set
+# CONFIG_MANDATORY_FILE_LOCKING is not set
 # CONFIG_MANGLE_BOOTARGS is not set
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88Q2XXX_PHY is not set
@@ -3236,6 +3534,7 @@ CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 # CONFIG_MAXLINEAR_GPHY is not set
 CONFIG_MAX_SKB_FRAGS=17
+CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MB1232 is not set
 # CONFIG_MC3230 is not set
 # CONFIG_MCB is not set
@@ -3266,6 +3565,7 @@ CONFIG_MAX_SKB_FRAGS=17
 # CONFIG_MDIO_MVUSB is not set
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
+# CONFIG_MDIO_XPCS is not set
 # CONFIG_MDM_GCC_9607 is not set
 # CONFIG_MD_BITMAP_FILE is not set
 # CONFIG_MD_FAULTY is not set
@@ -3282,6 +3582,7 @@ CONFIG_MAX_SKB_FRAGS=17
 # CONFIG_MEDIA_PLATFORM_DRIVERS is not set
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 # CONFIG_MEDIA_SUPPORT is not set
@@ -3349,6 +3650,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
+# CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -3358,6 +3660,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_CS42L43_I2C is not set
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -3371,6 +3674,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
+# CONFIG_MFD_INTEL_PMT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -3406,39 +3710,52 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_OMAP_USB_HOST is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_PM8921_CORE is not set
 # CONFIG_MFD_PM8XXX is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_RASPBERRYPI_POE_HAT is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
+# CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RK8XX_I2C is not set
 # CONFIG_MFD_RK8XX_SPI is not set
 # CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_RP1 is not set
+# CONFIG_MFD_RPISENSE_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
 # CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RT5120 is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_RTSX_USB is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_SL28CPLD is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SMPRO is not set
+# CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SY7636A is not set
 # CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
@@ -3451,6 +3768,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_TPS6594_I2C is not set
 # CONFIG_MFD_TPS6594_SPI is not set
+# CONFIG_MFD_TPS68470 is not set
+# CONFIG_MFD_TPS80031 is not set
 # CONFIG_MFD_TQMX86 is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_VX855 is not set
@@ -3461,6 +3780,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM8994 is not set
+# CONFIG_MG_DISK is not set
 # CONFIG_MHI_BUS is not set
 # CONFIG_MHI_BUS_DEBUG is not set
 # CONFIG_MHI_BUS_EP is not set
@@ -3470,6 +3790,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MHI_WWAN_MBIM is not set
 # CONFIG_MICREL_KS8995MA is not set
 # CONFIG_MICREL_PHY is not set
+# CONFIG_MICROCHIP_KSZ is not set
 # CONFIG_MICROCHIP_PHY is not set
 # CONFIG_MICROCHIP_PIT64B is not set
 # CONFIG_MICROCHIP_T1S_PHY is not set
@@ -3488,16 +3809,20 @@ CONFIG_MII=y
 # CONFIG_MIPS_CDMM is not set
 # CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set
 # CONFIG_MIPS_CMDLINE_FROM_DTB is not set
+# CONFIG_MIPS_CMP is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_CPS is not set
 # CONFIG_MIPS_ELF_APPENDED_DTB is not set
+# CONFIG_MIPS_FPU_EMULATOR is not set
 # CONFIG_MIPS_FP_SUPPORT is not set
 # CONFIG_MIPS_GENERIC is not set
 # CONFIG_MIPS_GENERIC_KERNEL is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_MIPS_O32_FP64_SUPPORT is not set
+# CONFIG_MIPS_PARAVIRT is not set
 # CONFIG_MIPS_PLATFORM_DEVICES is not set
 # CONFIG_MIPS_RAW_APPENDED_DTB is not set
+# CONFIG_MIPS_SEAD3 is not set
 # CONFIG_MIPS_VA_BITS_48 is not set
 # CONFIG_MIPS_VPE_LOADER is not set
 # CONFIG_MISC_ALCOR_PCI is not set
@@ -3517,6 +3842,7 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MLX4_CORE is not set
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX5_CORE is not set
+# CONFIG_MLX5_EN_MACSEC is not set
 # CONFIG_MLX5_MACSEC is not set
 # CONFIG_MLX5_SF is not set
 # CONFIG_MLX5_VFIO_PCI is not set
@@ -3524,6 +3850,7 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXFW is not set
 # CONFIG_MLXSW_CORE is not set
+# CONFIG_MLX_CPLD_PLATFORM is not set
 # CONFIG_MLX_PLATFORM is not set
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
@@ -3536,6 +3863,7 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_MMC_ARMMMCI is not set
 # CONFIG_MMC_AU1X is not set
 # CONFIG_MMC_BLOCK is not set
+CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_MMC_CAVIUM_THUNDERX is not set
 # CONFIG_MMC_CB710 is not set
@@ -3546,6 +3874,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 # CONFIG_MMC_JZ4740 is not set
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_MVSDIO is not set
+# CONFIG_MMC_S3C is not set
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SDHCI_ACPI is not set
 # CONFIG_MMC_SDHCI_AM654 is not set
@@ -3584,6 +3913,7 @@ CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_NONE=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
@@ -3659,12 +3989,15 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_DOCG3 is not set
 CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_GPIO_ADDR is not set
 # CONFIG_MTD_HYPERBUS is not set
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LATCH_ADDR is not set
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_LPDDR2_NVM is not set
+# CONFIG_MTD_M25P80 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
@@ -3673,12 +4006,18 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MCHP23K256 is not set
 # CONFIG_MTD_MCHP48L640 is not set
+# CONFIG_MTD_MT81xx_NOR is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_MYLOADER_PARTS is not set
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_NAND_AMS_DELTA is not set
+# CONFIG_MTD_NAND_AR934X is not set
+# CONFIG_MTD_NAND_AR934X_HW_ECC is not set
 # CONFIG_MTD_NAND_ARASAN is not set
 # CONFIG_MTD_NAND_ATMEL is not set
 # CONFIG_MTD_NAND_AU1550 is not set
+# CONFIG_MTD_NAND_BCH is not set
+# CONFIG_MTD_NAND_BF5XX is not set
 # CONFIG_MTD_NAND_BRCMNAND is not set
 # CONFIG_MTD_NAND_BRCMNAND_BCM63XX is not set
 # CONFIG_MTD_NAND_BRCMNAND_BCMBCA is not set
@@ -3686,14 +4025,19 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_NAND_BRCMNAND_IPROC is not set
 # CONFIG_MTD_NAND_CADENCE is not set
 # CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CM_X270 is not set
 # CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_DAVINCI is not set
 # CONFIG_MTD_NAND_DENALI is not set
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_DENALI_PCI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xff108018
 # CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_ECC is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_NAND_ECC_MXIC is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
@@ -3704,7 +4048,9 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_GPMI_NAND is not set
 # CONFIG_MTD_NAND_HISI504 is not set
+CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_INTEL_LGM is not set
+# 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
@@ -3712,16 +4058,22 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_NAND_MXIC is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_NDFC is not set
+# CONFIG_MTD_NAND_NUC900 is not set
 # CONFIG_MTD_NAND_OMAP2 is not set
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
 # CONFIG_MTD_NAND_ORION is not set
 # CONFIG_MTD_NAND_PASEMI is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_PXA3xx is not set
+# CONFIG_MTD_NAND_RB4XX is not set
+# CONFIG_MTD_NAND_RB750 is not set
+# CONFIG_MTD_NAND_RB91X is not set
 # CONFIG_MTD_NAND_RICOH is not set
 # CONFIG_MTD_NAND_S3C2410 is not set
 # CONFIG_MTD_NAND_SHARPSL is not set
 # CONFIG_MTD_NAND_SH_FLCTL is not set
 # CONFIG_MTD_NAND_SOCRATES is not set
+# CONFIG_MTD_NAND_TMIO is not set
 # CONFIG_MTD_NAND_TXX9NDFMC is not set
 CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_ONENAND is not set
@@ -3738,6 +4090,8 @@ CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
 # CONFIG_MTD_PHYSMAP_IXP4XX is not set
 CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PHYSMAP_OF_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
@@ -3753,6 +4107,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
 # CONFIG_MTD_SERCOMM_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_SPINAND_MT29F is not set
 # CONFIG_MTD_SPI_NAND is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
@@ -3788,8 +4143,10 @@ CONFIG_MTD_SPLIT_SUPPORT=y
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_NVMEM is not set
+# CONFIG_MTD_UIMAGE_SPLIT is not set
 # CONFIG_MTD_VIRT_CONCAT is not set
 # CONFIG_MTK_DEVAPC is not set
+# CONFIG_MTK_MMC is not set
 # CONFIG_MTK_MMSYS is not set
 # CONFIG_MTK_T7XX is not set
 # CONFIG_MTK_THERMAL is not set
@@ -3803,6 +4160,7 @@ CONFIG_MULTIUSER=y
 # CONFIG_MV643XX_ETH is not set
 # CONFIG_MVMDIO is not set
 # CONFIG_MVNETA_BM is not set
+# CONFIG_MVSW61XX_PHY is not set
 # CONFIG_MV_XOR_V2 is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MWL8K is not set
@@ -3815,8 +4173,10 @@ CONFIG_MULTIUSER=y
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
 # CONFIG_NCN26000_PHY is not set
+# CONFIG_NCP_FS is not set
 # CONFIG_NE2000 is not set
 # CONFIG_NE2K_PCI is not set
+# CONFIG_NEC_MARKEINS is not set
 CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETCONSOLE_EXTENDED_LOG is not set
@@ -3824,6 +4184,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETDEVSIM is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_NETFILTER_ADVANCED is not set
+# CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_EGRESS is not set
 # CONFIG_NETFILTER_INGRESS is not set
 # CONFIG_NETFILTER_NETLINK is not set
@@ -3909,6 +4270,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETFS_STATS is not set
 # CONFIG_NETLABEL is not set
 # CONFIG_NETLINK_DIAG is not set
+# CONFIG_NETLINK_MMAP is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -3934,6 +4296,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NET_ACT_SKBMOD is not set
 # CONFIG_NET_ACT_TUNNEL_KEY is not set
 # CONFIG_NET_ACT_VLAN is not set
+CONFIG_NET_CADENCE=y
 # CONFIG_NET_CALXEDA_XGMAC is not set
 CONFIG_NET_CLS=y
 # CONFIG_NET_CLS_ACT is not set
@@ -3942,8 +4305,11 @@ CONFIG_NET_CLS=y
 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FLOWER is not set
 # CONFIG_NET_CLS_FW is not set
+CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_MATCHALL is not set
 # CONFIG_NET_CLS_ROUTE4 is not set
+# CONFIG_NET_CLS_RSVP is not set
+# CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_CLS_U32 is not set
 CONFIG_NET_CORE=y
 # CONFIG_NET_DEVLINK is not set
@@ -3953,14 +4319,22 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DSA_AR9331 is not set
 # CONFIG_NET_DSA_BCM_SF2 is not set
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
+# CONFIG_NET_DSA_LEGACY is not set
 # CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
+# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
 # CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON is not set
 # CONFIG_NET_DSA_MSCC_FELIX is not set
 # CONFIG_NET_DSA_MSCC_OCELOT_EXT is not set
 # CONFIG_NET_DSA_MSCC_SEVILLE is not set
 # CONFIG_NET_DSA_MT7530 is not set
 # CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6171 is not set
+# CONFIG_NET_DSA_MV88E6352 is not set
 # CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # CONFIG_NET_DSA_QCA8K is not set
 # CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT is not set
@@ -3969,6 +4343,7 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DSA_SJA1105 is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+# CONFIG_NET_DSA_TAG_8021Q is not set
 # CONFIG_NET_DSA_TAG_AR9331 is not set
 # CONFIG_NET_DSA_TAG_BRCM is not set
 # CONFIG_NET_DSA_TAG_BRCM_LEGACY is not set
@@ -4023,6 +4398,7 @@ CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_NCSI is not set
 # CONFIG_NET_NSH is not set
 # CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_PTP_CLASSIFY is not set
@@ -4060,9 +4436,11 @@ CONFIG_NET_SCH_FQ_CODEL=y
 # CONFIG_NET_SCH_TAPRIO is not set
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_TEQL is not set
+# CONFIG_NET_SCTPPROBE is not set
 # CONFIG_NET_SELFTESTS is not set
 CONFIG_NET_SOCK_MSG=y
 # CONFIG_NET_SWITCHDEV is not set
+# CONFIG_NET_TCPPROBE is not set
 # CONFIG_NET_TC_SKB_EXT is not set
 # CONFIG_NET_TEAM is not set
 # CONFIG_NET_TULIP is not set
@@ -4080,6 +4458,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_NET_VENDOR_ARC=y
 # CONFIG_NET_VENDOR_ASIX is not set
 CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_VENDOR_AURORA=y
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_NET_VENDOR_CADENCE=y
@@ -4093,6 +4472,7 @@ CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_NET_VENDOR_ENGLEDER is not set
+CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_FARADAY=y
 CONFIG_NET_VENDOR_FREESCALE=y
@@ -4100,6 +4480,7 @@ CONFIG_NET_VENDOR_FUJITSU=y
 # CONFIG_NET_VENDOR_FUNGIBLE is not set
 CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_HISILICON=y
+CONFIG_NET_VENDOR_HP=y
 CONFIG_NET_VENDOR_HUAWEI=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_IBM=y
@@ -4153,6 +4534,7 @@ CONFIG_NEW_LEDS=y
 # CONFIG_NFSD is not set
 # CONFIG_NFSD_V2 is not set
 # CONFIG_NFSD_V2_ACL is not set
+CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_ACL_SUPPORT is not set
@@ -4176,8 +4558,11 @@ CONFIG_NFS_V3=y
 # CONFIG_NFT_FIB_IPV6 is not set
 # CONFIG_NFT_FIB_NETDEV is not set
 # CONFIG_NFT_FLOW_OFFLOAD is not set
+# CONFIG_NFT_OBJREF is not set
 # CONFIG_NFT_OSF is not set
 # CONFIG_NFT_REJECT_NETDEV is not set
+# CONFIG_NFT_RT is not set
+# CONFIG_NFT_SET_BITMAP is not set
 # CONFIG_NFT_SOCKET is not set
 # CONFIG_NFT_SYNPROXY is not set
 # CONFIG_NFT_TPROXY is not set
@@ -4195,6 +4580,7 @@ CONFIG_NFS_V3=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
 CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SECMARK is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
@@ -4216,14 +4602,18 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_FLOW_TABLE is not set
 # CONFIG_NF_FLOW_TABLE_PROCFS is not set
 # CONFIG_NF_LOG_ARP is not set
+# CONFIG_NF_LOG_BRIDGE is not set
 # CONFIG_NF_LOG_IPV4 is not set
+# CONFIG_NF_LOG_NETDEV is not set
 # CONFIG_NF_LOG_SYSLOG is not set
 # CONFIG_NF_NAT is not set
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
 # CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_SIP is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_TFTP is not set
@@ -4238,9 +4628,11 @@ CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES_NETDEV=y
+# CONFIG_NF_TABLES_SET is not set
 # CONFIG_NF_TPROXY_IPV4 is not set
 # CONFIG_NF_TPROXY_IPV6 is not set
 # CONFIG_NGBE is not set
+# CONFIG_NI65 is not set
 # CONFIG_NI903X_WDT is not set
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
@@ -4248,6 +4640,8 @@ CONFIG_NF_TABLES_NETDEV=y
 # CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NLATTR=y
 # CONFIG_NLMON is not set
+# CONFIG_NLM_XLP_BOARD is not set
+# CONFIG_NLM_XLR_BOARD is not set
 # CONFIG_NLS is not set
 # CONFIG_NLS_ASCII is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
@@ -4300,11 +4694,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_MAC_TURKISH is not set
 # CONFIG_NLS_UCS2_UTILS is not set
 # CONFIG_NLS_UTF8 is not set
+CONFIG_NMI_LOG_BUF_SHIFT=13
 # CONFIG_NOA1305 is not set
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_NORTEL_HERMES is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 # CONFIG_NOZOMI is not set
+# CONFIG_NO_BOOTMEM is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_NO_HZ_FULL is not set
 # CONFIG_NO_HZ_IDLE is not set
@@ -4321,9 +4718,9 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NULL_TTY is not set
 # CONFIG_NUMA is not set
 # CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
+# CONFIG_NVM is not set
 # CONFIG_NVMEM is not set
 # CONFIG_NVMEM_BCM_OCOTP is not set
-# CONFIG_NVMEM_BLOCK is not set
 # CONFIG_NVMEM_IMX_OCOTP is not set
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
 # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
@@ -4340,6 +4737,8 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NV_TCO is not set
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_CBTX_PHY is not set
+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -4360,8 +4759,11 @@ CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_OPEN_DICE is not set
+# CONFIG_OPROFILE is not set
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 # CONFIG_OPT3001 is not set
 # CONFIG_OPT4001 is not set
+CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ORION_WATCHDOG is not set
 # CONFIG_OSF_PARTITION is not set
@@ -4373,6 +4775,7 @@ CONFIG_OVERLAY_FS=y
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_XINO_AUTO=y
+# CONFIG_OWL_LOADER is not set
 # CONFIG_P54_COMMON is not set
 # CONFIG_PA12203001 is not set
 CONFIG_PACKET=y
@@ -4401,6 +4804,7 @@ CONFIG_PANIC_TIMEOUT=1
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_1284 is not set
+# CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PARPORT_GSC is not set
 # CONFIG_PARPORT_PC is not set
 CONFIG_PARTITION_ADVANCED=y
@@ -4479,6 +4883,7 @@ CONFIG_PCIE_BUS_DEFAULT=y
 # CONFIG_PCIE_BUS_PERFORMANCE is not set
 # CONFIG_PCIE_BUS_SAFE is not set
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
+# CONFIG_PCIE_BW is not set
 # CONFIG_PCIE_CADENCE_HOST is not set
 # CONFIG_PCIE_CADENCE_PLAT_HOST is not set
 # CONFIG_PCIE_DPC is not set
@@ -4549,6 +4954,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCS_MTK_USXGMII is not set
 # CONFIG_PCS_XPCS is not set
 # CONFIG_PD6729 is not set
+# CONFIG_PDA_POWER is not set
 # CONFIG_PDC_ADMA is not set
 # CONFIG_PDS_CORE is not set
 # CONFIG_PECI is not set
@@ -4564,6 +4970,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PHYLIB_LEDS is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PHY_BRCM_USB is not set
+# CONFIG_PHY_CADENCE_DP is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
 # CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
@@ -4587,6 +4994,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PHY_PISTACHIO_USB is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_DWC3 is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
@@ -4599,9 +5007,11 @@ CONFIG_PINCONF=y
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_AXP209 is not set
+# CONFIG_PINCTRL_BCM2712 is not set
 # CONFIG_PINCTRL_CEDARFORK is not set
 # CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_EXYNOS is not set
+# CONFIG_PINCTRL_EXYNOS5440 is not set
 # CONFIG_PINCTRL_ICELAKE is not set
 # CONFIG_PINCTRL_INGENIC is not set
 # CONFIG_PINCTRL_LPASS_LPI is not set
@@ -4618,6 +5028,7 @@ CONFIG_PINCONF=y
 # CONFIG_PINCTRL_MTK_V2 is not set
 # CONFIG_PINCTRL_OCELOT is not set
 # CONFIG_PINCTRL_PISTACHIO is not set
+# CONFIG_PINCTRL_RP1 is not set
 # CONFIG_PINCTRL_SC7280 is not set
 # CONFIG_PINCTRL_SC8180X is not set
 # CONFIG_PINCTRL_SDX55 is not set
@@ -4643,6 +5054,7 @@ CONFIG_PINMUX=y
 # CONFIG_PLX_HERMES is not set
 # CONFIG_PM is not set
 # CONFIG_PMBUS is not set
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMS7003 is not set
@@ -4654,6 +5066,7 @@ CONFIG_PINMUX=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_POSIX_TIMERS=y
 # CONFIG_POWERCAP is not set
+# CONFIG_POWER_AVS is not set
 # CONFIG_POWER_RESET is not set
 # CONFIG_POWER_RESET_BRCMKONA is not set
 # CONFIG_POWER_RESET_BRCMSTB is not set
@@ -4705,6 +5118,7 @@ CONFIG_PPP_MULTILINK=y
 # CONFIG_PPTP is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_TRACER is not set
@@ -4715,9 +5129,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTK=y
 # CONFIG_PRINTK_CALLER is not set
 # CONFIG_PRINTK_INDEX is not set
+CONFIG_PRINTK_NMI=y
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 # CONFIG_PRINTK_TIME is not set
 CONFIG_PRINT_STACK_DEPTH=64
 # CONFIG_PRISM2_USB is not set
+# CONFIG_PRISM54 is not set
 # CONFIG_PROC_CHILDREN is not set
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
@@ -4732,18 +5149,26 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PROVE_RAW_LOCK_NESTING is not set
 # CONFIG_PROVE_RCU is not set
 # CONFIG_PROVE_RCU_LIST is not set
+# CONFIG_PROVE_RCU_REPEATEDLY is not set
 # CONFIG_PSAMPLE is not set
 # CONFIG_PSB6970_PHY is not set
 # CONFIG_PSE_CONTROLLER is not set
 # CONFIG_PSI is not set
 # CONFIG_PSTORE is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_PSTORE_COMPRESS is not set
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+# CONFIG_PSTORE_DEFLATE_COMPRESS is not set
+# CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT is not set
 # CONFIG_PSTORE_FTRACE 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_PTDUMP_DEBUGFS is not set
 # CONFIG_PTP_1588_CLOCK is not set
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
@@ -4754,6 +5179,7 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 # CONFIG_PTP_1588_CLOCK_PCH is not set
 # CONFIG_PTP_1588_CLOCK_VMW is not set
+# CONFIG_PUBLIC_KEY_ALGO_RSA is not set
 # CONFIG_PVPANIC is not set
 # CONFIG_PWM is not set
 # CONFIG_PWM_ATMEL_TCB is not set
@@ -4766,6 +5192,7 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 # CONFIG_PWM_MEDIATEK is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_RASPBERRYPI_POE is not set
+# CONFIG_PWM_RP1 is not set
 # CONFIG_PWM_XILINX is not set
 CONFIG_PWRSEQ_EMMC=y
 # CONFIG_PWRSEQ_SD8787 is not set
@@ -4806,15 +5233,18 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QRTR_MHI is not set
 # CONFIG_QRTR_TUN is not set
 # CONFIG_QSEMI_PHY is not set
+# CONFIG_QUEUED_LOCK_STAT is not set
 # CONFIG_QUICC_ENGINE is not set
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 # CONFIG_QUOTA_DEBUG is not set
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
+# CONFIG_R3964 is not set
 # CONFIG_R6040 is not set
 # CONFIG_R8169 is not set
-# CONFIG_R8169_LEDS is not set
+# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
+# CONFIG_R8723AU is not set
 # CONFIG_RADIO_ADAPTERS is not set
 # CONFIG_RADIO_AZTECH is not set
 # CONFIG_RADIO_CADET is not set
@@ -4836,22 +5266,29 @@ CONFIG_PWRSEQ_SIMPLE=y
 CONFIG_RANDOMIZE_KSTACK_OFFSET=y
 # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
+CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RANDSTRUCT_NONE is not set
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS is not set
+# CONFIG_RASPBERRYPI_GPIOMEM is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_RCU_BOOST is not set
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_RCU_EXPERT is not set
 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+CONFIG_RCU_KTHREAD_PRIO=0
 CONFIG_RCU_NEED_SEGCBLIST=y
+# CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_REF_SCALE_TEST is not set
 # CONFIG_RCU_SCALE_TEST is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_RCU_STRICT_GRACE_PERIOD is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RC_ATI_REMOTE is not set
 # CONFIG_RC_CORE is not set
@@ -4930,6 +5367,7 @@ CONFIG_RCU_STALL_COMMON=y
 # CONFIG_REGULATOR_QCOM_REFGEN is not set
 # CONFIG_REGULATOR_RAA215300 is not set
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_V2 is not set
 # CONFIG_REGULATOR_RT4801 is not set
 # CONFIG_REGULATOR_RT4803 is not set
 # CONFIG_REGULATOR_RT5190A is not set
@@ -4981,6 +5419,7 @@ CONFIG_REISERFS_FS_XATTR=y
 # CONFIG_RESET_PISTACHIO is not set
 # CONFIG_RESET_SIMPLE is not set
 # CONFIG_RESET_SOCFPGA is not set
+# CONFIG_RESET_STM32 is not set
 # CONFIG_RESET_SUNXI is not set
 # CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_RESET_TI_SYSCON is not set
@@ -4993,6 +5432,7 @@ CONFIG_RFKILL=y
 # CONFIG_RFKILL_GPIO is not set
 # CONFIG_RFKILL_INPUT is not set
 # CONFIG_RFKILL_LEDS is not set
+# CONFIG_RFKILL_REGULATOR is not set
 # CONFIG_RICHTEK_RTQ6056 is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -5035,6 +5475,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1305 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1307_CENTURY is not set
+# CONFIG_RTC_DRV_DS1307_HWMON is not set
 # CONFIG_RTC_DRV_DS1343 is not set
 # CONFIG_RTC_DRV_DS1347 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
@@ -5046,6 +5487,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS2404 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_FM3130 is not set
@@ -5056,6 +5498,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_HYM8563 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_ISL12057 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_JZ4740 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
@@ -5085,11 +5528,13 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
 # CONFIG_RTC_DRV_PS3 is not set
+# CONFIG_RTC_DRV_PT7C4338 is not set
 # CONFIG_RTC_DRV_R7301 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_RTC7301 is not set
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV3029C2 is not set
 # CONFIG_RTC_DRV_RV3032 is not set
@@ -5106,6 +5551,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_SUN6I is not set
 # CONFIG_RTC_DRV_TEGRA is not set
 # CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_XGENE is not set
 # CONFIG_RTC_DRV_ZYNQMP is not set
@@ -5134,8 +5580,10 @@ CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTL_CARDS is not set
 # CONFIG_RTS5208 is not set
 CONFIG_RT_MUTEXES=y
+# CONFIG_RUNTIME_DEBUG is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_RV is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RXKAD=y
 # CONFIG_RXPERF is not set
 # CONFIG_S2IO is not set
@@ -5185,9 +5633,11 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_SCHED_TRACER is not set
+# CONFIG_SCR24X is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_ADVANSYS is not set
@@ -5211,13 +5661,20 @@ CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_SCSI_DH is not set
 CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_ESAS2R is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_FDOMAIN_PCI is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 # CONFIG_SCSI_HISI_SAS is not set
 # CONFIG_SCSI_HPSA is not set
 # CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_IPR is not set
@@ -5232,13 +5689,17 @@ CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_MPI3MR is not set
 # CONFIG_SCSI_MPT2SAS is not set
 # CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_MQ_DEFAULT is not set
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_MVUMI is not set
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
+# CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_PMCRAID is not set
 CONFIG_SCSI_PROC_FS=y
@@ -5254,8 +5715,12 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_ULTRASTOR is not set
 # CONFIG_SCSI_VIRTIO is not set
 # CONFIG_SCSI_WD719X is not set
 # CONFIG_SC_CAMCC_7180 is not set
@@ -5289,8 +5754,10 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_SELINUX_AVC_STATS is not set
 # CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
 # CONFIG_SECURITY_SELINUX_DEBUG is not set
 # CONFIG_SECURITY_SELINUX_DEVELOP is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_YAMA is not set
@@ -5316,6 +5783,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADM1266 is not set
 # CONFIG_SENSORS_ADM1275 is not set
 # CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS1015 is not set
 # CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_ADS7871 is not set
 # CONFIG_SENSORS_ADT7310 is not set
@@ -5338,6 +5806,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 # CONFIG_SENSORS_BEL_PFE is not set
 # CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_BH1780 is not set
 # CONFIG_SENSORS_BPA_RS600 is not set
 # CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
@@ -5372,6 +5841,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
 # CONFIG_SENSORS_HS3001 is not set
+# CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_I5500 is not set
 # CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_IBM_CFFPS is not set
@@ -5483,6 +5953,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_Q54SJ108A2 is not set
 # CONFIG_SENSORS_RM3100_I2C is not set
 # CONFIG_SENSORS_RM3100_SPI is not set
+# CONFIG_SENSORS_RP1_ADC is not set
 # CONFIG_SENSORS_SBRMI is not set
 # CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SCH5627 is not set
@@ -5494,6 +5965,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
 # CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
@@ -5559,6 +6031,7 @@ CONFIG_SERIAL_8250_DMA=y
 # CONFIG_SERIAL_8250_LPSS is not set
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
 # CONFIG_SERIAL_8250_MID is not set
+# CONFIG_SERIAL_8250_MOXA is not set
 CONFIG_SERIAL_8250_NR_UARTS=2
 # CONFIG_SERIAL_8250_PCI is not set
 # CONFIG_SERIAL_8250_PCI1XXXX is not set
@@ -5581,11 +6054,13 @@ CONFIG_SERIAL_EARLYCON=y
 # CONFIG_SERIAL_FSL_LINFLEXUART is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -5616,9 +6091,11 @@ CONFIG_SERIAL_EARLYCON=y
 # CONFIG_SFC is not set
 # CONFIG_SFC_FALCON is not set
 # CONFIG_SFC_SIENA is not set
+# CONFIG_SFI is not set
 # CONFIG_SFP is not set
 # CONFIG_SF_PDMA is not set
 # CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
@@ -5630,6 +6107,7 @@ CONFIG_SERIAL_EARLYCON=y
 # CONFIG_SG_SPLIT is not set
 # CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_SHMEM=y
+# CONFIG_SHORTCUT_FE is not set
 # CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 # CONFIG_SH_ETH is not set
@@ -5641,6 +6119,8 @@ CONFIG_SHMEM=y
 # CONFIG_SI7005 is not set
 # CONFIG_SI7020 is not set
 # CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
 # CONFIG_SIBYTE_LITTLESUR is not set
 # CONFIG_SIBYTE_RHONE is not set
@@ -5648,12 +6128,15 @@ CONFIG_SHMEM=y
 # CONFIG_SIBYTE_SWARM is not set
 CONFIG_SIGNALFD=y
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_SIMPLE_PM_BUS is not set
 # CONFIG_SIOX is not set
 # CONFIG_SIS190 is not set
 # CONFIG_SIS900 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SKY2_DEBUG is not set
+CONFIG_SLABINFO=y
 # CONFIG_SLAB_DEPRECATED is not set
 CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SLAB_FREELIST_RANDOM=y
@@ -5662,14 +6145,17 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLICOSS is not set
 # CONFIG_SLIMBUS is not set
 # CONFIG_SLIP is not set
+# CONFIG_SLOB is not set
 CONFIG_SLUB=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_SLUB_TINY is not set
 # CONFIG_SMARTJOYPLUS_FF is not set
 # CONFIG_SMB_SERVER is not set
+# CONFIG_SMC911X is not set
 # CONFIG_SMC9194 is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMP is not set
@@ -5708,6 +6194,7 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SND_AU8830 is not set
 # CONFIG_SND_AUDIO_GRAPH_CARD is not set
 # CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
+# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 # CONFIG_SND_AZT2320 is not set
 # CONFIG_SND_AZT3328 is not set
@@ -5735,6 +6222,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_EDMA_SOC is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
@@ -5753,6 +6241,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_GUSMAX is not set
 # CONFIG_SND_HDA_CODEC_CS8409 is not set
 # CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
 # CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_PREALLOC_SIZE=64
@@ -5817,10 +6306,12 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PPC is not set
 CONFIG_SND_PROC_FS=y
 # CONFIG_SND_RAWMIDI is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
 # CONFIG_SND_RIPTIDE is not set
 # CONFIG_SND_RME32 is not set
 # CONFIG_SND_RME96 is not set
 # CONFIG_SND_RME9652 is not set
+# CONFIG_SND_RTCTIMER is not set
 # CONFIG_SND_SB16 is not set
 # CONFIG_SND_SB8 is not set
 # CONFIG_SND_SBAWE is not set
@@ -5831,6 +6322,7 @@ CONFIG_SND_PROC_FS=y
 # CONFIG_SND_SERIAL_GENERIC is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
 # CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_AC97_CODEC is not set
@@ -5899,6 +6391,7 @@ CONFIG_SND_PROC_FS=y
 # CONFIG_SND_SOC_CS53L30 is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
+# CONFIG_SND_SOC_DIO2125 is not set
 # CONFIG_SND_SOC_DMIC is not set
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
@@ -5931,8 +6424,10 @@ CONFIG_SND_PROC_FS=y
 # CONFIG_SND_SOC_IMX_HDMI is not set
 # CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
+# CONFIG_SND_SOC_IMX_WM8962 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_APL is not set
+# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
@@ -5941,6 +6436,8 @@ CONFIG_SND_PROC_FS=y
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH is not set
 # CONFIG_SND_SOC_INTEL_CATPT is not set
 # CONFIG_SND_SOC_INTEL_CFL is not set
 # CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set
@@ -5973,6 +6470,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 # CONFIG_SND_SOC_LPASS_TX_MACRO is not set
 # CONFIG_SND_SOC_LPASS_VA_MACRO is not set
 # CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_MA120X0P is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
@@ -6014,6 +6512,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 # CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM1792A is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
 # CONFIG_SND_SOC_PCM186X_I2C is not set
@@ -6039,6 +6538,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SMA1303 is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
 # CONFIG_SND_SOC_SPDIF is not set
@@ -6113,6 +6613,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_SND_SOC_ZL38060 is not set
+# CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_SSCAPE is not set
@@ -6154,6 +6655,7 @@ CONFIG_SND_X86=y
 # CONFIG_SOC_AM33XX is not set
 # CONFIG_SOC_AM43XX is not set
 # CONFIG_SOC_BRCMSTB is not set
+# CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_DRA7XX is not set
 # CONFIG_SOC_HAS_OMAP2_SDRC is not set
 # CONFIG_SOC_OMAP5 is not set
@@ -6167,11 +6669,13 @@ CONFIG_SND_X86=y
 # CONFIG_SOUNDWIRE is not set
 # CONFIG_SOUND_OSS_CORE is not set
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+# CONFIG_SOUND_PRIME is not set
 # CONFIG_SP5100_TCO is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPARSE_IRQ is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_SPEAKUP is not set
 # CONFIG_SPI is not set
 # CONFIG_SPINLOCK_TEST is not set
@@ -6183,7 +6687,6 @@ CONFIG_SND_X86=y
 # CONFIG_SPI_BCM2835 is not set
 # CONFIG_SPI_BCM63XX_HSSPI is not set
 # CONFIG_SPI_BCM_QSPI is not set
-# CONFIG_SPI_BCMBCA_HSSPI is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_CADENCE is not set
@@ -6195,6 +6698,7 @@ CONFIG_SND_X86=y
 # CONFIG_SPI_FSL_ESPI is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI_IMG_SPFI is not set
 # CONFIG_SPI_LANTIQ_SSC is not set
 # CONFIG_SPI_LM70_LLP is not set
@@ -6205,6 +6709,7 @@ CONFIG_SND_X86=y
 # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
 # CONFIG_SPI_MPC52xx is not set
 # CONFIG_SPI_MPC52xx_PSC is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
 # CONFIG_SPI_MUX is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_NXP_FLEXSPI is not set
@@ -6230,6 +6735,7 @@ CONFIG_SND_X86=y
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_SPMI is not set
@@ -6256,11 +6762,13 @@ CONFIG_SQUASHFS_XZ=y
 # CONFIG_SRF04 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_SSB is not set
+# CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_DRIVER_GPIO is not set
 # CONFIG_SSB_HOST_SOC is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_POSSIBLE=y
 # CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 # CONFIG_SSIF_IPMI_BMC is not set
 # CONFIG_STACKPROTECTOR is not set
@@ -6269,15 +6777,19 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_STACKTRACE is not set
 # CONFIG_STACKTRACE_BUILD_ID is not set
 CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_STACK_HASH_ORDER=20
 # CONFIG_STACK_TRACER is not set
 # CONFIG_STACK_VALIDATION is not set
 CONFIG_STAGING=y
 # CONFIG_STAGING_BOARD is not set
+# CONFIG_STAGING_GASKET_FRAMEWORK is not set
 # CONFIG_STAGING_MEDIA is not set
 CONFIG_STANDALONE=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_STDBINUTILS=y
 # CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
 # CONFIG_STK3310 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
@@ -6305,15 +6817,18 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUNGEM is not set
 # CONFIG_SUNRPC is not set
 # CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 # CONFIG_SUNRPC_GSS is not set
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SUN_PARTITION is not set
+# CONFIG_SURFACE_3_BUTTON is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SUSPEND is not set
 # CONFIG_SUSPEND_SKIP_SYNC is not set
 CONFIG_SWAP=y
 # CONFIG_SWCONFIG is not set
 # CONFIG_SWCONFIG_B53 is not set
+# CONFIG_SWCONFIG_B53_MDIO_DRIVER is not set
 # CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
 # CONFIG_SWCONFIG_B53_SPI_DRIVER is not set
 # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
@@ -6327,13 +6842,18 @@ CONFIG_SWAP=y
 # CONFIG_SX9500 is not set
 # CONFIG_SXGBE_ETH is not set
 CONFIG_SYMBOLIC_ERRNAME=y
+# CONFIG_SYNCLINK_CS is not set
 # CONFIG_SYNC_FILE is not set
+# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYN_COOKIES=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYSFS=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_SYSFS_SYSCALL is not set
 # CONFIG_SYSTEMPORT is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
@@ -6356,6 +6876,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TCG_FTPM_TEE is not set
 # CONFIG_TCG_INFINEON is not set
 # CONFIG_TCG_NSC is not set
+# CONFIG_TCG_ST33_I2C is not set
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_I2C is not set
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -6395,6 +6916,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEHUTI is not set
 # CONFIG_TERANETICS_PHY is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+# CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
@@ -6406,8 +6928,10 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_IDA is not set
+# CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -6417,14 +6941,18 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SCANF is not set
+# CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_SORT is not set
+# CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UBSAN is not set
 # CONFIG_TEST_UDELAY is not set
@@ -6452,8 +6980,10 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL_STATISTICS is not set
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
 # CONFIG_THINKPAD_ACPI is not set
+CONFIG_THIN_ARCHIVES=y
 # CONFIG_THRUSTMASTER_FF is not set
 # CONFIG_THUMB2_KERNEL is not set
+# CONFIG_THUNDERBOLT is not set
 # CONFIG_THUNDER_NIC_BGX is not set
 # CONFIG_THUNDER_NIC_PF is not set
 # CONFIG_THUNDER_NIC_RGX is not set
@@ -6465,6 +6995,7 @@ CONFIG_TICK_ONESHOT=y
 # CONFIG_TIMB_DMA is not set
 CONFIG_TIMERFD=y
 # CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_TIMER_STATS is not set
 # CONFIG_TIME_NS is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
@@ -6494,15 +7025,19 @@ CONFIG_TINY_RCU=y
 # CONFIG_TI_ADS8688 is not set
 # CONFIG_TI_AM335X_ADC is not set
 # CONFIG_TI_CPSW is not set
+# CONFIG_TI_CPSW_ALE is not set
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TI_CPTS is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
 # CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7512 is not set
 # CONFIG_TI_DAC7612 is not set
+# CONFIG_TI_DAVINCI_CPDMA is not set
 # CONFIG_TI_DAVINCI_MDIO is not set
 # CONFIG_TI_LMP92064 is not set
 # CONFIG_TI_ST is not set
+# CONFIG_TI_SYSCON_RESET is not set
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TI_TMAG5273 is not set
 # CONFIG_TI_TSC2046 is not set
@@ -6594,9 +7129,12 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_PCAP is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_PROPERTIES is not set
 # CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set
 # CONFIG_TOUCHSCREEN_RM_TS is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+# CONFIG_TOUCHSCREEN_RPI_FT5406 is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
 # CONFIG_TOUCHSCREEN_SILEAD is not set
 # CONFIG_TOUCHSCREEN_SIS_I2C is not set
@@ -6619,6 +7157,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
 # CONFIG_TOUCHSCREEN_TSC200X_CORE is not set
 # CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
 # CONFIG_TOUCHSCREEN_USB_3M is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set
@@ -6638,6 +7177,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_USB_NEXIO is not set
 # CONFIG_TOUCHSCREEN_USB_PANJIT is not set
 # CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
@@ -6647,6 +7187,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_WM9713 is not set
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 # CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set
+# CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE is not set
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
@@ -6662,10 +7203,13 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TRACE_EVENT_INJECT is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_TRACE_MMIO_ACCESS is not set
+# CONFIG_TRACE_SINK is not set
+# CONFIG_TRACING_EVENTS_GPIO is not set
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_TREE_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_TRUSTED_KEYS is not set
@@ -6675,6 +7219,7 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_TSL2583 is not set
 # CONFIG_TSL2591 is not set
 # CONFIG_TSL2772 is not set
+# CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSNEP is not set
 # CONFIG_TSYS01 is not set
@@ -6699,6 +7244,7 @@ CONFIG_TTY=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 # CONFIG_UBIFS_FS_AUTHENTICATION is not set
+# CONFIG_UBIFS_FS_ENCRYPTION is not set
 CONFIG_UBIFS_FS_LZO=y
 # CONFIG_UBIFS_FS_SECURITY is not set
 CONFIG_UBIFS_FS_XATTR=y
@@ -6709,8 +7255,11 @@ CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_UBSAN_BOOL=y
 # CONFIG_UBSAN_DIV_ZERO is not set
 CONFIG_UBSAN_ENUM=y
+# CONFIG_UBSAN_MISC is not set
 CONFIG_UBSAN_SHIFT=y
 # CONFIG_UBSAN_UNREACHABLE is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_UCSI is not set
 # CONFIG_UDF_FS is not set
 # CONFIG_UDMABUF is not set
 CONFIG_UEVENT_HELPER=y
@@ -6723,11 +7272,15 @@ CONFIG_UID16=y
 # CONFIG_ULTRA is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNIX_DIAG is not set
 CONFIG_UNIX_SCM=y
+# CONFIG_UNUSED_BOARD_FILES is not set
+# CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UPROBES is not set
 # CONFIG_UPROBE_EVENTS is not set
@@ -6760,8 +7313,8 @@ CONFIG_USB_BELKIN=y
 # CONFIG_USB_CDNS3 is not set
 # CONFIG_USB_CDNS3_IMX is not set
 # CONFIG_USB_CDNS3_PCI_WRAP is not set
-# CONFIG_USB_CDNS_SUPPORT is not set
 # CONFIG_USB_CDNSP_PCI is not set
+# CONFIG_USB_CDNS_SUPPORT is not set
 # CONFIG_USB_CHAOSKEY is not set
 # CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_CHIPIDEA_GENERIC is not set
@@ -6793,11 +7346,13 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DWC3_ULPI is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set
+# CONFIG_USB_EHCI_ATH79 is not set
 # CONFIG_USB_EHCI_FSL is not set
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_EHCI_HCD_AT91 is not set
 # CONFIG_USB_EHCI_HCD_OMAP is not set
 # CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_EHCI_MSM is not set
 # CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -6811,6 +7366,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_FUNCTIONFS is not set
 # CONFIG_USB_FUSB300 is not set
 # CONFIG_USB_GADGET is not set
@@ -6889,7 +7445,9 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_HSO is not set
 # CONFIG_USB_HUB_USB251XB is not set
+# CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IMX21_HCD is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_USB_ISIGHTFW is not set
@@ -6904,6 +7462,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_LAN78XX is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_LEGOTOWER is not set
@@ -6920,6 +7479,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_MON is not set
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_MSI2500 is not set
+# CONFIG_USB_MSM_OTG is not set
 # CONFIG_USB_MTU3 is not set
 # CONFIG_USB_MUSB_GADGET is not set
 # CONFIG_USB_MUSB_HDRC is not set
@@ -6965,9 +7525,11 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_ONBOARD_HUB is not set
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PCI is not set
 # CONFIG_USB_PEGASUS is not set
@@ -6979,7 +7541,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_RAW_GADGET is not set
+# CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_RIO500 is not set
 # CONFIG_USB_ROLES_INTEL_XHCI is not set
 # CONFIG_USB_ROLE_SWITCH is not set
 # CONFIG_USB_RTL8150 is not set
@@ -7009,7 +7573,19 @@ CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_IUU is not set
 # CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
@@ -7039,6 +7615,7 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SERIAL_VISOR is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_WISHBONE is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_XR is not set
 # CONFIG_USB_SERIAL_XSENS_MT is not set
 # CONFIG_USB_SEVSEG is not set
@@ -7047,6 +7624,7 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_SNP_UDC_PLAT is not set
 # CONFIG_USB_SPEEDTOUCH is not set
+# CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
@@ -7064,6 +7642,7 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_SUPPORT is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TMC is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
@@ -7077,6 +7656,9 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_VL600 is not set
 # CONFIG_USB_WDM is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
 # CONFIG_USB_XEN_HCD is not set
 # CONFIG_USB_XHCI_DBGCAP is not set
 # CONFIG_USB_XHCI_HCD is not set
@@ -7086,6 +7668,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_ZERO is not set
+# CONFIG_USB_ZR364XX is not set
 # CONFIG_USELIB is not set
 # CONFIG_USERFAULTFD is not set
 # CONFIG_USERIO is not set
@@ -7093,6 +7676,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USER_EVENTS is not set
 # CONFIG_USE_OF is not set
 # CONFIG_UTS_NS is not set
+# CONFIG_UWB is not set
 # CONFIG_U_SERIAL_CONSOLE is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
@@ -7126,7 +7710,9 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VHOST_VSOCK is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
+# CONFIG_VIDEO_AD5398 is not set
 # CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AD9389B is not set
 # CONFIG_VIDEO_ADP1653 is not set
 # CONFIG_VIDEO_ADV7170 is not set
 # CONFIG_VIDEO_ADV7175 is not set
@@ -7143,15 +7729,20 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_AK881X is not set
 # CONFIG_VIDEO_AM437X_VPFE is not set
 # CONFIG_VIDEO_AR0521 is not set
+# CONFIG_VIDEO_ARDUCAM_64MP is not set
+# CONFIG_VIDEO_ARDUCAM_PIVARIETY is not set
 # CONFIG_VIDEO_ASPEED is not set
 # CONFIG_VIDEO_ATMEL_ISC is not set
 # CONFIG_VIDEO_ATMEL_ISI is not set
 # CONFIG_VIDEO_AU0828 is not set
 # CONFIG_VIDEO_BCM2835 is not set
+# CONFIG_VIDEO_BCM2835_UNICAM is not set
 # CONFIG_VIDEO_BT819 is not set
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_BT856 is not set
 # CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_BU64754 is not set
+# CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_CADENCE_CSI2RX is not set
 # CONFIG_VIDEO_CADENCE_CSI2TX is not set
 # CONFIG_VIDEO_CAFE_CCIC is not set
@@ -7159,6 +7750,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_COBALT is not set
 # CONFIG_VIDEO_CODA is not set
+# CONFIG_VIDEO_CODEC_BCM2835 is not set
 # CONFIG_VIDEO_CS3308 is not set
 # CONFIG_VIDEO_CS5345 is not set
 # CONFIG_VIDEO_CS53L32A is not set
@@ -7168,6 +7760,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_CX25840 is not set
 # CONFIG_VIDEO_CX88 is not set
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
@@ -7200,38 +7793,45 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_IMX335 is not set
 # CONFIG_VIDEO_IMX355 is not set
 # CONFIG_VIDEO_IMX412 is not set
-# CONFIG_VIDEO_IMX7_CSI is not set
-# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set
-# CONFIG_VIDEO_IMX8_ISI is not set
+# CONFIG_VIDEO_IMX477 is not set
+# CONFIG_VIDEO_IMX519 is not set
+# CONFIG_VIDEO_IMX708 is not set
 # CONFIG_VIDEO_IMX8_JPEG is not set
 # CONFIG_VIDEO_IMX_MIPI_CSIS is not set
 # CONFIG_VIDEO_IMX_PXP is not set
+# CONFIG_VIDEO_IRS1125 is not set
 # CONFIG_VIDEO_IR_I2C is not set
 # CONFIG_VIDEO_ISL7998X is not set
+# CONFIG_VIDEO_ISP_BCM2835 is not set
 # CONFIG_VIDEO_IVTV is not set
 # CONFIG_VIDEO_KS0127 is not set
 # CONFIG_VIDEO_LM3560 is not set
 # CONFIG_VIDEO_LM3646 is not set
 # CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
 # CONFIG_VIDEO_MT9M111 is not set
 # CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
 # CONFIG_VIDEO_MT9T112 is not set
 # CONFIG_VIDEO_MT9V011 is not set
 # CONFIG_VIDEO_MT9V032 is not set
 # CONFIG_VIDEO_MT9V111 is not set
 # CONFIG_VIDEO_MUX is not set
 # CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
 # CONFIG_VIDEO_OG01A1B is not set
 # CONFIG_VIDEO_OMAP2_VOUT is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV08D10 is not set
 # CONFIG_VIDEO_OV13858 is not set
 # CONFIG_VIDEO_OV13B10 is not set
+# CONFIG_VIDEO_OV2311 is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
@@ -7245,6 +7845,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_OV5675 is not set
 # CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV64A40 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV7640 is not set
@@ -7253,11 +7854,13 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV8856 is not set
 # CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9281 is not set
 # CONFIG_VIDEO_OV9282 is not set
 # CONFIG_VIDEO_OV9640 is not set
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV9734 is not set
 # CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
 # CONFIG_VIDEO_RCAR_CSI2 is not set
 # CONFIG_VIDEO_RCAR_ISP is not set
 # CONFIG_VIDEO_RCAR_VIN is not set
@@ -7265,9 +7868,12 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+# CONFIG_VIDEO_RP1_CFE is not set
 # CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_SAA6588 is not set
 # CONFIG_VIDEO_SAA6752HS is not set
 # CONFIG_VIDEO_SAA7110 is not set
@@ -7277,9 +7883,13 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_SAA7164 is not set
 # CONFIG_VIDEO_SAA717X is not set
 # CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
+# CONFIG_VIDEO_SMIAPP is not set
 # CONFIG_VIDEO_SOLO6X10 is not set
 # CONFIG_VIDEO_SONY_BTF_MPX is not set
+# CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_STK1160 is not set
+# CONFIG_VIDEO_STK1160_COMMON is not set
 # CONFIG_VIDEO_ST_MIPID02 is not set
 # CONFIG_VIDEO_SUN4I_CSI is not set
 # CONFIG_VIDEO_SUN6I_CSI is not set
@@ -7293,7 +7903,9 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_TEA6420 is not set
 # CONFIG_VIDEO_THS7303 is not set
 # CONFIG_VIDEO_THS8200 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
 # CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_TM6000 is not set
 # CONFIG_VIDEO_TVAUDIO is not set
 # CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
@@ -7308,13 +7920,17 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
 # CONFIG_VIDEO_USBTV is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_VIDEO_V4L2 is not set
 # CONFIG_VIDEO_VP27SMPX is not set
 # CONFIG_VIDEO_VPX3220 is not set
+# CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_WM8775 is not set
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_VIRTIO_FS is not set
 # CONFIG_VIRTIO_INPUT is not set
@@ -7325,6 +7941,7 @@ CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTUALIZATION is not set
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_TO_BUS=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_VL53L0X_I2C is not set
 # CONFIG_VL6180 is not set
@@ -7343,6 +7960,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMWARE_VMCI is not set
 # CONFIG_VMXNET3 is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_VOP_BUS is not set
 # CONFIG_VORTEX is not set
 # CONFIG_VSOCKETS is not set
 # CONFIG_VSOCKETS_DIAG is not set
@@ -7350,10 +7968,12 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_VXFS_FS is not set
+# CONFIG_VXGE is not set
 # CONFIG_VXLAN is not set
 # CONFIG_VZ89X is not set
 # CONFIG_W1 is not set
 # CONFIG_W1_CON is not set
+# CONFIG_W1_MASTER_DS1WM is not set
 # CONFIG_W1_MASTER_DS2482 is not set
 # CONFIG_W1_MASTER_DS2490 is not set
 # CONFIG_W1_MASTER_GPIO is not set
@@ -7395,13 +8015,16 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WDAT_WDT is not set
 # CONFIG_WDTPCI is not set
 # CONFIG_WERROR is not set
-# CONFIG_WEXT_CORE is not set
-# CONFIG_WEXT_PRIV is not set
-# CONFIG_WEXT_PROC is not set
-# CONFIG_WEXT_SPY is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WILINK_PLATFORM_DATA=y
+# CONFIG_WIMAX is not set
 # CONFIG_WIREGUARD is not set
 CONFIG_WIRELESS=y
-# CONFIG_WIRELESS_EXT is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_WDS is not set
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
 # CONFIG_WL1251 is not set
@@ -7438,6 +8061,7 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 # CONFIG_X25 is not set
 # CONFIG_X509_CERTIFICATE_PARSER is not set
 # CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_X86_SYSFB=y
 # CONFIG_X9250 is not set
 # CONFIG_XDP_SOCKETS is not set
 # CONFIG_XEN is not set
@@ -7522,3 +8146,4 @@ CONFIG_ZONE_DMA=y
 # CONFIG_ZSMALLOC is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
 # CONFIG_ZSWAP is not set
+# CONFIG_ZX_TDM is not set
diff --git a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
index 17d590890d..794a39f2c3 100644
--- a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
+++ b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Kconfig
@@ -12,6 +12,7 @@ config MTD_SPLIT_SQUASHFS_ROOT
 	bool "Squashfs based root partition parser"
 	depends on MTD_SPLIT_SUPPORT
 	select MTD_SPLIT
+	default n
 	help
 	  This provides a parsing function which allows to detect the
 	  offset and size of the unused portion of a rootfs partition
@@ -31,7 +32,7 @@ config MTD_SPLIT_BCM_WFI_FW
 
 config MTD_SPLIT_CFE_BOOTFS
 	bool "Parser finding rootfs appended to the CFE bootfs"
-	depends on MTD_SPLIT_SUPPORT && (ARCH_BCM4908 || ARCH_BCMBCA)
+	depends on MTD_SPLIT_SUPPORT && ARCH_BCM4908
 	select MTD_SPLIT
 	help
 	  cferom on BCM4908 (and bcm63xx) uses JFFS2 bootfs partition
@@ -100,13 +101,3 @@ config MTD_SPLIT_ELF_FW
 	bool "ELF loader firmware partition parser"
 	depends on MTD_SPLIT_SUPPORT
 	select MTD_SPLIT
-
-config MTD_SPLIT_H3C_VFS
-	bool "Parser finding rootfs appended to H3C VFS"
-	depends on MTD_SPLIT_SUPPORT
-	select MTD_SPLIT
-
-config MTD_SPLIT_SEIL_FW
-	bool "IIJ SEIL firmware parser"
-	depends on MTD_SPLIT_SUPPORT
-	select MTD_SPLIT
diff --git a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Makefile b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Makefile
index e9d63c8332..1461099b7c 100644
--- a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Makefile
+++ b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_MTD_SPLIT_BCM63XX_FW) += mtdsplit_bcm63xx.o
 obj-$(CONFIG_MTD_SPLIT_BCM_WFI_FW) += mtdsplit_bcm_wfi.o
 obj-$(CONFIG_MTD_SPLIT_CFE_BOOTFS) += mtdsplit_cfe_bootfs.o
 obj-$(CONFIG_MTD_SPLIT_SEAMA_FW) += mtdsplit_seama.o
-obj-$(CONFIG_MTD_SPLIT_SEIL_FW) += mtdsplit_seil.o
 obj-$(CONFIG_MTD_SPLIT_SQUASHFS_ROOT) += mtdsplit_squashfs.o
 obj-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtdsplit_uimage.o
 obj-$(CONFIG_MTD_SPLIT_FIT_FW) += mtdsplit_fit.o
@@ -16,4 +15,3 @@ obj-$(CONFIG_MTD_SPLIT_WRGG_FW) += mtdsplit_wrgg.o
 obj-$(CONFIG_MTD_SPLIT_MINOR_FW) += mtdsplit_minor.o
 obj-$(CONFIG_MTD_SPLIT_JIMAGE_FW) += mtdsplit_jimage.o
 obj-$(CONFIG_MTD_SPLIT_ELF_FW) += mtdsplit_elf.o
-obj-$(CONFIG_MTD_SPLIT_H3C_VFS) += mtdsplit_h3c_vfs.o
diff --git a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c
index 1cafc91fde..1ddcf6745f 100644
--- a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c
+++ b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c
@@ -31,7 +31,6 @@
 
 #define CFERAM_NAME		"cferam"
 #define CFERAM_NAME_LEN		(sizeof(CFERAM_NAME) - 1)
-#define CFERAM_NAME_MAX_LEN	32
 #define KERNEL_NAME		"vmlinux.lz"
 #define KERNEL_NAME_LEN		(sizeof(KERNEL_NAME) - 1)
 #define OPENWRT_NAME		"1-openwrt"
@@ -158,28 +157,17 @@ static int parse_bcm_wfi(struct mtd_info *master,
 			 const struct mtd_partition **pparts,
 			 uint8_t *buf, loff_t off, loff_t size, bool cfe_part)
 {
-	struct device_node *mtd_node;
 	struct mtd_partition *parts;
 	loff_t cfe_off, kernel_off, rootfs_off;
 	unsigned int num_parts = BCM_WFI_PARTS, cur_part = 0;
-	const char *cferam_name = CFERAM_NAME;
-	size_t cferam_name_len;
 	int ret;
 
-	mtd_node = mtd_get_of_node(master);
-	if (mtd_node)
-		of_property_read_string(mtd_node, "brcm,cferam", &cferam_name);
-
-	cferam_name_len = strnlen(cferam_name, CFERAM_NAME_MAX_LEN);
-	if (cferam_name_len > 0)
-		cferam_name_len--;
-
 	if (cfe_part) {
 		num_parts++;
 		cfe_off = off;
 
-		ret = jffs2_find_file(master, buf, cferam_name,
-				      cferam_name_len, &cfe_off,
+		ret = jffs2_find_file(master, buf, CFERAM_NAME,
+				      CFERAM_NAME_LEN, &cfe_off,
 				      size - (cfe_off - off), NULL, NULL);
 		if (ret)
 			return ret;
diff --git a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c
index 3b71597d23..3230d859b0 100644
--- a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c
+++ b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c
@@ -199,7 +199,6 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
 	struct fdt_header hdr;
 	size_t hdr_len, retlen;
 	size_t offset;
-	u32 offset_start = 0;
 	size_t fit_offset, fit_size;
 	size_t rootfs_offset, rootfs_size;
 	size_t data_size, img_total, max_size = 0;
@@ -212,13 +211,11 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
 	if (cmdline_match && !strstr(saved_command_line, cmdline_match))
 		return -ENODEV;
 
-	of_property_read_u32(np, "openwrt,fit-offset", &offset_start);
-
 	hdr_len = sizeof(struct fdt_header);
 
 	/* Parse the MTD device & search for the FIT image location */
 	for(offset = 0; offset + hdr_len <= mtd->size; offset += mtd->erasesize) {
-		ret = mtd_read(mtd, offset + offset_start, hdr_len, &retlen, (void*) &hdr);
+		ret = mtd_read(mtd, offset, hdr_len, &retlen, (void*) &hdr);
 		if (ret) {
 			pr_err("read error in \"%s\" at offset 0x%llx\n",
 			       mtd->name, (unsigned long long) offset);
@@ -259,11 +256,9 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
 	 * last external data refernced.
 	 */
 	if (fit_size > 0x1000) {
-		enum mtdsplit_part_type type;
-
 		/* Search for the rootfs partition after the FIT image */
-		ret = mtd_find_rootfs_from(mtd, fit_offset + fit_size + offset_start, mtd->size,
-					   &rootfs_offset, &type);
+		ret = mtd_find_rootfs_from(mtd, fit_offset + fit_size, mtd->size,
+					   &rootfs_offset, NULL);
 		if (ret) {
 			pr_info("no rootfs found after FIT image in \"%s\"\n",
 				mtd->name);
@@ -278,12 +273,9 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
 
 		parts[0].name = KERNEL_PART_NAME;
 		parts[0].offset = fit_offset;
-		parts[0].size = mtd_rounddown_to_eb(fit_size + offset_start, mtd) + mtd->erasesize;
+		parts[0].size = mtd_rounddown_to_eb(fit_size, mtd) + mtd->erasesize;
 
-		if (type == MTDSPLIT_PART_TYPE_UBI)
-			parts[1].name = UBI_PART_NAME;
-		else
-			parts[1].name = ROOTFS_PART_NAME;
+		parts[1].name = ROOTFS_PART_NAME;
 		parts[1].offset = rootfs_offset;
 		parts[1].size = rootfs_size;
 
@@ -293,7 +285,7 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
 	} else {
 		/* Search for rootfs_data after FIT external data */
 		fit = kzalloc(fit_size, GFP_KERNEL);
-		ret = mtd_read(mtd, offset, fit_size + offset_start, &retlen, fit);
+		ret = mtd_read(mtd, offset, fit_size, &retlen, fit);
 		if (ret) {
 			pr_err("read error in \"%s\" at offset 0x%llx\n",
 			       mtd->name, (unsigned long long) offset);
diff --git a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_h3c_vfs.c b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_h3c_vfs.c
deleted file mode 100644
index f264233dbd..0000000000
--- a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_h3c_vfs.c
+++ /dev/null
@@ -1,170 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Some devices made by H3C use a "VFS" filesystem to store firmware images.
- * This parses the start of the filesystem to read the length of the first
- * file (the kernel image). It then searches for the rootfs after the end of
- * the file data. This driver assumes that the filesystem was generated by
- * mkh3cvfs, and only works if the filesystem matches the expected layout,
- * which includes the file name of the kernel image.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/of.h>
-#include <linux/types.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
-#include "mtdsplit.h"
-
-#define	VFS_ERASEBLOCK_SIZE		0x10000
-#define	VFS_BLOCK_SIZE			0x400
-#define VFS_BLOCKS_PER_ERASEBLOCK	(VFS_ERASEBLOCK_SIZE / VFS_BLOCK_SIZE)
-
-#define FORMAT_FLAG_OFFSET		0x0
-
-#define FORMAT_FLAG			(VFS_ERASEBLOCK_SIZE << 12 | VFS_BLOCK_SIZE)
-
-#define FILE_ENTRY_OFFSET		0x800
-
-#define FILE_ENTRY_FLAGS		0x3f
-#define FILE_ENTRY_PARENT_BLOCK		0
-#define FILE_ENTRY_PARENT_INDEX 	0
-#define FILE_ENTRY_DATA_BLOCK	 	2
-#define FILE_ENTRY_NAME			"openwrt-kernel.bin"
-
-#define NR_PARTS			2
-
-struct file_entry {
-	uint8_t flags;
-
-	uint8_t res0[5];
-
-	uint16_t year;
-	uint8_t month;
-	uint8_t day;
-	uint8_t hour;
-	uint8_t minute;
-	uint8_t second;
-
-	uint8_t res1[3];
-
-	uint32_t length;
-
-	uint32_t parent_block;
-	uint16_t parent_index;
-
-	uint8_t res2[2];
-
-	uint32_t data_block;
-
-	char name[96];
-} __attribute__ ((packed));
-
-static inline size_t block_offset(int block)
-{
-	return VFS_ERASEBLOCK_SIZE * (block / (VFS_BLOCKS_PER_ERASEBLOCK-1))
-		+ VFS_BLOCK_SIZE * (1 + (block % (VFS_BLOCKS_PER_ERASEBLOCK-1)));
-}
-
-static inline int block_count(size_t size)
-{
-	return (size + VFS_BLOCK_SIZE - 1) / VFS_BLOCK_SIZE;
-}
-
-static int mtdsplit_h3c_vfs_parse(struct mtd_info *mtd,
-				  const struct mtd_partition **pparts,
-				  struct mtd_part_parser_data *data)
-{
-	struct mtd_partition *parts;
-	uint32_t format_flag;
-	struct file_entry file_entry;
-	size_t retlen;
-	int err;
-	size_t kernel_size;
-	size_t expected_offset;
-	size_t rootfs_offset;
-
-	if (mtd->erasesize != VFS_ERASEBLOCK_SIZE)
-		return -EINVAL;
-
-	/* Check format flag */
-	err = mtd_read(mtd, FORMAT_FLAG_OFFSET, sizeof(format_flag), &retlen,
-		       (void *) &format_flag);
-	if (err)
-		return err;
-
-	if (retlen != sizeof(format_flag))
-		return -EIO;
-
-	if (format_flag != FORMAT_FLAG)
-		return -EINVAL;
-
-	/* Check file entry */
-	err = mtd_read(mtd, FILE_ENTRY_OFFSET, sizeof(file_entry), &retlen,
-		       (void *) &file_entry);
-	if (err)
-		return err;
-
-	if (retlen != sizeof(file_entry))
-		return -EIO;
-
-	if (file_entry.flags != FILE_ENTRY_FLAGS)
-		return -EINVAL;
-
-	if (file_entry.parent_block != FILE_ENTRY_PARENT_BLOCK)
-		return -EINVAL;
-
-	if (file_entry.parent_index != FILE_ENTRY_PARENT_INDEX)
-		return -EINVAL;
-
-	if (file_entry.data_block != FILE_ENTRY_DATA_BLOCK)
-		return -EINVAL;
-
-	if (strncmp(file_entry.name, FILE_ENTRY_NAME, sizeof(file_entry.name)) != 0)
-		return -EINVAL;
-
-	/* Find rootfs offset */
-	kernel_size = block_offset(file_entry.data_block +
-				   block_count(file_entry.length) - 1) +
-		      VFS_BLOCK_SIZE;
-
-	expected_offset = mtd_roundup_to_eb(kernel_size, mtd);
-
-	err = mtd_find_rootfs_from(mtd, expected_offset, mtd->size,
-				   &rootfs_offset, NULL);
-	if (err)
-		return err;
-
-	parts = kzalloc(NR_PARTS * sizeof(*parts), GFP_KERNEL);
-	if (!parts)
-		return -ENOMEM;
-
-	parts[0].name = KERNEL_PART_NAME;
-	parts[0].offset = 0;
-	parts[0].size = rootfs_offset;
-
-	parts[1].name = ROOTFS_PART_NAME;
-	parts[1].offset = rootfs_offset;
-	parts[1].size = mtd->size - rootfs_offset;
-
-	*pparts = parts;
-	return NR_PARTS;
-}
-
-static const struct of_device_id mtdsplit_h3c_vfs_of_match_table[] = {
-	{ .compatible = "h3c,vfs-firmware" },
-	{},
-};
-MODULE_DEVICE_TABLE(of, mtdsplit_h3c_vfs_of_match_table);
-
-static struct mtd_part_parser mtdsplit_h3c_vfs_parser = {
-	.owner = THIS_MODULE,
-	.name = "h3c-vfs",
-	.of_match_table = mtdsplit_h3c_vfs_of_match_table,
-	.parse_fn = mtdsplit_h3c_vfs_parse,
-	.type = MTD_PARSER_TYPE_FIRMWARE,
-};
-
-module_mtd_part_parser(mtdsplit_h3c_vfs_parser);
diff --git a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seil.c b/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seil.c
deleted file mode 100644
index e58bb49b23..0000000000
--- a/lede/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seil.c
+++ /dev/null
@@ -1,191 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* a mtdsplit driver for IIJ SEIL devices */
-
-#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/of.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/byteorder/generic.h>
-
-#include "mtdsplit.h"
-
-#define NR_PARTS		2
-#define SEIL_VFMT		1
-#define LDR_ENV_PART_NAME	"bootloader-env"
-#define LDR_ENV_KEY_BOOTDEV	"BOOTDEV"
-
-struct seil_header {
-	uint64_t	id;		/* Identifier */
-	uint8_t		copy[80];	/* Copyright */
-	uint32_t	dcrc;		/* Data CRC Checksum */
-	uint32_t	vfmt;		/* Image Version Format */
-	uint32_t	vmjr;		/* Image Version Major */
-	uint32_t	vmnr;		/* Image Version Minor */
-	uint8_t		vrel[32];	/* Image Version Release */
-	uint32_t	dxor;		/* xor value for Data? */
-	uint32_t	dlen;		/* Data Length */
-};
-
-/*
- * check whether the current mtd device is active or not
- *
- * example of BOOTDEV value (IIJ SA-W2):
- *   - "flash"   : primary image on flash
- *   - "rescue"  : secondary image on flash
- *   - "usb"     : usb storage
- *   - "lan0/1"  : network
- */
-static bool seil_bootdev_is_active(struct device_node *np)
-{
-	struct mtd_info *env_mtd;
-	char *buf, *var, *value, *eq;
-	const char *devnm;
-	size_t rdlen;
-	int ret;
-
-	/*
-	 * read bootdev name of the partition
-	 * if doesn't exist, return true and skip checking of active device
-	 */
-	ret = of_property_read_string(np, "iij,bootdev-name", &devnm);
-	if (ret == -EINVAL)
-		return true;
-	else if (ret < 0)
-		return false;
-
-	env_mtd = get_mtd_device_nm(LDR_ENV_PART_NAME);
-	if (IS_ERR(env_mtd)) {
-		pr_err("failed to get mtd device \"%s\"", LDR_ENV_PART_NAME);
-		return false;
-	}
-
-	buf = vmalloc(env_mtd->size);
-	if (!buf)
-		return false;
-
-	ret = mtd_read(env_mtd, 0, env_mtd->size, &rdlen, buf);
-	if (ret || rdlen != env_mtd->size) {
-		pr_err("failed to read from mtd (%d)\n", ret);
-		ret = 0;
-		goto exit_vfree;
-	}
-
-	for (var = buf, ret = false;
-	     var < buf + env_mtd->size && *var;
-	     var = value + strlen(value) + 1) {
-		eq = strchr(var, '=');
-		if (!eq)
-			break;
-		*eq = '\0';
-		value = eq + 1;
-
-		pr_debug("ENV: %s=%s\n", var, value);
-		if (!strcmp(var, LDR_ENV_KEY_BOOTDEV)) {
-			ret = !strcmp(devnm, value);
-			break;
-		}
-	}
-
-exit_vfree:
-	vfree(buf);
-
-	return ret;
-}
-
-static int mtdsplit_parse_seil_fw(struct mtd_info *master,
-				  const struct mtd_partition **pparts,
-				  struct mtd_part_parser_data *data)
-{
-	struct device_node *np = mtd_get_of_node(master);
-	struct mtd_partition *parts;
-	struct seil_header header;
-	size_t image_size = 0;
-	size_t rootfs_offset;
-	size_t hdrlen = sizeof(header);
-	size_t retlen;
-	int ret;
-	u64 id;
-
-	if (!seil_bootdev_is_active(np))
-		return -ENODEV;
-
-	ret = of_property_read_u64(np, "iij,seil-id", &id);
-	if (ret) {
-		pr_err("failed to get iij,seil-id from dt\n");
-		return ret;
-	}
-	pr_debug("got seil-id=0x%016llx from dt\n", id);
-
-	parts = kcalloc(NR_PARTS, sizeof(*parts), GFP_KERNEL);
-	if (!parts)
-		return -ENOMEM;
-
-	ret = mtd_read(master, 0, hdrlen, &retlen, (void *)&header);
-	if (ret)
-		goto err_free_parts;
-
-	if (retlen != hdrlen) {
-		ret = -EIO;
-		goto err_free_parts;
-	}
-
-	if (be64_to_cpu(header.id) != id ||
-	    be32_to_cpu(header.vfmt) != SEIL_VFMT) {
-		pr_debug("no valid seil image found in \"%s\"\n", master->name);
-		ret = -ENODEV;
-		goto err_free_parts;
-	}
-
-	image_size = hdrlen + be32_to_cpu(header.dlen);
-	if (image_size > master->size) {
-		pr_err("seil image exceeds MTD device \"%s\"\n", master->name);
-		ret = -EINVAL;
-		goto err_free_parts;
-	}
-
-	/* find the roots after the seil image */
-	ret = mtd_find_rootfs_from(master, image_size,
-				   master->size, &rootfs_offset, NULL);
-	if (ret || (master->size - rootfs_offset) == 0) {
-		pr_debug("no rootfs after seil image in \"%s\"\n",
-			 master->name);
-		ret = -ENODEV;
-		goto err_free_parts;
-	}
-
-	parts[0].name = KERNEL_PART_NAME;
-	parts[0].offset = 0;
-	parts[0].size = rootfs_offset;
-
-	parts[1].name = ROOTFS_PART_NAME;
-	parts[1].offset = rootfs_offset;
-	parts[1].size = master->size - rootfs_offset;
-
-	*pparts = parts;
-	return NR_PARTS;
-
-err_free_parts:
-	kfree(parts);
-	return ret;
-}
-
-static const struct of_device_id mtdsplit_seil_fw_of_match_table[] = {
-	{ .compatible = "iij,seil-firmware" },
-	{},
-};
-MODULE_DEVICE_TABLE(of, mtdsplit_seil_fw_of_match_table);
-
-static struct mtd_part_parser mtdsplit_seil_fw_parser = {
-	.owner = THIS_MODULE,
-	.name = "seil-fw",
-	.of_match_table = mtdsplit_seil_fw_of_match_table,
-	.parse_fn = mtdsplit_parse_seil_fw,
-	.type = MTD_PARSER_TYPE_FIRMWARE,
-};
-
-module_mtd_part_parser(mtdsplit_seil_fw_parser);
diff --git a/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt.h b/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt.h
index 517ff7414f..dff1f28c81 100644
--- a/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt.h
+++ b/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt.h
@@ -95,14 +95,8 @@ bbt_nand_read(u32 page, unsigned char *dat, int dat_len,
 		.datbuf = dat,
 		.len = dat_len,
 	};
-	int ret;
 
-	ret = bmtd._read_oob(bmtd.mtd, page << bmtd.pg_shift, &ops);
-	if (ret < 0)
-		return ret;
-	if (ret)
-		pr_info("%s: %d bitflips\n", __func__, ret);
-	return 0;
+	return bmtd._read_oob(bmtd.mtd, page << bmtd.pg_shift, &ops);
 }
 
 static inline int bbt_nand_erase(u16 block)
diff --git a/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c b/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c
index 6b06948c0f..2770376e98 100644
--- a/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c
+++ b/lede/target/linux/generic/files/drivers/mtd/nand/mtk_bmt_v2.c
@@ -191,6 +191,36 @@ static u16 get_bmt_index(struct bbmt *bmt)
 	return 0;
 }
 
+static int
+read_bmt(u16 block, unsigned char *dat, unsigned char *fdm, int fdm_len)
+{
+	u32 len = bmtd.bmt_pgs << bmtd.pg_shift;
+
+	return bbt_nand_read(blk_pg(block), dat, len, fdm, fdm_len);
+}
+
+static struct bbbt *scan_bmt(u16 block)
+{
+	u8 fdm[4];
+
+	if (block < bmtd.pool_lba)
+		return NULL;
+
+	if (read_bmt(block, bmtd.bbt_buf, fdm, sizeof(fdm)))
+		return scan_bmt(block - 1);
+
+	if (is_valid_bmt(bmtd.bbt_buf, fdm)) {
+		bmtd.bmt_blk_idx = get_bmt_index(bmt_tbl((struct bbbt *)bmtd.bbt_buf));
+		if (bmtd.bmt_blk_idx == 0) {
+			pr_info("[BBT] FATAL ERR: bmt block index is wrong!\n");
+			return NULL;
+		}
+		pr_info("[BBT] BMT.v2 is found at 0x%x\n", block);
+		return (struct bbbt *)bmtd.bbt_buf;
+	} else
+		return scan_bmt(block - 1);
+}
+
 /* Write the Burner Bad Block Table to Nand Flash
  * n - write BMT to bmt_tbl[n]
  */
@@ -442,30 +472,7 @@ static int mtk_bmt_init_v2(struct device_node *np)
 	/* Scanning start from the first page of the last block
 	 * of whole flash
 	 */
-	bmtd.bbt = NULL;
-	for (u16 block = bmtd.total_blks - 1; !bmtd.bbt && block >= bmtd.pool_lba; block--) {
-		u8 fdm[4];
-
-		if (bbt_nand_read(blk_pg(block), bmtd.bbt_buf, bufsz, fdm, sizeof(fdm))) {
-			/* Read failed, try the previous block */
-			continue;
-		}
-
-		if (!is_valid_bmt(bmtd.bbt_buf, fdm)) {
-			/* No valid BMT found, try the previous block */
-			continue;
-		}
-
-		bmtd.bmt_blk_idx = get_bmt_index(bmt_tbl((struct bbbt *)bmtd.bbt_buf));
-		if (bmtd.bmt_blk_idx == 0) {
-			pr_info("[BBT] FATAL ERR: bmt block index is wrong!\n");
-			break;
-		}
-
-		pr_info("[BBT] BMT.v2 is found at 0x%x\n", block);
-		bmtd.bbt = (struct bbbt *)bmtd.bbt_buf;
-	}
-
+	bmtd.bbt = scan_bmt(bmtd.total_blks - 1);
 	if (!bmtd.bbt) {
 		/* BMT not found */
 		if (bmtd.total_blks > BB_TABLE_MAX + BMT_TABLE_MAX) {
diff --git a/lede/target/linux/generic/files/drivers/mtd/parsers/routerbootpart.c b/lede/target/linux/generic/files/drivers/mtd/parsers/routerbootpart.c
index aa786cd895..f9bba0f3ba 100644
--- a/lede/target/linux/generic/files/drivers/mtd/parsers/routerbootpart.c
+++ b/lede/target/linux/generic/files/drivers/mtd/parsers/routerbootpart.c
@@ -167,7 +167,7 @@ static void routerboot_find_dynparts(struct mtd_info *master)
 	while (offset < master->size) {
 		err = mtd_read(master, offset, sizeof(buf), &bytes_read, (u8 *)&buf);
 		if (err) {
-			pr_err("%s: mtd_read error while parsing (offset: 0x%zX): %d\n",
+			pr_err("%s: mtd_read error while parsing (offset: 0x%X): %d\n",
 			       master->name, offset, err);
 			continue;
 		}
diff --git a/lede/target/linux/generic/files/drivers/net/phy/ar8216.c b/lede/target/linux/generic/files/drivers/net/phy/ar8216.c
index 850bcefb74..11cb18e4f3 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -891,7 +891,11 @@ ar8216_phy_write(struct ar8xxx_priv *priv, int addr, int regnum, u16 val)
 static int
 ar8229_hw_init(struct ar8xxx_priv *priv)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
 	phy_interface_t phy_if_mode;
+#else
+	int phy_if_mode;
+#endif
 
 	if (priv->initialized)
 		return 0;
@@ -899,7 +903,11 @@ ar8229_hw_init(struct ar8xxx_priv *priv)
 	ar8xxx_write(priv, AR8216_REG_CTRL, AR8216_CTRL_RESET);
 	ar8xxx_reg_wait(priv, AR8216_REG_CTRL, AR8216_CTRL_RESET, 0, 1000);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
 	of_get_phy_mode(priv->pdev->of_node, &phy_if_mode);
+#else
+	phy_if_mode = of_get_phy_mode(priv->pdev->of_node);
+#endif
 
 	if (phy_if_mode == PHY_INTERFACE_MODE_GMII) {
 		ar8xxx_write(priv, AR8229_REG_OPER_MODE0,
@@ -1419,7 +1427,8 @@ ar8xxx_sw_reset_switch(struct switch_dev *dev)
 	int i;
 
 	mutex_lock(&priv->reg_mutex);
-	memset(&priv->ar8xxx_priv_volatile, 0, sizeof(priv->ar8xxx_priv_volatile));
+	memset(&priv->vlan, 0, sizeof(struct ar8xxx_priv) -
+		offsetof(struct ar8xxx_priv, vlan));
 
 	for (i = 0; i < dev->vlans; i++)
 		priv->vlan_id[i] = i;
@@ -2424,9 +2433,7 @@ static int
 ar8xxx_phy_config_init(struct phy_device *phydev)
 {
 	struct ar8xxx_priv *priv = phydev->priv;
-#ifdef CONFIG_ETHERNET_PACKET_MANGLE
 	struct net_device *dev = phydev->attached_dev;
-#endif
 	int ret;
 
 	if (WARN_ON(!priv))
@@ -2458,11 +2465,7 @@ ar8xxx_phy_config_init(struct phy_device *phydev)
 	/* VID fixup only needed on ar8216 */
 	if (chip_is_ar8216(priv)) {
 		dev->phy_ptr = priv;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
 		dev->priv_flags |= IFF_NO_IP_ALIGN;
-#else
-		dev->extra_priv_flags |= IFF_NO_IP_ALIGN;
-#endif
 		dev->eth_mangle_rx = ar8216_mangle_rx;
 		dev->eth_mangle_tx = ar8216_mangle_tx;
 	}
@@ -2697,11 +2700,7 @@ ar8xxx_phy_detach(struct phy_device *phydev)
 
 #ifdef CONFIG_ETHERNET_PACKET_MANGLE
 	dev->phy_ptr = NULL;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
 	dev->priv_flags &= ~IFF_NO_IP_ALIGN;
-#else
-	dev->extra_priv_flags &= ~IFF_NO_IP_ALIGN;
-#endif
 	dev->eth_mangle_rx = NULL;
 	dev->eth_mangle_tx = NULL;
 #endif
diff --git a/lede/target/linux/generic/files/drivers/net/phy/ar8216.h b/lede/target/linux/generic/files/drivers/net/phy/ar8216.h
index f046b35f43..d62cf60f57 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/ar8216.h
+++ b/lede/target/linux/generic/files/drivers/net/phy/ar8216.h
@@ -506,22 +506,20 @@ struct ar8xxx_priv {
 	unsigned int use_count;
 
 	/* all fields below are cleared on reset */
-	struct_group(ar8xxx_priv_volatile,
-		bool vlan;
+	bool vlan;
 
-		u16 vlan_id[AR8XXX_MAX_VLANS];
-		u8 vlan_table[AR8XXX_MAX_VLANS];
-		u8 vlan_tagged;
-		u16 pvid[AR8X16_MAX_PORTS];
-		int arl_age_time;
+	u16 vlan_id[AR8XXX_MAX_VLANS];
+	u8 vlan_table[AR8XXX_MAX_VLANS];
+	u8 vlan_tagged;
+	u16 pvid[AR8X16_MAX_PORTS];
+	int arl_age_time;
 
-		/* mirroring */
-		bool mirror_rx;
-		bool mirror_tx;
-		int source_port;
-		int monitor_port;
-		u8 port_vlan_prio[AR8X16_MAX_PORTS];
-	);
+	/* mirroring */
+	bool mirror_rx;
+	bool mirror_tx;
+	int source_port;
+	int monitor_port;
+	u8 port_vlan_prio[AR8X16_MAX_PORTS];
 };
 
 u32
diff --git a/lede/target/linux/generic/files/drivers/net/phy/ar8327.c b/lede/target/linux/generic/files/drivers/net/phy/ar8327.c
index 3313149559..dce52ce0e4 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/ar8327.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/ar8327.c
@@ -183,7 +183,7 @@ ar8327_phy_fixup(struct ar8xxx_priv *priv, int phy)
 
 	case 2:
 		ar8xxx_phy_mmd_write(priv, phy, 0x7, 0x3c, 0x0);
-		fallthrough;
+		/* fallthrough */
 	case 4:
 		ar8xxx_phy_mmd_write(priv, phy, 0x3, 0x800d, 0x803f);
 		ar8xxx_phy_dbg_write(priv, phy, 0x3d, 0x6860);
diff --git a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_common.c b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
index d5f9bfc2f0..a6dab255cc 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_common.c
@@ -506,9 +506,15 @@ static int b53_configure_ports_of(struct b53_device *dev)
 		if (fixed_link) {
 			u32 spd;
 			u8 po = GMII_PO_LINK;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
 			phy_interface_t mode;
+#else
+			int mode = of_get_phy_mode(pn);
+#endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
 			of_get_phy_mode(pn, &mode);
+#endif
 
 			if (!of_property_read_u32(fixed_link, "speed", &spd)) {
 				switch (spd) {
@@ -523,7 +529,7 @@ static int b53_configure_ports_of(struct b53_device *dev)
 						po |= PORT_OVERRIDE_SPEED_2000M;
 					else
 						po |= GMII_PO_SPEED_2000M;
-					fallthrough;
+					__attribute__((__fallthrough__));
 				case 1000:
 					po |= GMII_PO_SPEED_1000M;
 					break;
@@ -1611,8 +1617,8 @@ static int b53_switch_init(struct b53_device *dev)
 	return b53_switch_reset(dev);
 }
 
-struct b53_device *b53_swconfig_switch_alloc(struct device *base, struct b53_io_ops *ops,
-					     void *priv)
+struct b53_device *b53_switch_alloc(struct device *base, struct b53_io_ops *ops,
+				    void *priv)
 {
 	struct b53_device *dev;
 
@@ -1627,9 +1633,9 @@ struct b53_device *b53_swconfig_switch_alloc(struct device *base, struct b53_io_
 
 	return dev;
 }
-EXPORT_SYMBOL(b53_swconfig_switch_alloc);
+EXPORT_SYMBOL(b53_switch_alloc);
 
-int b53_swconfig_switch_detect(struct b53_device *dev)
+int b53_switch_detect(struct b53_device *dev)
 {
 	u32 id32;
 	u16 tmp;
@@ -1694,9 +1700,9 @@ int b53_swconfig_switch_detect(struct b53_device *dev)
 		return b53_read8(dev, B53_MGMT_PAGE, B53_REV_ID,
 				 &dev->core_rev);
 }
-EXPORT_SYMBOL(b53_swconfig_switch_detect);
+EXPORT_SYMBOL(b53_switch_detect);
 
-int b53_swconfig_switch_register(struct b53_device *dev)
+int b53_switch_register(struct b53_device *dev)
 {
 	int ret;
 
@@ -1706,7 +1712,7 @@ int b53_swconfig_switch_register(struct b53_device *dev)
 		dev->sw_dev.alias = dev->pdata->alias;
 	}
 
-	if (!dev->chip_id && b53_swconfig_switch_detect(dev))
+	if (!dev->chip_id && b53_switch_detect(dev))
 		return -EINVAL;
 
 	ret = b53_switch_init(dev);
@@ -1717,7 +1723,7 @@ int b53_swconfig_switch_register(struct b53_device *dev)
 
 	return register_switch(&dev->sw_dev, NULL);
 }
-EXPORT_SYMBOL(b53_swconfig_switch_register);
+EXPORT_SYMBOL(b53_switch_register);
 
 MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
 MODULE_DESCRIPTION("B53 switch library");
diff --git a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
index c85df1f305..98cdbffe73 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
@@ -280,7 +280,7 @@ static int b53_phy_probe(struct phy_device *phydev)
 	if (phydev->mdio.addr != B53_PSEUDO_PHY && phydev->mdio.addr != 0)
 		return -ENODEV;
 
-	dev = b53_swconfig_switch_alloc(&phydev->mdio.dev, &b53_mdio_ops, phydev->mdio.bus);
+	dev = b53_switch_alloc(&phydev->mdio.dev, &b53_mdio_ops, phydev->mdio.bus);
 	if (!dev)
 		return -ENOMEM;
 
@@ -290,7 +290,7 @@ static int b53_phy_probe(struct phy_device *phydev)
 	dev->pdata = NULL;
 	mutex_init(&dev->reg_mutex);
 
-	ret = b53_swconfig_switch_detect(dev);
+	ret = b53_switch_detect(dev);
 	if (ret)
 		return ret;
 
@@ -302,7 +302,7 @@ static int b53_phy_probe(struct phy_device *phydev)
 
 	linkmode_copy(phydev->advertising, phydev->supported);
 
-	ret = b53_swconfig_switch_register(dev);
+	ret = b53_switch_register(dev);
 	if (ret) {
 		dev_err(dev->dev, "failed to register switch: %i\n", ret);
 		return ret;
@@ -361,6 +361,26 @@ static int b53_phy_read_status(struct phy_device *phydev)
 	return 0;
 }
 
+static const struct of_device_id b53_of_match_1[] = {
+	{ .compatible = "brcm,bcm5325" },
+	{ .compatible = "brcm,bcm5395" },
+	{ .compatible = "brcm,bcm5397" },
+	{ .compatible = "brcm,bcm5398" },
+	{ /* sentinel */ },
+};
+
+static const struct of_device_id b53_of_match_2[] = {
+	{ .compatible = "brcm,bcm53115" },
+	{ .compatible = "brcm,bcm53125" },
+	{ .compatible = "brcm,bcm53128" },
+	{ /* sentinel */ },
+};
+
+static const struct of_device_id b53_of_match_3[] = {
+	{ .compatible = "brcm,bcm5365" },
+	{ /* sentinel */ },
+};
+
 /* BCM5325, BCM539x */
 static struct phy_driver b53_phy_driver_id1 = {
 	.phy_id		= 0x0143bc00,
@@ -372,6 +392,10 @@ static struct phy_driver b53_phy_driver_id1 = {
 	.config_aneg	= b53_phy_config_aneg,
 	.config_init	= b53_phy_config_init,
 	.read_status	= b53_phy_read_status,
+	.mdiodrv.driver = {
+		.name = "bcm539x",
+		.of_match_table = b53_of_match_1,
+	},
 };
 
 /* BCM53125, BCM53128 */
@@ -385,6 +409,10 @@ static struct phy_driver b53_phy_driver_id2 = {
 	.config_aneg	= b53_phy_config_aneg,
 	.config_init	= b53_phy_config_init,
 	.read_status	= b53_phy_read_status,
+	.mdiodrv.driver = {
+		.name = "bcm531xx",
+		.of_match_table = b53_of_match_2,
+	},
 };
 
 /* BCM5365 */
@@ -398,6 +426,10 @@ static struct phy_driver b53_phy_driver_id3 = {
 	.config_aneg	= b53_phy_config_aneg,
 	.config_init	= b53_phy_config_init,
 	.read_status	= b53_phy_read_status,
+	.mdiodrv.driver = {
+		.name = "bcm5365",
+		.of_match_table = b53_of_match_3,
+	},
 };
 
 int __init b53_phy_driver_register(void)
diff --git a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
index 0a21ff1de5..ab1895e9b5 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
@@ -205,7 +205,7 @@ static int b53_mmap_probe(struct platform_device *pdev)
 	if (!pdata)
 		return -EINVAL;
 
-	dev = b53_swconfig_switch_alloc(&pdev->dev, &b53_mmap_ops, pdata->regs);
+	dev = b53_switch_alloc(&pdev->dev, &b53_mmap_ops, pdata->regs);
 	if (!dev)
 		return -ENOMEM;
 
@@ -214,7 +214,7 @@ static int b53_mmap_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, dev);
 
-	return b53_swconfig_switch_register(dev);
+	return b53_switch_register(dev);
 }
 
 static int b53_mmap_remove(struct platform_device *pdev)
diff --git a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
index e455c755bf..37c17aeb25 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
+++ b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
@@ -183,12 +183,12 @@ static inline struct b53_device *sw_to_b53(struct switch_dev *sw)
 	return container_of(sw, struct b53_device, sw_dev);
 }
 
-struct b53_device *b53_swconfig_switch_alloc(struct device *base, struct b53_io_ops *ops,
-					     void *priv);
+struct b53_device *b53_switch_alloc(struct device *base, struct b53_io_ops *ops,
+				    void *priv);
 
-int b53_swconfig_switch_detect(struct b53_device *dev);
+int b53_switch_detect(struct b53_device *dev);
 
-int b53_swconfig_switch_register(struct b53_device *dev);
+int b53_switch_register(struct b53_device *dev);
 
 static inline void b53_switch_remove(struct b53_device *dev)
 {
diff --git a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
index 400454df18..efc8f7ee89 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
@@ -288,14 +288,14 @@ static int b53_spi_probe(struct spi_device *spi)
 	struct b53_device *dev;
 	int ret;
 
-	dev = b53_swconfig_switch_alloc(&spi->dev, &b53_spi_ops, spi);
+	dev = b53_switch_alloc(&spi->dev, &b53_spi_ops, spi);
 	if (!dev)
 		return -ENOMEM;
 
 	if (spi->dev.platform_data)
 		dev->pdata = spi->dev.platform_data;
 
-	ret = b53_swconfig_switch_register(dev);
+	ret = b53_switch_register(dev);
 	if (ret)
 		return ret;
 
diff --git a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
index ead5209cf0..012daa3a51 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
@@ -342,7 +342,7 @@ static int b53_srab_probe(struct platform_device *pdev)
 	if (!pdata)
 		return -EINVAL;
 
-	dev = b53_swconfig_switch_alloc(&pdev->dev, &b53_srab_ops, pdata->regs);
+	dev = b53_switch_alloc(&pdev->dev, &b53_srab_ops, pdata->regs);
 	if (!dev)
 		return -ENOMEM;
 
@@ -351,7 +351,7 @@ static int b53_srab_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, dev);
 
-	return b53_swconfig_switch_register(dev);
+	return b53_switch_register(dev);
 }
 
 static int b53_srab_remove(struct platform_device *pdev)
diff --git a/lede/target/linux/generic/files/drivers/net/phy/mvswitch.c b/lede/target/linux/generic/files/drivers/net/phy/mvswitch.c
new file mode 100644
index 0000000000..bd3b9e1ad1
--- /dev/null
+++ b/lede/target/linux/generic/files/drivers/net/phy/mvswitch.c
@@ -0,0 +1,446 @@
+/*
+ * Marvell 88E6060 switch driver
+ * Copyright (c) 2008 Felix Fietkau <nbd@nbd.name>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/mii.h>
+#include <linux/ethtool.h>
+#include <linux/phy.h>
+#include <linux/if_vlan.h>
+#include <linux/version.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include "mvswitch.h"
+
+/* Undefine this to use trailer mode instead.
+ * I don't know if header mode works with all chips */
+#define HEADER_MODE	1
+
+MODULE_DESCRIPTION("Marvell 88E6060 Switch driver");
+MODULE_AUTHOR("Felix Fietkau");
+MODULE_LICENSE("GPL");
+
+#define MVSWITCH_MAGIC 0x88E6060
+
+struct mvswitch_priv {
+	netdev_features_t orig_features;
+	u8 vlans[16];
+};
+
+#define to_mvsw(_phy) ((struct mvswitch_priv *) (_phy)->priv)
+
+static inline u16
+r16(struct phy_device *phydev, int addr, int reg)
+{
+	struct mii_bus *bus = phydev->mdio.bus;
+
+	return bus->read(bus, addr, reg);
+}
+
+static inline void
+w16(struct phy_device *phydev, int addr, int reg, u16 val)
+{
+	struct mii_bus *bus = phydev->mdio.bus;
+
+	bus->write(bus, addr, reg, val);
+}
+
+
+static struct sk_buff *
+mvswitch_mangle_tx(struct net_device *dev, struct sk_buff *skb)
+{
+	struct mvswitch_priv *priv;
+	char *buf = NULL;
+	u16 vid;
+
+	priv = dev->phy_ptr;
+	if (unlikely(!priv))
+		goto error;
+
+	if (unlikely(skb->len < 16))
+		goto error;
+
+#ifdef HEADER_MODE
+	if (__vlan_hwaccel_get_tag(skb, &vid))
+		goto error;
+
+	if (skb_cloned(skb) || (skb->len <= 62) || (skb_headroom(skb) < MV_HEADER_SIZE)) {
+		if (pskb_expand_head(skb, MV_HEADER_SIZE, (skb->len < 62 ? 62 - skb->len : 0), GFP_ATOMIC))
+			goto error_expand;
+		if (skb->len < 62)
+			skb->len = 62;
+	}
+	buf = skb_push(skb, MV_HEADER_SIZE);
+#else
+	if (__vlan_get_tag(skb, &vid))
+		goto error;
+
+	if (unlikely((vid > 15 || !priv->vlans[vid])))
+		goto error;
+
+	if (skb->len <= 64) {
+		if (pskb_expand_head(skb, 0, 64 + MV_TRAILER_SIZE - skb->len, GFP_ATOMIC))
+			goto error_expand;
+
+		buf = skb->data + 64;
+		skb->len = 64 + MV_TRAILER_SIZE;
+	} else {
+		if (skb_cloned(skb) || unlikely(skb_tailroom(skb) < 4)) {
+			if (pskb_expand_head(skb, 0, 4, GFP_ATOMIC))
+				goto error_expand;
+		}
+		buf = skb_put(skb, 4);
+	}
+
+	/* move the ethernet header 4 bytes forward, overwriting the vlan tag */
+	memmove(skb->data + 4, skb->data, 12);
+	skb->data += 4;
+	skb->len -= 4;
+	skb->mac_header += 4;
+#endif
+
+	if (!buf)
+		goto error;
+
+
+#ifdef HEADER_MODE
+	/* prepend the tag */
+	*((__be16 *) buf) = cpu_to_be16(
+		((vid << MV_HEADER_VLAN_S) & MV_HEADER_VLAN_M) |
+		((priv->vlans[vid] << MV_HEADER_PORTS_S) & MV_HEADER_PORTS_M)
+	);
+#else
+	/* append the tag */
+	*((__be32 *) buf) = cpu_to_be32((
+		(MV_TRAILER_OVERRIDE << MV_TRAILER_FLAGS_S) |
+		((priv->vlans[vid] & MV_TRAILER_PORTS_M) << MV_TRAILER_PORTS_S)
+	));
+#endif
+
+	return skb;
+
+error_expand:
+	if (net_ratelimit())
+		printk("%s: failed to expand/update skb for the switch\n", dev->name);
+
+error:
+	/* any errors? drop the packet! */
+	dev_kfree_skb_any(skb);
+	return NULL;
+}
+
+static void
+mvswitch_mangle_rx(struct net_device *dev, struct sk_buff *skb)
+{
+	struct mvswitch_priv *priv;
+	unsigned char *buf;
+	int vlan = -1;
+	int i;
+
+	priv = dev->phy_ptr;
+	if (WARN_ON_ONCE(!priv))
+		return;
+
+#ifdef HEADER_MODE
+	buf = skb->data;
+	skb_pull(skb, MV_HEADER_SIZE);
+#else
+	buf = skb->data + skb->len - MV_TRAILER_SIZE;
+	if (buf[0] != 0x80)
+		return;
+#endif
+
+	/* look for the vlan matching the incoming port */
+	for (i = 0; i < ARRAY_SIZE(priv->vlans); i++) {
+		if ((1 << buf[1]) & priv->vlans[i])
+			vlan = i;
+	}
+
+	if (vlan == -1)
+		return;
+
+	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
+}
+
+
+static int
+mvswitch_wait_mask(struct phy_device *pdev, int addr, int reg, u16 mask, u16 val)
+{
+	int i = 100;
+	u16 r;
+
+	do {
+		r = r16(pdev, addr, reg) & mask;
+		if (r == val)
+			return 0;
+	} while(--i > 0);
+	return -ETIMEDOUT;
+}
+
+static int
+mvswitch_config_init(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv = to_mvsw(pdev);
+	struct net_device *dev = pdev->attached_dev;
+	u8 vlmap = 0;
+	int i;
+
+	if (!dev)
+		return -EINVAL;
+
+	printk("%s: Marvell 88E6060 PHY driver attached.\n", dev->name);
+	linkmode_zero(pdev->supported);
+	linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, pdev->supported);
+	linkmode_copy(pdev->advertising, pdev->supported);
+	dev->phy_ptr = priv;
+	pdev->irq = PHY_POLL;
+#ifdef HEADER_MODE
+	dev->flags |= IFF_PROMISC;
+#endif
+
+	/* initialize default vlans */
+	for (i = 0; i < MV_PORTS; i++)
+		priv->vlans[(i == MV_WANPORT ? 2 : 1)] |= (1 << i);
+
+	/* before entering reset, disable all ports */
+	for (i = 0; i < MV_PORTS; i++)
+		w16(pdev, MV_PORTREG(CONTROL, i), 0x00);
+
+	msleep(2); /* wait for the status change to settle in */
+
+	/* put the ATU in reset */
+	w16(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET);
+
+	i = mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET, 0);
+	if (i < 0) {
+		printk("%s: Timeout waiting for the switch to reset.\n", dev->name);
+		return i;
+	}
+
+	/* set the ATU flags */
+	w16(pdev, MV_SWITCHREG(ATU_CTRL),
+		MV_ATUCTL_NO_LEARN |
+		MV_ATUCTL_ATU_1K |
+		MV_ATUCTL_AGETIME(MV_ATUCTL_AGETIME_MIN) /* minimum without disabling ageing */
+	);
+
+	/* initialize the cpu port */
+	w16(pdev, MV_PORTREG(CONTROL, MV_CPUPORT),
+#ifdef HEADER_MODE
+		MV_PORTCTRL_HEADER |
+#else
+		MV_PORTCTRL_RXTR |
+		MV_PORTCTRL_TXTR |
+#endif
+		MV_PORTCTRL_ENABLED
+	);
+	/* wait for the phy change to settle in */
+	msleep(2);
+	for (i = 0; i < MV_PORTS; i++) {
+		u8 pvid = 0;
+		int j;
+
+		vlmap = 0;
+
+		/* look for the matching vlan */
+		for (j = 0; j < ARRAY_SIZE(priv->vlans); j++) {
+			if (priv->vlans[j] & (1 << i)) {
+				vlmap = priv->vlans[j];
+				pvid = j;
+			}
+		}
+		/* leave port unconfigured if it's not part of a vlan */
+		if (!vlmap)
+			continue;
+
+		/* add the cpu port to the allowed destinations list */
+		vlmap |= (1 << MV_CPUPORT);
+
+		/* take port out of its own vlan destination map */
+		vlmap &= ~(1 << i);
+
+		/* apply vlan settings */
+		w16(pdev, MV_PORTREG(VLANMAP, i),
+			MV_PORTVLAN_PORTS(vlmap) |
+			MV_PORTVLAN_ID(i)
+		);
+
+		/* re-enable port */
+		w16(pdev, MV_PORTREG(CONTROL, i),
+			MV_PORTCTRL_ENABLED
+		);
+	}
+
+	w16(pdev, MV_PORTREG(VLANMAP, MV_CPUPORT),
+		MV_PORTVLAN_ID(MV_CPUPORT)
+	);
+
+	/* set the port association vector */
+	for (i = 0; i <= MV_PORTS; i++) {
+		w16(pdev, MV_PORTREG(ASSOC, i),
+			MV_PORTASSOC_PORTS(1 << i)
+		);
+	}
+
+	/* init switch control */
+	w16(pdev, MV_SWITCHREG(CTRL),
+		MV_SWITCHCTL_MSIZE |
+		MV_SWITCHCTL_DROP
+	);
+
+	dev->eth_mangle_rx = mvswitch_mangle_rx;
+	dev->eth_mangle_tx = mvswitch_mangle_tx;
+	priv->orig_features = dev->features;
+
+#ifdef HEADER_MODE
+	dev->priv_flags |= IFF_NO_IP_ALIGN;
+	dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
+#else
+	dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
+#endif
+
+	return 0;
+}
+
+static int
+mvswitch_read_status(struct phy_device *pdev)
+{
+	pdev->speed = SPEED_100;
+	pdev->duplex = DUPLEX_FULL;
+	pdev->link = 1;
+
+	/* XXX ugly workaround: we can't force the switch
+	 * to gracefully handle hosts moving from one port to another,
+	 * so we have to regularly clear the ATU database */
+
+	/* wait for the ATU to become available */
+	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
+
+	/* flush the ATU */
+	w16(pdev, MV_SWITCHREG(ATU_OP),
+		MV_ATUOP_INPROGRESS |
+		MV_ATUOP_FLUSH_ALL
+	);
+
+	/* wait for operation to complete */
+	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
+
+	return 0;
+}
+
+static int
+mvswitch_aneg_done(struct phy_device *phydev)
+{
+	return 1;	/* Return any positive value */
+}
+
+static int
+mvswitch_config_aneg(struct phy_device *phydev)
+{
+	return 0;
+}
+
+static void
+mvswitch_detach(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv = to_mvsw(pdev);
+	struct net_device *dev = pdev->attached_dev;
+
+	if (!dev)
+		return;
+
+	dev->phy_ptr = NULL;
+	dev->eth_mangle_rx = NULL;
+	dev->eth_mangle_tx = NULL;
+	dev->features = priv->orig_features;
+	dev->priv_flags &= ~IFF_NO_IP_ALIGN;
+}
+
+static void
+mvswitch_remove(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv = to_mvsw(pdev);
+
+	kfree(priv);
+}
+
+static int
+mvswitch_probe(struct phy_device *pdev)
+{
+	struct mvswitch_priv *priv;
+
+	priv = kzalloc(sizeof(struct mvswitch_priv), GFP_KERNEL);
+	if (priv == NULL)
+		return -ENOMEM;
+
+	pdev->priv = priv;
+
+	return 0;
+}
+
+static int
+mvswitch_fixup(struct phy_device *dev)
+{
+	struct mii_bus *bus = dev->mdio.bus;
+	u16 reg;
+
+	if (dev->mdio.addr != 0x10)
+		return 0;
+
+	reg = bus->read(bus, MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
+	if (reg != MV_IDENT_VALUE)
+		return 0;
+
+	dev->phy_id = MVSWITCH_MAGIC;
+	return 0;
+}
+
+
+static struct phy_driver mvswitch_driver = {
+	.name		= "Marvell 88E6060",
+	.phy_id		= MVSWITCH_MAGIC,
+	.phy_id_mask	= 0xffffffff,
+	.features	= PHY_BASIC_FEATURES,
+	.probe		= &mvswitch_probe,
+	.remove		= &mvswitch_remove,
+	.detach		= &mvswitch_detach,
+	.config_init	= &mvswitch_config_init,
+	.config_aneg	= &mvswitch_config_aneg,
+	.aneg_done	= &mvswitch_aneg_done,
+	.read_status	= &mvswitch_read_status,
+};
+
+static int __init
+mvswitch_init(void)
+{
+	phy_register_fixup_for_id(PHY_ANY_ID, mvswitch_fixup);
+	return phy_driver_register(&mvswitch_driver, THIS_MODULE);
+}
+
+static void __exit
+mvswitch_exit(void)
+{
+	phy_driver_unregister(&mvswitch_driver);
+}
+
+module_init(mvswitch_init);
+module_exit(mvswitch_exit);
diff --git a/lede/target/linux/generic/files/drivers/net/phy/mvswitch.h b/lede/target/linux/generic/files/drivers/net/phy/mvswitch.h
new file mode 100644
index 0000000000..ab2a1a126e
--- /dev/null
+++ b/lede/target/linux/generic/files/drivers/net/phy/mvswitch.h
@@ -0,0 +1,145 @@
+/*
+ * Marvell 88E6060 switch driver
+ * Copyright (c) 2008 Felix Fietkau <nbd@nbd.name>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of the GNU General Public License v2 as published by the
+ * Free Software Foundation
+ */
+#ifndef __MVSWITCH_H
+#define __MVSWITCH_H
+
+#define MV_HEADER_SIZE	2
+#define MV_HEADER_PORTS_M	0x001f
+#define MV_HEADER_PORTS_S	0
+#define MV_HEADER_VLAN_M	0xf000
+#define MV_HEADER_VLAN_S	12
+
+#define MV_TRAILER_SIZE	4
+#define MV_TRAILER_PORTS_M	0x1f
+#define MV_TRAILER_PORTS_S	16
+#define MV_TRAILER_FLAGS_S	24
+#define MV_TRAILER_OVERRIDE	0x80
+
+
+#define MV_PORTS	5
+#define MV_WANPORT	4
+#define MV_CPUPORT	5
+
+#define MV_BASE		0x10
+
+#define MV_PHYPORT_BASE		(MV_BASE + 0x0)
+#define MV_PHYPORT(_n)		(MV_PHYPORT_BASE + (_n))
+#define MV_SWITCHPORT_BASE	(MV_BASE + 0x8)
+#define MV_SWITCHPORT(_n)	(MV_SWITCHPORT_BASE + (_n))
+#define MV_SWITCHREGS		(MV_BASE + 0xf)
+
+enum {
+	MV_PHY_CONTROL      = 0x00,
+	MV_PHY_STATUS       = 0x01,
+	MV_PHY_IDENT0       = 0x02,
+	MV_PHY_IDENT1       = 0x03,
+	MV_PHY_ANEG         = 0x04,
+	MV_PHY_LINK_ABILITY = 0x05,
+	MV_PHY_ANEG_EXPAND  = 0x06,
+	MV_PHY_XMIT_NEXTP   = 0x07,
+	MV_PHY_LINK_NEXTP   = 0x08,
+	MV_PHY_CONTROL1     = 0x10,
+	MV_PHY_STATUS1      = 0x11,
+	MV_PHY_INTR_EN      = 0x12,
+	MV_PHY_INTR_STATUS  = 0x13,
+	MV_PHY_INTR_PORT    = 0x14,
+	MV_PHY_RECV_COUNTER = 0x16,
+	MV_PHY_LED_PARALLEL = 0x16,
+	MV_PHY_LED_STREAM   = 0x17,
+	MV_PHY_LED_CTRL     = 0x18,
+	MV_PHY_LED_OVERRIDE = 0x19,
+	MV_PHY_VCT_CTRL     = 0x1a,
+	MV_PHY_VCT_STATUS   = 0x1b,
+	MV_PHY_CONTROL2     = 0x1e
+};
+#define MV_PHYREG(_type, _port) MV_PHYPORT(_port), MV_PHY_##_type
+
+enum {
+	MV_PORT_STATUS      = 0x00,
+	MV_PORT_IDENT       = 0x03,
+	MV_PORT_CONTROL     = 0x04,
+	MV_PORT_VLANMAP     = 0x06,
+	MV_PORT_ASSOC       = 0x0b,
+	MV_PORT_RXCOUNT     = 0x10,
+	MV_PORT_TXCOUNT     = 0x11,
+};
+#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
+
+enum {
+	MV_PORTCTRL_BLOCK   =  (1 << 0),
+	MV_PORTCTRL_LEARN   =  (2 << 0),
+	MV_PORTCTRL_ENABLED =  (3 << 0),
+	MV_PORTCTRL_VLANTUN =  (1 << 7),	/* Enforce VLANs on packets */
+	MV_PORTCTRL_RXTR    =  (1 << 8),	/* Enable Marvell packet trailer for ingress */
+	MV_PORTCTRL_HEADER	= (1 << 11),	/* Enable Marvell packet header mode for port */
+	MV_PORTCTRL_TXTR    = (1 << 14),	/* Enable Marvell packet trailer for egress */
+	MV_PORTCTRL_FORCEFL = (1 << 15),	/* force flow control */
+};
+
+#define MV_PORTVLAN_ID(_n) (((_n) & 0xf) << 12)
+#define MV_PORTVLAN_PORTS(_n) ((_n) & 0x3f)
+
+#define MV_PORTASSOC_PORTS(_n) ((_n) & 0x1f)
+#define MV_PORTASSOC_MONITOR	(1 << 15)
+
+enum {
+	MV_SWITCH_MAC0      = 0x01,
+	MV_SWITCH_MAC1      = 0x02,
+	MV_SWITCH_MAC2      = 0x03,
+	MV_SWITCH_CTRL      = 0x04,
+	MV_SWITCH_ATU_CTRL  = 0x0a,
+	MV_SWITCH_ATU_OP    = 0x0b,
+	MV_SWITCH_ATU_DATA  = 0x0c,
+	MV_SWITCH_ATU_MAC0  = 0x0d,
+	MV_SWITCH_ATU_MAC1  = 0x0e,
+	MV_SWITCH_ATU_MAC2  = 0x0f,
+};
+#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
+
+enum {
+	MV_SWITCHCTL_EEIE   =  (1 << 0),	/* EEPROM interrupt enable */
+	MV_SWITCHCTL_PHYIE  =  (1 << 1),	/* PHY interrupt enable */
+	MV_SWITCHCTL_ATUDONE=  (1 << 2),	/* ATU done interrupt enable */
+	MV_SWITCHCTL_ATUIE  =  (1 << 3),	/* ATU interrupt enable */
+	MV_SWITCHCTL_CTRMODE=  (1 << 8),	/* statistics for rx and tx errors */
+	MV_SWITCHCTL_RELOAD =  (1 << 9),	/* reload registers from eeprom */
+	MV_SWITCHCTL_MSIZE  = (1 << 10),	/* increase maximum frame size */
+	MV_SWITCHCTL_DROP   = (1 << 13),	/* discard frames with excessive collisions */
+};
+
+enum {
+#define MV_ATUCTL_AGETIME_MIN	16
+#define MV_ATUCTL_AGETIME_MAX	4080
+#define MV_ATUCTL_AGETIME(_n)	((((_n) / 16) & 0xff) << 4)
+	MV_ATUCTL_ATU_256   = (0 << 12),
+	MV_ATUCTL_ATU_512   = (1 << 12),
+	MV_ATUCTL_ATU_1K	= (2 << 12),
+	MV_ATUCTL_ATUMASK   = (3 << 12),
+	MV_ATUCTL_NO_LEARN  = (1 << 14),
+	MV_ATUCTL_RESET     = (1 << 15),
+};
+
+enum {
+#define MV_ATUOP_DBNUM(_n)	((_n) & 0x0f)
+
+	MV_ATUOP_NOOP       = (0 << 12),
+	MV_ATUOP_FLUSH_ALL  = (1 << 12),
+	MV_ATUOP_FLUSH_U    = (2 << 12),
+	MV_ATUOP_LOAD_DB    = (3 << 12),
+	MV_ATUOP_GET_NEXT   = (4 << 12),
+	MV_ATUOP_FLUSH_DB   = (5 << 12),
+	MV_ATUOP_FLUSH_DB_UU= (6 << 12),
+
+	MV_ATUOP_INPROGRESS = (1 << 15),
+};
+
+#define MV_IDENT_MASK		0xfff0
+#define MV_IDENT_VALUE		0x0600
+
+#endif
diff --git a/lede/target/linux/generic/files/drivers/net/phy/psb6970.c b/lede/target/linux/generic/files/drivers/net/phy/psb6970.c
index 2587b99913..fb6ed0e204 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/psb6970.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/psb6970.c
@@ -60,13 +60,11 @@ struct psb6970_priv {
 	struct mutex reg_mutex;
 
 	/* all fields below are cleared on reset */
-	struct_group(psb6970_priv_volatile,
-		bool vlan;
-		u16 vlan_id[PSB6970_MAX_VLANS];
-		u8 vlan_table[PSB6970_MAX_VLANS];
-		u8 vlan_tagged;
-		u16 pvid[PSB6970_NUM_PORTS];
-	);
+	bool vlan;
+	u16 vlan_id[PSB6970_MAX_VLANS];
+	u8 vlan_table[PSB6970_MAX_VLANS];
+	u8 vlan_tagged;
+	u16 pvid[PSB6970_NUM_PORTS];
 };
 
 #define to_psb6970(_dev) container_of(_dev, struct psb6970_priv, dev)
@@ -274,8 +272,8 @@ static int psb6970_reset_switch(struct switch_dev *dev)
 
 	mutex_lock(&priv->reg_mutex);
 
-	memset(&priv->psb6970_priv_volatile, 0,
-		sizeof(priv->psb6970_priv_volatile));
+	memset(&priv->vlan, 0, sizeof(struct psb6970_priv) -
+	       offsetof(struct psb6970_priv, vlan));
 
 	for (i = 0; i < PSB6970_MAX_VLANS; i++)
 		priv->vlan_id[i] = i;
@@ -309,6 +307,7 @@ static const struct switch_dev_ops psb6970_ops = {
 static int psb6970_config_init(struct phy_device *pdev)
 {
 	struct psb6970_priv *priv;
+	struct net_device *dev = pdev->attached_dev;
 	struct switch_dev *swdev;
 	int ret;
 
diff --git a/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index a26fd204cb..e8375e5147 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -256,7 +256,7 @@ static int __rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 
 int __rtl8366_mdio_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 {
-	u32 phy_id = smi->phy_id;
+	u32 phy_id = MDC_REALTEK_PHY_ADDR;
 	struct mii_bus *mbus = smi->ext_mbus;
 
 	BUG_ON(in_interrupt());
@@ -293,7 +293,7 @@ int __rtl8366_mdio_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 
 static int __rtl8366_mdio_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
 {
-	u32 phy_id = smi->phy_id;
+	u32 phy_id = MDC_REALTEK_PHY_ADDR;
 	struct mii_bus *mbus = smi->ext_mbus;
 
 	BUG_ON(in_interrupt());
@@ -590,7 +590,7 @@ static int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port,
 	return -ENOSPC;
 }
 
-static int rtl8366_smi_enable_vlan(struct rtl8366_smi *smi, int enable)
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
 {
 	int err;
 
@@ -607,8 +607,9 @@ static int rtl8366_smi_enable_vlan(struct rtl8366_smi *smi, int enable)
 
 	return err;
 }
+EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);
 
-static int rtl8366_smi_enable_vlan4k(struct rtl8366_smi *smi, int enable)
+static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 {
 	int err;
 
@@ -628,7 +629,7 @@ static int rtl8366_smi_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 	return 0;
 }
 
-static int rtl8366_smi_enable_all_ports(struct rtl8366_smi *smi, int enable)
+int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable)
 {
 	int port;
 	int err;
@@ -641,15 +642,16 @@ static int rtl8366_smi_enable_all_ports(struct rtl8366_smi *smi, int enable)
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(rtl8366_enable_all_ports);
 
-static int rtl8366_smi_reset_vlan(struct rtl8366_smi *smi)
+int rtl8366_reset_vlan(struct rtl8366_smi *smi)
 {
 	struct rtl8366_vlan_mc vlanmc;
 	int err;
 	int i;
 
-	rtl8366_smi_enable_vlan(smi, 0);
-	rtl8366_smi_enable_vlan4k(smi, 0);
+	rtl8366_enable_vlan(smi, 0);
+	rtl8366_enable_vlan4k(smi, 0);
 
 	/* clear VLAN member configurations */
 	vlanmc.vid = 0;
@@ -665,13 +667,14 @@ static int rtl8366_smi_reset_vlan(struct rtl8366_smi *smi)
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);
 
 static int rtl8366_init_vlan(struct rtl8366_smi *smi)
 {
 	int port;
 	int err;
 
-	err = rtl8366_smi_reset_vlan(smi);
+	err = rtl8366_reset_vlan(smi);
 	if (err)
 		return err;
 
@@ -692,7 +695,7 @@ static int rtl8366_init_vlan(struct rtl8366_smi *smi)
 			return err;
 	}
 
-	return rtl8366_smi_enable_vlan(smi, 1);
+	return rtl8366_enable_vlan(smi, 1);
 }
 
 #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
@@ -1070,15 +1073,15 @@ int rtl8366_sw_reset_switch(struct switch_dev *dev)
 	if (err)
 		return err;
 
-	err = rtl8366_smi_reset_vlan(smi);
+	err = rtl8366_reset_vlan(smi);
 	if (err)
 		return err;
 
-	err = rtl8366_smi_enable_vlan(smi, 1);
+	err = rtl8366_enable_vlan(smi, 1);
 	if (err)
 		return err;
 
-	return rtl8366_smi_enable_all_ports(smi, 1);
+	return rtl8366_enable_all_ports(smi, 1);
 }
 EXPORT_SYMBOL_GPL(rtl8366_sw_reset_switch);
 
@@ -1340,9 +1343,9 @@ int rtl8366_sw_set_vlan_enable(struct switch_dev *dev,
 		return -EINVAL;
 
 	if (attr->ofs == 1)
-		err = rtl8366_smi_enable_vlan(smi, val->value.i);
+		err = rtl8366_enable_vlan(smi, val->value.i);
 	else
-		err = rtl8366_smi_enable_vlan4k(smi, val->value.i);
+		err = rtl8366_enable_vlan4k(smi, val->value.i);
 
 	return err;
 }
@@ -1491,7 +1494,7 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
 		goto err_free_sck;
 	}
 
-	err = rtl8366_smi_enable_all_ports(smi, 1);
+	err = rtl8366_enable_all_ports(smi, 1);
 	if (err)
 		goto err_free_sck;
 
@@ -1547,9 +1550,6 @@ int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
 		goto try_gpio;
 	}
 
-	if (of_property_read_u32(np, "phy-id", &smi->phy_id))
-		smi->phy_id = MDC_REALTEK_PHY_ADDR;
-
 	return 0;
 
 try_gpio:
@@ -1589,7 +1589,6 @@ int rtl8366_smi_probe_plat(struct platform_device *pdev, struct rtl8366_smi *smi
 	smi->gpio_sda = pdata->gpio_sda;
 	smi->gpio_sck = pdata->gpio_sck;
 	smi->hw_reset = pdata->hw_reset;
-	smi->phy_id = MDC_REALTEK_PHY_ADDR;
 
 	return 0;
 }
diff --git a/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
index 3fcae81fa4..d1d988a372 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/lede/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -63,7 +63,6 @@ struct rtl8366_smi {
 	u16			dbg_reg;
 	u8			dbg_vlan_4k_page;
 #endif
-	u32			phy_id;
 	struct mii_bus		*ext_mbus;
 };
 
@@ -116,6 +115,10 @@ int rtl8366_smi_write_reg_noack(struct rtl8366_smi *smi, u32 addr, u32 data);
 int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
 int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
 
+int rtl8366_reset_vlan(struct rtl8366_smi *smi);
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
+int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
+
 #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 int rtl8366_debugfs_open(struct inode *inode, struct file *file);
 #endif
diff --git a/lede/target/linux/generic/files/drivers/net/phy/rtl8367.c b/lede/target/linux/generic/files/drivers/net/phy/rtl8367.c
index b14b63e036..7f0569d038 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/rtl8367.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/rtl8367.c
@@ -1641,7 +1641,7 @@ static int rtl8367_switch_init(struct rtl8366_smi *smi)
 	int err;
 
 	dev->name = "RTL8367";
-	dev->cpu_port = smi->cpu_port;
+	dev->cpu_port = RTL8367_CPU_PORT_NUM;
 	dev->ports = RTL8367_NUM_PORTS;
 	dev->vlans = RTL8367_NUM_VIDS;
 	dev->ops = &rtl8367_sw_ops;
@@ -1722,11 +1722,6 @@ static int rtl8367_detect(struct rtl8366_smi *smi)
 	dev_info(smi->parent, "RTL%s ver. %u chip found\n",
 		 chip_name, rtl_ver & RTL8367_RTL_VER_MASK);
 
-	if (of_property_present(smi->parent->of_node, "realtek,extif1"))
-		smi->cpu_port = RTL8367_CPU_PORT_NUM - 1;
-
-	dev_info(smi->parent, "CPU port: %u\n", smi->cpu_port);
-
 	return 0;
 }
 
diff --git a/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c b/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c
index 04c790e924..cd0d58cbfa 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -1583,13 +1583,6 @@ static int rtl8367b_detect(struct rtl8366_smi *smi)
 
 	dev_info(smi->parent, "RTL%s chip found\n", chip_name);
 
-	if (of_property_present(smi->parent->of_node, "realtek,extif2"))
-		smi->cpu_port = RTL8367B_CPU_PORT_NUM + 2;
-	else if (of_property_present(smi->parent->of_node, "realtek,extif1") && (chip_ver != 0x1010)) /* for the RTL8367R-VB chip, extif1 corresponds to cpu_port 5 */ 
-		smi->cpu_port = RTL8367B_CPU_PORT_NUM + 1;
-
-	dev_info(smi->parent, "CPU port: %u\n", smi->cpu_port);
-
 	return 0;
 }
 
@@ -1628,7 +1621,9 @@ static int  rtl8367b_probe(struct platform_device *pdev)
 	smi->cmd_write = 0xb8;
 	smi->ops = &rtl8367b_smi_ops;
 	smi->num_ports = RTL8367B_NUM_PORTS;
-	smi->cpu_port = RTL8367B_CPU_PORT_NUM;
+	if (of_property_read_u32(pdev->dev.of_node, "cpu_port", &smi->cpu_port)
+	    || smi->cpu_port >= smi->num_ports)
+		smi->cpu_port = RTL8367B_CPU_PORT_NUM;
 	smi->num_vlan_mc = RTL8367B_NUM_VLANS;
 	smi->mib_counters = rtl8367b_mib_counters;
 	smi->num_mib_counters = ARRAY_SIZE(rtl8367b_mib_counters);
diff --git a/lede/target/linux/generic/files/drivers/net/phy/swconfig.c b/lede/target/linux/generic/files/drivers/net/phy/swconfig.c
index 5fa2b147c6..a734e57608 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -1054,9 +1054,6 @@ static struct genl_family switch_fam = {
 	.module = THIS_MODULE,
 	.ops = swconfig_ops,
 	.n_ops = ARRAY_SIZE(swconfig_ops),
-#if LINUX_VERSION_CODE > KERNEL_VERSION(6,0,0)
-	.resv_start_op = SWITCH_CMD_SET_VLAN + 1,
-#endif
 };
 
 #ifdef CONFIG_OF
diff --git a/lede/target/linux/generic/files/drivers/net/phy/swconfig_leds.c b/lede/target/linux/generic/files/drivers/net/phy/swconfig_leds.c
index 1d309c046c..767d9221b4 100644
--- a/lede/target/linux/generic/files/drivers/net/phy/swconfig_leds.c
+++ b/lede/target/linux/generic/files/drivers/net/phy/swconfig_leds.c
@@ -85,7 +85,7 @@ swconfig_trig_update_port_mask(struct led_trigger *trigger)
 	sw_trig = (void *) trigger;
 
 	port_mask = 0;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 	spin_lock(&trigger->leddev_list_lock);
 #else
 	read_lock(&trigger->leddev_list_lock);
@@ -102,12 +102,11 @@ swconfig_trig_update_port_mask(struct led_trigger *trigger)
 			read_unlock(&trig_data->lock);
 		}
 	}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 	spin_unlock(&trigger->leddev_list_lock);
 #else
 	read_unlock(&trigger->leddev_list_lock);
 #endif
-
 	sw_trig->port_mask = port_mask;
 
 	if (port_mask)
@@ -426,7 +425,7 @@ swconfig_trig_update_leds(struct switch_led_trigger *sw_trig)
 	struct led_trigger *trigger;
 
 	trigger = &sw_trig->trig;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 	spin_lock(&trigger->leddev_list_lock);
 #else
 	read_lock(&trigger->leddev_list_lock);
@@ -437,7 +436,7 @@ swconfig_trig_update_leds(struct switch_led_trigger *sw_trig)
 		led_cdev = list_entry(entry, struct led_classdev, trig_list);
 		swconfig_trig_led_event(sw_trig, led_cdev);
 	}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
 	spin_unlock(&trigger->leddev_list_lock);
 #else
 	read_unlock(&trigger->leddev_list_lock);
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/Kconfig b/lede/target/linux/generic/files/drivers/platform/mikrotik/Kconfig
index 32ef8f29de..7499ba1e1c 100644
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/Kconfig
+++ b/lede/target/linux/generic/files/drivers/platform/mikrotik/Kconfig
@@ -1,5 +1,6 @@
 menuconfig MIKROTIK
 	bool "Platform support for MikroTik RouterBoard virtual devices"
+	default n
 	help
 	  Say Y here to get to see options for the MikroTik RouterBoard platform.
 	  This option alone does not add any kernel code.
@@ -15,10 +16,4 @@ config MIKROTIK_RB_SYSFS
 	help
 	  This driver exposes RouterBoot configuration in sysfs.
 
-config NVMEM_LAYOUT_MIKROTIK
-	tristate "RouterBoot NVMEM layout support"
-	depends on NVMEM_LAYOUTS
-	help
-	  This driver exposes MikroTik hard_config via NVMEM layout.
-
 endif # MIKROTIK
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/Makefile b/lede/target/linux/generic/files/drivers/platform/mikrotik/Makefile
index 164b23b701..a232e1a9e8 100644
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/Makefile
+++ b/lede/target/linux/generic/files/drivers/platform/mikrotik/Makefile
@@ -2,4 +2,3 @@
 # Makefile for MikroTik RouterBoard platform specific drivers
 #
 obj-$(CONFIG_MIKROTIK_RB_SYSFS)     += routerboot.o rb_hardconfig.o rb_softconfig.o
-obj-$(CONFIG_NVMEM_LAYOUT_MIKROTIK)     += rb_nvmem.o
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c b/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c
index 78e39a7f94..e6a6928896 100644
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c
+++ b/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c
@@ -37,12 +37,29 @@
 #include <linux/sysfs.h>
 #include <linux/lzo.h>
 
-#include "rb_hardconfig.h"
 #include "routerboot.h"
 
-#define RB_HARDCONFIG_VER		"0.07"
+#define RB_HARDCONFIG_VER		"0.06"
 #define RB_HC_PR_PFX			"[rb_hardconfig] "
 
+/* ID values for hardware settings */
+#define RB_ID_FLASH_INFO		0x03
+#define RB_ID_MAC_ADDRESS_PACK		0x04
+#define RB_ID_BOARD_PRODUCT_CODE	0x05
+#define RB_ID_BIOS_VERSION		0x06
+#define RB_ID_SDRAM_TIMINGS		0x08
+#define RB_ID_DEVICE_TIMINGS		0x09
+#define RB_ID_SOFTWARE_ID		0x0A
+#define RB_ID_SERIAL_NUMBER		0x0B
+#define RB_ID_MEMORY_SIZE		0x0D
+#define RB_ID_MAC_ADDRESS_COUNT		0x0E
+#define RB_ID_HW_OPTIONS		0x15
+#define RB_ID_WLAN_DATA			0x16
+#define RB_ID_BOARD_IDENTIFIER		0x17
+#define RB_ID_PRODUCT_NAME		0x21
+#define RB_ID_DEFCONF			0x26
+#define RB_ID_BOARD_REVISION		0x27
+
 /* Bit definitions for hardware options */
 #define RB_HW_OPT_NO_UART		BIT(0)
 #define RB_HW_OPT_HAS_VOLTAGE		BIT(1)
@@ -659,9 +676,10 @@ static ssize_t hc_wlan_data_bin_read(struct file *filp, struct kobject *kobj,
 	return count;
 }
 
-int rb_hardconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd)
+int __init rb_hardconfig_init(struct kobject *rb_kobj)
 {
 	struct kobject *hc_wlan_kobj;
+	struct mtd_info *mtd;
 	size_t bytes_read, buflen, outlen;
 	const u8 *buf;
 	void *outbuf;
@@ -672,19 +690,20 @@ int rb_hardconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd)
 	hc_kobj = NULL;
 	hc_wlan_kobj = NULL;
 
-	ret = __get_mtd_device(mtd);
-	if (ret)
+	// TODO allow override
+	mtd = get_mtd_device_nm(RB_MTD_HARD_CONFIG);
+	if (IS_ERR(mtd))
 		return -ENODEV;
 
 	hc_buflen = mtd->size;
 	hc_buf = kmalloc(hc_buflen, GFP_KERNEL);
 	if (!hc_buf) {
-		__put_mtd_device(mtd);
+		put_mtd_device(mtd);
 		return -ENOMEM;
 	}
 
 	ret = mtd_read(mtd, 0, hc_buflen, &bytes_read, hc_buf);
-	__put_mtd_device(mtd);
+	put_mtd_device(mtd);
 
 	if (ret)
 		goto fail;
@@ -799,10 +818,8 @@ fail:
 	return ret;
 }
 
-void rb_hardconfig_exit(void)
+void __exit rb_hardconfig_exit(void)
 {
 	kobject_put(hc_kobj);
-	hc_kobj = NULL;
 	kfree(hc_buf);
-	hc_buf = NULL;
 }
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.h b/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.h
deleted file mode 100644
index 328f4fe3c3..0000000000
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Common definitions for MikroTik RouterBoot hard config data.
- *
- * Copyright (C) 2020 Thibaut VARÈNE <hacks+kernel@slashdirt.org>
- *
- * Some constant defines extracted from routerboot.{c,h} by Gabor Juhos
- * <juhosg@openwrt.org>
- */
-
-#ifndef _ROUTERBOOT_HARD_CONFIG_H_
-#define _ROUTERBOOT_HARD_CONFIG_H_
-
-/* ID values for hardware settings */
-#define RB_ID_FLASH_INFO		0x03
-#define RB_ID_MAC_ADDRESS_PACK		0x04
-#define RB_ID_BOARD_PRODUCT_CODE	0x05
-#define RB_ID_BIOS_VERSION		0x06
-#define RB_ID_SDRAM_TIMINGS		0x08
-#define RB_ID_DEVICE_TIMINGS		0x09
-#define RB_ID_SOFTWARE_ID		0x0A
-#define RB_ID_SERIAL_NUMBER		0x0B
-#define RB_ID_MEMORY_SIZE		0x0D
-#define RB_ID_MAC_ADDRESS_COUNT		0x0E
-#define RB_ID_HW_OPTIONS		0x15
-#define RB_ID_WLAN_DATA			0x16
-#define RB_ID_BOARD_IDENTIFIER		0x17
-#define RB_ID_PRODUCT_NAME		0x21
-#define RB_ID_DEFCONF			0x26
-#define RB_ID_BOARD_REVISION		0x27
-
-#endif /* _ROUTERBOOT_HARD_CONFIG_H_ */
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_nvmem.c b/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_nvmem.c
deleted file mode 100644
index 6f785ce7d1..0000000000
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_nvmem.c
+++ /dev/null
@@ -1,230 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * NVMEM layout driver for MikroTik Routerboard hard config cells
- *
- * Copyright (C) 2024 Robert Marko <robimarko@gmail.com>
- * Based on the sysfs hard config driver by Thibaut VARÈNE <hacks+kernel@slashdirt.org>
- * Comments documenting the format carried over from routerboot.c
- */
-
-#include <linux/bitfield.h>
-#include <linux/etherdevice.h>
-#include <linux/mod_devicetable.h>
-#include <linux/nvmem-consumer.h>
-#include <linux/nvmem-provider.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-
-#include "rb_hardconfig.h"
-#include "routerboot.h"
-
-#define TLV_TAG_MASK 	GENMASK(15, 0)
-#define TLV_LEN_MASK 	GENMASK(31, 16)
-
-static const char *rb_tlv_cell_name(u16 tag)
-{
-	switch (tag) {
-	case RB_ID_FLASH_INFO:
-		return "flash-info";
-	case RB_ID_MAC_ADDRESS_PACK:
-		return "base-mac-address";
-	case RB_ID_BOARD_PRODUCT_CODE:
-		return "board-product-code";
-	case RB_ID_BIOS_VERSION:
-		return "booter-version";
-	case RB_ID_SERIAL_NUMBER:
-		return "board-serial";
-	case RB_ID_MEMORY_SIZE:
-		return "mem-size";
-	case RB_ID_MAC_ADDRESS_COUNT:
-		return "mac-count";
-	case RB_ID_HW_OPTIONS:
-		return "hw-options";
-	case RB_ID_WLAN_DATA:
-		return "wlan-data";
-	case RB_ID_BOARD_IDENTIFIER:
-		return "board-identifier";
-	case RB_ID_PRODUCT_NAME:
-		return "product-name";
-	case RB_ID_DEFCONF:
-		return "defconf";
-	case RB_ID_BOARD_REVISION:
-		return "board-revision";
-	default:
-		break;
-	}
-
-	return NULL;
-}
-
-static int rb_tlv_mac_read_cb(void *priv, const char *id, int index,
-			      unsigned int offset, void *buf,
-			      size_t bytes)
-{
-	if (index < 0)
-		return -EINVAL;
-
-	if (!is_valid_ether_addr(buf))
-		return -EINVAL;
-
-	eth_addr_add(buf, index);
-
-	return 0;
-}
-
-static nvmem_cell_post_process_t rb_tlv_read_cb(u16 tag)
-{
-	switch (tag) {
-	case RB_ID_MAC_ADDRESS_PACK:
-		return &rb_tlv_mac_read_cb;
-	default:
-		break;
-	}
-
-	return NULL;
-}
-
-static int rb_add_cells(struct device *dev, struct nvmem_device *nvmem,
-			const size_t data_len, u8 *data)
-{
-	u32 node, offset = sizeof(RB_MAGIC_HARD);
-	struct nvmem_cell_info cell = {};
-	struct device_node *layout;
-	u16 tlv_tag, tlv_len;
-	int ret;
-
-	layout = of_nvmem_layout_get_container(nvmem);
-	if (!layout)
-		return -ENOENT;
-
-	/*
-	 * Routerboot tag nodes are u32 values:
-	 * - The low nibble is the tag identification number,
-	 * - The high nibble is the tag payload length (node excluded) in bytes.
-	 * Tag nodes are CPU-endian.
-	 * Tag nodes are 32bit-aligned.
-	 *
-	 * The payload immediately follows the tag node.
-	 * Payload offset will always be aligned. while length may not end on 32bit
-	 * boundary (the only known case is when parsing ERD data).
-	 * The payload is CPU-endian when applicable.
-	 * Tag nodes are not ordered (by ID) on flash.
-	 */
-	while ((offset + sizeof(node)) <= data_len) {
-		node = *((const u32 *) (data + offset));
-		/* Tag list ends with null node */
-		if (!node)
-			break;
-
-		tlv_tag = FIELD_GET(TLV_TAG_MASK, node);
-		tlv_len = FIELD_GET(TLV_LEN_MASK, node);
-
-		offset += sizeof(node);
-		if (offset + tlv_len > data_len) {
-			dev_err(dev, "Out of bounds field (0x%x bytes at 0x%x)\n",
-			        tlv_len, offset);
-			break;
-		}
-
-		cell.name = rb_tlv_cell_name(tlv_tag);
-		if (!cell.name)
-			goto skip;
-
-		cell.offset = offset;
-		/*
-		 * MikroTik stores MAC-s with length of 8 bytes,
-		 * but kernel expects it to be ETH_ALEN (6 bytes),
-		 * so we need to make sure that is the case.
-		 */
-		if (tlv_tag == RB_ID_MAC_ADDRESS_PACK)
-			cell.bytes = ETH_ALEN;
-		else
-			cell.bytes = tlv_len;
-		cell.np = of_get_child_by_name(layout, cell.name);
-		cell.read_post_process = rb_tlv_read_cb(tlv_tag);
-
-		ret = nvmem_add_one_cell(nvmem, &cell);
-		if (ret) {
-			of_node_put(layout);
-			return ret;
-		}
-
-		/*
-		 * The only known situation where len may not end on 32bit
-		 * boundary is within ERD data. Since we're only extracting
-		 * one tag (the first and only one) from that data, we should
-		 * never need to forcefully ALIGN(). Do it anyway, this is not a
-		 * performance path.
-		 */
-skip:
-		offset += ALIGN(tlv_len, sizeof(offset));
-	}
-
-	of_node_put(layout);
-
-	return 0;
-}
-
-static int rb_parse_table(struct nvmem_layout *layout)
-{
-	struct nvmem_device *nvmem = layout->nvmem;
-	struct device *dev = &layout->dev;
-	size_t mtd_size;
-	u8 *data;
-	u32 hdr;
-	int ret;
-
-	ret = nvmem_device_read(nvmem, 0, sizeof(hdr), &hdr);
-	if (ret < 0)
-		return ret;
-
-	if (hdr != RB_MAGIC_HARD) {
-		dev_err(dev, "Invalid header\n");
-		return -EINVAL;
-	}
-
-	mtd_size = nvmem_dev_size(nvmem);
-
-	data = devm_kmalloc(dev, mtd_size, GFP_KERNEL);
-	if (!data)
-		return -ENOMEM;
-
-	ret = nvmem_device_read(nvmem, 0, mtd_size, data);
-	if (ret != mtd_size)
-		return ret;
-
-	return rb_add_cells(dev, nvmem, mtd_size, data);
-}
-
-static int rb_nvmem_probe(struct nvmem_layout *layout)
-{
-	layout->add_cells = rb_parse_table;
-
-	return nvmem_layout_register(layout);
-}
-
-static void rb_nvmem_remove(struct nvmem_layout *layout)
-{
-	nvmem_layout_unregister(layout);
-}
-
-static const struct of_device_id rb_nvmem_of_match_table[] = {
-	{ .compatible = "mikrotik,routerboot-nvmem", },
-	{},
-};
-MODULE_DEVICE_TABLE(of, rb_nvmem_of_match_table);
-
-static struct nvmem_layout_driver rb_nvmem_layout = {
-	.probe = rb_nvmem_probe,
-	.remove = rb_nvmem_remove,
-	.driver = {
-		.owner = THIS_MODULE,
-		.name = "rb_nvmem",
-		.of_match_table = rb_nvmem_of_match_table,
-	},
-};
-module_nvmem_layout_driver(rb_nvmem_layout);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Robert Marko <robimarko@gmail.com>");
-MODULE_DESCRIPTION("NVMEM layout driver for MikroTik Routerboard hard config cells");
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c b/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
index 5acff6aa91..070bd32d5a 100644
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
+++ b/lede/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
@@ -56,12 +56,23 @@
 
 #include "routerboot.h"
 
-#define RB_SOFTCONFIG_VER		"0.05"
+#define RB_SOFTCONFIG_VER		"0.03"
 #define RB_SC_PR_PFX			"[rb_softconfig] "
 
-#define RB_SC_HAS_WRITE_SUPPORT	true
-#define RB_SC_WMODE			S_IWUSR
-#define RB_SC_RMODE			S_IRUSR
+/*
+ * mtd operations before 4.17 are asynchronous, not handled by this code
+ * Also make the driver act read-only if 4K_SECTORS are not enabled, since they
+ * are require to handle partial erasing of the small soft_config partition.
+ */
+#if defined(CONFIG_MTD_SPI_NOR_USE_4K_SECTORS)
+ #define RB_SC_HAS_WRITE_SUPPORT	true
+ #define RB_SC_WMODE			S_IWUSR
+ #define RB_SC_RMODE			S_IRUSR
+#else
+ #define RB_SC_HAS_WRITE_SUPPORT	false
+ #define RB_SC_WMODE			0
+ #define RB_SC_RMODE			S_IRUSR
+#endif
 
 /* ID values for software settings */
 #define RB_SCID_UART_SPEED		0x01	// u32*1
@@ -694,8 +705,9 @@ mtdfail:
 
 static struct kobj_attribute sc_kattrcommit = __ATTR(commit, RB_SC_RMODE|RB_SC_WMODE, sc_commit_show, sc_commit_store);
 
-int rb_softconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd)
+int __init rb_softconfig_init(struct kobject *rb_kobj)
 {
+	struct mtd_info *mtd;
 	size_t bytes_read, buflen;
 	const u8 *buf;
 	int i, ret;
@@ -704,19 +716,20 @@ int rb_softconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd)
 	sc_buf = NULL;
 	sc_kobj = NULL;
 
-	ret = __get_mtd_device(mtd);
-	if (ret)
+	// TODO allow override
+	mtd = get_mtd_device_nm(RB_MTD_SOFT_CONFIG);
+	if (IS_ERR(mtd))
 		return -ENODEV;
 
 	sc_buflen = mtd->size;
 	sc_buf = kmalloc(sc_buflen, GFP_KERNEL);
 	if (!sc_buf) {
-		__put_mtd_device(mtd);
+		put_mtd_device(mtd);
 		return -ENOMEM;
 	}
 
 	ret = mtd_read(mtd, 0, sc_buflen, &bytes_read, sc_buf);
-	__put_mtd_device(mtd);
+	put_mtd_device(mtd);
 
 	if (ret)
 		goto fail;
@@ -786,10 +799,8 @@ fail:
 	return ret;
 }
 
-void rb_softconfig_exit(void)
+void __exit rb_softconfig_exit(void)
 {
 	kobject_put(sc_kobj);
-	sc_kobj = NULL;
 	kfree(sc_buf);
-	sc_buf = NULL;
 }
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.c b/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.c
index 96f2460916..4c8c0bfac5 100644
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.c
+++ b/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sysfs.h>
-#include <linux/mtd/mtd.h>
 
 #include "routerboot.h"
 
@@ -161,57 +160,25 @@ fail:
 	return ret;
 }
 
-static void routerboot_mtd_notifier_add(struct mtd_info *mtd)
-{
-	/* Currently routerboot is only known to live on NOR flash */
-	if (mtd->type != MTD_NORFLASH)
-		return;
-
-	/*
-	 * We ignore the following return values and always register.
-	 * These init() routines are designed so that their failed state is
-	 * always manageable by the corresponding exit() calls.
-	 * Notifier is called with MTD mutex held: use __get/__put variants.
-	 * TODO: allow partition names override
-	 */
-	if (!strcmp(mtd->name, RB_MTD_HARD_CONFIG))
-		rb_hardconfig_init(rb_kobj, mtd);
-	else if (!strcmp(mtd->name, RB_MTD_SOFT_CONFIG))
-		rb_softconfig_init(rb_kobj, mtd);
-}
-
-static void routerboot_mtd_notifier_remove(struct mtd_info *mtd)
-{
-	if (mtd->type != MTD_NORFLASH)
-		return;
-
-	if (!strcmp(mtd->name, RB_MTD_HARD_CONFIG))
-		rb_hardconfig_exit();
-	else if (!strcmp(mtd->name, RB_MTD_SOFT_CONFIG))
-		rb_softconfig_exit();
-}
-
-/* Note: using a notifier prevents qualifying init()/exit() functions with __init/__exit */
-static struct mtd_notifier routerboot_mtd_notifier = {
-	.add = routerboot_mtd_notifier_add,
-	.remove = routerboot_mtd_notifier_remove,
-};
-
 static int __init routerboot_init(void)
 {
 	rb_kobj = kobject_create_and_add("mikrotik", firmware_kobj);
 	if (!rb_kobj)
 		return -ENOMEM;
 
-	register_mtd_user(&routerboot_mtd_notifier);
+	/*
+	 * We ignore the following return values and always register.
+	 * These init() routines are designed so that their failed state is
+	 * always manageable by the corresponding exit() calls.
+	 */
+	rb_hardconfig_init(rb_kobj);
+	rb_softconfig_init(rb_kobj);
 
 	return 0;
 }
 
 static void __exit routerboot_exit(void)
 {
-	unregister_mtd_user(&routerboot_mtd_notifier);
-	/* Exit routines are idempotent */
 	rb_softconfig_exit();
 	rb_hardconfig_exit();
 	kobject_put(rb_kobj);	// recursive afaict
diff --git a/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.h b/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.h
index e858a524af..67d89808d5 100644
--- a/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.h
+++ b/lede/target/linux/generic/files/drivers/platform/mikrotik/routerboot.h
@@ -25,11 +25,11 @@
 int routerboot_tag_find(const u8 *bufhead, const size_t buflen, const u16 tag_id, u16 *pld_ofs, u16 *pld_len);
 int routerboot_rle_decode(const u8 *in, size_t inlen, u8 *out, size_t *outlen);
 
-int rb_hardconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd);
-void rb_hardconfig_exit(void);
+int __init rb_hardconfig_init(struct kobject *rb_kobj);
+void __exit rb_hardconfig_exit(void);
 
-int rb_softconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd);
-void rb_softconfig_exit(void);
+int __init rb_softconfig_init(struct kobject *rb_kobj);
+void __exit rb_softconfig_exit(void);
 
 ssize_t routerboot_tag_show_string(const u8 *pld, u16 pld_len, char *buf);
 ssize_t routerboot_tag_show_u32s(const u8 *pld, u16 pld_len, char *buf);
diff --git a/lede/target/linux/generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch b/lede/target/linux/generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch
new file mode 100644
index 0000000000..7ee66b318c
--- /dev/null
+++ b/lede/target/linux/generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch
@@ -0,0 +1,732 @@
+From 6173a065cb395d4a9528c4e49810af127db68141 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Wed, 16 Nov 2022 12:49:52 +0000
+Subject: [PATCH 1/2] block: add uImage.FIT subimage block driver
+
+Add a small block driver which exposes filesystem sub-images contained
+in U-Boot uImage.FIT images as block devices.
+
+The uImage.FIT image has to be stored directly on a block device or
+partition, MTD device or partition, or UBI volume.
+
+The driver is intended for systems using the U-Boot bootloader and
+uses the root device hint left by the bootloader (or the user) in
+the 'chosen' section of the device-tree.
+
+Example:
+/dts-v1/;
+/ {
+        chosen {
+                rootdisk = <&mmc0_part3>;
+        };
+};
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ MAINTAINERS                 |   6 +
+ drivers/block/Kconfig       |  12 +
+ drivers/block/Makefile      |   2 +
+ drivers/block/fitblk.c      | 658 ++++++++++++++++++++++++++++++++++++
+ drivers/block/open          |   4 +
+ include/uapi/linux/fitblk.h |  10 +
+ 6 files changed, 692 insertions(+)
+ create mode 100644 drivers/block/fitblk.c
+ create mode 100644 drivers/block/open
+ create mode 100644 include/uapi/linux/fitblk.h
+
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -21052,6 +21052,12 @@ F:	Documentation/filesystems/ubifs-authe
+ F:	Documentation/filesystems/ubifs.rst
+ F:	fs/ubifs/
+ 
++U-BOOT UIMAGE.FIT PARSER
++M:	Daniel Golle <daniel@makrotopia.org>
++L:	linux-block@vger.kernel.org
++S:	Maintained
++F:	drivers/block/fitblk.c
++
+ UBLK USERSPACE BLOCK DRIVER
+ M:	Ming Lei <ming.lei@redhat.com>
+ L:	linux-block@vger.kernel.org
+--- a/drivers/block/Kconfig
++++ b/drivers/block/Kconfig
+@@ -383,6 +383,18 @@ config VIRTIO_BLK
+ 	  This is the virtual block driver for virtio.  It can be used with
+           QEMU based VMMs (like KVM or Xen).  Say Y or M.
+ 
++config UIMAGE_FIT_BLK
++	bool "uImage.FIT block driver"
++	help
++	  This driver allows using filesystems contained in uImage.FIT images
++	  by mapping them as block devices.
++
++	  It can currently not be built as a module due to libfdt symbols not
++	  being exported.
++
++	  Say Y if you want to mount filesystems sub-images of a uImage.FIT
++	  stored in a block device partition, mtdblock or ubiblock device.
++
+ config BLK_DEV_RBD
+ 	tristate "Rados block device (RBD)"
+ 	depends on INET && BLOCK
+--- a/drivers/block/Makefile
++++ b/drivers/block/Makefile
+@@ -39,4 +39,6 @@ obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_b
+ 
+ obj-$(CONFIG_BLK_DEV_UBLK)			+= ublk_drv.o
+ 
++obj-$(CONFIG_UIMAGE_FIT_BLK)	+= fitblk.o
++
+ swim_mod-y	:= swim.o swim_asm.o
+--- /dev/null
++++ b/drivers/block/fitblk.c
+@@ -0,0 +1,635 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * uImage.FIT virtual block device driver.
++ *
++ * Copyright (C) 2023 Daniel Golle
++ * Copyright (C) 2007 Nick Piggin
++ * Copyright (C) 2007 Novell Inc.
++ *
++ * Initially derived from drivers/block/brd.c which is in parts derived from
++ * drivers/block/rd.c, and drivers/block/loop.c, copyright of their respective
++ * owners.
++ *
++ * uImage.FIT headers extracted from Das U-Boot
++ *  (C) Copyright 2008 Semihalf
++ *  (C) Copyright 2000-2005
++ *  Wolfgang Denk, DENX Software Engineering, wd@denx.de.
++ */
++
++#include <linux/init.h>
++#include <linux/initrd.h>
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++#include <linux/blkpg.h>
++#include <linux/blk-mq.h>
++#include <linux/ctype.h>
++#include <linux/hdreg.h>
++#include <linux/list.h>
++#include <linux/mutex.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/of_fdt.h>
++#include <linux/pagemap.h>
++#include <linux/platform_device.h>
++#include <linux/property.h>
++#include <linux/refcount.h>
++#include <linux/task_work.h>
++#include <linux/types.h>
++#include <linux/libfdt.h>
++#include <linux/mtd/mtd.h>
++#include <linux/root_dev.h>
++#include <uapi/linux/fitblk.h>
++
++#define FIT_DEVICE_PREFIX	"fit"
++
++/* maximum number of pages used for the uImage.FIT index structure */
++#define FIT_MAX_PAGES		1024
++
++/* minimum free sectors to map as read-write "remainder" volume */
++#define MIN_FREE_SECT		16
++
++/* maximum number of mapped loadables */
++#define MAX_FIT_LOADABLES	16
++
++/* constants for uImage.FIT structrure traversal */
++#define FIT_IMAGES_PATH		"/images"
++#define FIT_CONFS_PATH		"/configurations"
++
++/* hash/signature/key node */
++#define FIT_HASH_NODENAME	"hash"
++#define FIT_ALGO_PROP		"algo"
++#define FIT_VALUE_PROP		"value"
++#define FIT_IGNORE_PROP		"uboot-ignore"
++#define FIT_SIG_NODENAME	"signature"
++#define FIT_KEY_REQUIRED	"required"
++#define FIT_KEY_HINT		"key-name-hint"
++
++/* cipher node */
++#define FIT_CIPHER_NODENAME	"cipher"
++#define FIT_ALGO_PROP		"algo"
++
++/* image node */
++#define FIT_DATA_PROP		"data"
++#define FIT_DATA_POSITION_PROP	"data-position"
++#define FIT_DATA_OFFSET_PROP	"data-offset"
++#define FIT_DATA_SIZE_PROP	"data-size"
++#define FIT_TIMESTAMP_PROP	"timestamp"
++#define FIT_DESC_PROP		"description"
++#define FIT_ARCH_PROP		"arch"
++#define FIT_TYPE_PROP		"type"
++#define FIT_OS_PROP		"os"
++#define FIT_COMP_PROP		"compression"
++#define FIT_ENTRY_PROP		"entry"
++#define FIT_LOAD_PROP		"load"
++
++/* configuration node */
++#define FIT_KERNEL_PROP		"kernel"
++#define FIT_FILESYSTEM_PROP	"filesystem"
++#define FIT_RAMDISK_PROP	"ramdisk"
++#define FIT_FDT_PROP		"fdt"
++#define FIT_LOADABLE_PROP	"loadables"
++#define FIT_DEFAULT_PROP	"default"
++#define FIT_SETUP_PROP		"setup"
++#define FIT_FPGA_PROP		"fpga"
++#define FIT_FIRMWARE_PROP	"firmware"
++#define FIT_STANDALONE_PROP	"standalone"
++
++/* fitblk driver data */
++static const char *_fitblk_claim_ptr = "I belong to fitblk";
++static const char *ubootver;
++struct device_node *rootdisk;
++static struct platform_device *pdev;
++static LIST_HEAD(fitblk_devices);
++static DEFINE_MUTEX(devices_mutex);
++refcount_t num_devs;
++
++struct fitblk {
++	struct platform_device	*pdev;
++	struct block_device	*lower_bdev;
++	sector_t		start_sect;
++	struct gendisk		*disk;
++	struct work_struct	remove_work;
++	struct list_head	list;
++	bool			dead;
++};
++
++static int fitblk_open(struct block_device *bdev, fmode_t mode)
++{
++	struct fitblk *fitblk = bdev->bd_disk->private_data;
++
++	if (fitblk->dead)
++		return -ENOENT;
++
++	return 0;
++}
++
++static void fitblk_release(struct gendisk *disk, fmode_t mode)
++{
++	return;
++}
++
++static void fitblk_submit_bio(struct bio *orig_bio)
++{
++	struct bio *bio = orig_bio;
++	struct fitblk *fitblk = bio->bi_bdev->bd_disk->private_data;
++
++	if (fitblk->dead)
++		return;
++
++	/* mangle bio and re-submit */
++	while (bio) {
++		bio->bi_iter.bi_sector += fitblk->start_sect;
++		bio->bi_bdev = fitblk->lower_bdev;
++		bio = bio->bi_next;
++	}
++	submit_bio(orig_bio);
++}
++
++static void fitblk_remove(struct fitblk *fitblk)
++{
++	blk_mark_disk_dead(fitblk->disk);
++	mutex_lock(&devices_mutex);
++	fitblk->dead = true;
++	list_del(&fitblk->list);
++	mutex_unlock(&devices_mutex);
++
++	schedule_work(&fitblk->remove_work);
++}
++
++static int fitblk_ioctl(struct block_device *bdev, fmode_t mode,
++			unsigned int cmd, unsigned long arg)
++{
++	struct fitblk *fitblk = bdev->bd_disk->private_data;
++
++	if (!capable(CAP_SYS_ADMIN))
++		return -EACCES;
++
++	if (fitblk->dead)
++		return -ENOENT;
++
++	switch (cmd) {
++	case FITBLK_RELEASE:
++		fitblk_remove(fitblk);
++		break;
++	default:
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static const struct block_device_operations fitblk_fops = {
++	.owner		= THIS_MODULE,
++	.ioctl		= fitblk_ioctl,
++	.open		= fitblk_open,
++	.release	= fitblk_release,
++	.submit_bio	= fitblk_submit_bio,
++};
++
++static void fitblk_purge(struct work_struct *work)
++{
++	struct fitblk *fitblk = container_of(work, struct fitblk, remove_work);
++
++	//del_gendisk(fitblk->disk); // causes crash, not doing it doesn't matter
++	refcount_dec(&num_devs);
++	platform_device_del(fitblk->pdev);
++	platform_device_put(fitblk->pdev);
++
++	if (refcount_dec_if_one(&num_devs)) {
++		sysfs_remove_link(&pdev->dev.kobj, "lower_dev");
++		blkdev_put(fitblk->lower_bdev, FMODE_READ | FMODE_EXCL);
++	}
++
++	kfree(fitblk);
++}
++
++static int add_fit_subimage_device(struct block_device *lower_bdev,
++				   unsigned int slot, sector_t start_sect,
++				   sector_t nr_sect, bool readonly)
++{
++	struct fitblk *fitblk;
++	struct gendisk *disk;
++	int err;
++
++	mutex_lock(&devices_mutex);
++	if (!refcount_inc_not_zero(&num_devs))
++		return -EBADF;
++
++	fitblk = kzalloc(sizeof(struct fitblk), GFP_KERNEL);
++	if (!fitblk) {
++		err = -ENOMEM;
++		goto out_unlock;
++	}
++
++	fitblk->lower_bdev = lower_bdev;
++	fitblk->start_sect = start_sect;
++	INIT_WORK(&fitblk->remove_work, fitblk_purge);
++
++	disk = blk_alloc_disk(NUMA_NO_NODE);
++	if (!disk) {
++		err = -ENOMEM;
++		goto out_free_fitblk;
++	}
++
++	disk->first_minor = 0;
++	disk->flags = lower_bdev->bd_disk->flags | GENHD_FL_NO_PART;
++	disk->fops = &fitblk_fops;
++	disk->private_data = fitblk;
++	if (readonly) {
++		set_disk_ro(disk, 1);
++		snprintf(disk->disk_name, sizeof(disk->disk_name), FIT_DEVICE_PREFIX "%u", slot);
++	} else {
++		strcpy(disk->disk_name, FIT_DEVICE_PREFIX "rw");
++	}
++
++	set_capacity(disk, nr_sect);
++
++	disk->queue->queue_flags = lower_bdev->bd_disk->queue->queue_flags;
++	memcpy(&disk->queue->limits, &lower_bdev->bd_disk->queue->limits,
++	       sizeof(struct queue_limits));
++
++	fitblk->disk = disk;
++	fitblk->pdev = platform_device_alloc(disk->disk_name, PLATFORM_DEVID_NONE);
++	if (!fitblk->pdev) {
++		err = -ENOMEM;
++		goto out_cleanup_disk;
++	}
++
++	fitblk->pdev->dev.parent = &pdev->dev;
++	err = platform_device_add(fitblk->pdev);
++	if (err)
++		goto out_put_pdev;
++
++	err = device_add_disk(&fitblk->pdev->dev, disk, NULL);
++	if (err)
++		goto out_del_pdev;
++
++	if (!ROOT_DEV)
++		ROOT_DEV = disk->part0->bd_dev;
++
++	list_add_tail(&fitblk->list, &fitblk_devices);
++
++	mutex_unlock(&devices_mutex);
++
++	return 0;
++
++out_del_pdev:
++	platform_device_del(fitblk->pdev);
++out_put_pdev:
++	platform_device_put(fitblk->pdev);
++out_cleanup_disk:
++	put_disk(disk);
++out_free_fitblk:
++	kfree(fitblk);
++out_unlock:
++	refcount_dec(&num_devs);
++	mutex_unlock(&devices_mutex);
++	return err;
++}
++
++static int parse_fit_on_dev(struct device *dev)
++{
++	struct block_device *bdev;
++	struct address_space *mapping;
++	struct folio *folio;
++	pgoff_t f_index = 0;
++	size_t bytes_left, bytes_to_copy;
++	void *pre_fit, *fit, *fit_c;
++	u64 dsize, dsectors, imgmaxsect = 0;
++	u32 size, image_pos, image_len;
++	const __be32 *image_offset_be, *image_len_be, *image_pos_be;
++	int ret = 0, node, images, config;
++	const char *image_name, *image_type, *image_description,
++		*config_default, *config_description, *config_loadables;
++	u32 image_name_len, image_type_len, image_description_len,
++		bootconf_len, config_default_len, config_description_len,
++		config_loadables_len;
++	sector_t start_sect, nr_sects;
++	struct device_node *np = NULL;
++	const char *bootconf_c;
++	const char *loadable;
++	char *bootconf = NULL, *bootconf_term;
++	bool found;
++	int loadables_rem_len, loadable_len;
++	u16 loadcnt;
++	unsigned int slot = 0;
++
++	/* Exclusive open the block device to receive holder notifications */
++	bdev = blkdev_get_by_dev(dev->devt, FMODE_READ | FMODE_EXCL, &_fitblk_claim_ptr);
++	if (!bdev)
++		return -ENODEV;
++
++	if (IS_ERR(bdev))
++		return PTR_ERR(bdev);
++
++	mapping = bdev->bd_inode->i_mapping;
++
++	/* map first page */
++	folio = read_mapping_folio(mapping, f_index++, NULL);
++	if (IS_ERR(folio)) {
++		ret = PTR_ERR(folio);
++		goto out_blkdev;
++	}
++	pre_fit = folio_address(folio) + offset_in_folio(folio, 0);
++
++	/* uImage.FIT is based on flattened device tree structure */
++	if (fdt_check_header(pre_fit)) {
++		ret = -EINVAL;
++		folio_put(folio);
++		goto out_blkdev;
++	}
++
++	size = fdt_totalsize(pre_fit);
++
++	if (size > PAGE_SIZE * FIT_MAX_PAGES) {
++		ret = -EOPNOTSUPP;
++		folio_put(folio);
++		goto out_blkdev;
++	}
++
++	/* acquire disk size */
++	dsectors = bdev_nr_sectors(bdev);
++	dsize = dsectors << SECTOR_SHIFT;
++
++	/* abort if FIT structure is larger than disk or partition size */
++	if (size >= dsize) {
++		ret = -EFBIG;
++		folio_put(folio);
++		goto out_blkdev;
++	}
++
++	fit = kmalloc(size, GFP_KERNEL);
++	if (!fit) {
++		ret = -ENOMEM;
++		folio_put(folio);
++		goto out_blkdev;
++	}
++
++	bytes_left = size;
++	fit_c = fit;
++	while (bytes_left > 0) {
++		bytes_to_copy = min(bytes_left, folio_size(folio) - offset_in_folio(folio, 0));
++		memcpy(fit_c, pre_fit, bytes_to_copy);
++		fit_c += bytes_to_copy;
++		bytes_left -= bytes_to_copy;
++		if (bytes_left) {
++			folio_put(folio);
++			folio = read_mapping_folio(mapping, f_index++, NULL);
++			if (IS_ERR(folio)) {
++				ret = PTR_ERR(folio);
++				goto out_blkdev;
++			};
++			pre_fit = folio_address(folio) + offset_in_folio(folio, 0);
++		}
++	}
++	folio_put(folio);
++
++	/* set boot config node name U-Boot may have added to the device tree */
++	np = of_find_node_by_path("/chosen");
++	if (np) {
++		bootconf_c = of_get_property(np, "u-boot,bootconf", &bootconf_len);
++		if (bootconf_c && bootconf_len)
++			bootconf = kmemdup_nul(bootconf_c, bootconf_len, GFP_KERNEL);
++	}
++
++	if (bootconf) {
++		bootconf_term = strchr(bootconf, '#');
++		if (bootconf_term)
++			*bootconf_term = '\0';
++	}
++
++	/* find configuration path in uImage.FIT */
++	config = fdt_path_offset(fit, FIT_CONFS_PATH);
++	if (config < 0) {
++		pr_err("FIT: Cannot find %s node: %d\n",
++			FIT_CONFS_PATH, config);
++		ret = -ENOENT;
++		goto out_bootconf;
++	}
++
++	/* get default configuration node name */
++	config_default =
++		fdt_getprop(fit, config, FIT_DEFAULT_PROP, &config_default_len);
++
++	/* make sure we got either default or selected boot config node name */
++	if (!config_default && !bootconf) {
++		pr_err("FIT: Cannot find default configuration\n");
++		ret = -ENOENT;
++		goto out_bootconf;
++	}
++
++	/* find selected boot config node, fallback on default config node */
++	node = fdt_subnode_offset(fit, config, bootconf ?: config_default);
++	if (node < 0) {
++		pr_err("FIT: Cannot find %s node: %d\n",
++			bootconf ?: config_default, node);
++		ret = -ENOENT;
++		goto out_bootconf;
++	}
++
++	pr_info("FIT: Detected U-Boot %s\n", ubootver);
++
++	/* get selected configuration data */
++	config_description =
++		fdt_getprop(fit, node, FIT_DESC_PROP, &config_description_len);
++	config_loadables = fdt_getprop(fit, node, FIT_LOADABLE_PROP,
++				       &config_loadables_len);
++
++	pr_info("FIT: %s configuration: \"%.*s\"%s%.*s%s\n",
++		bootconf ? "Selected" : "Default",
++		bootconf ? bootconf_len : config_default_len,
++		bootconf ?: config_default,
++		config_description ? " (" : "",
++		config_description ? config_description_len : 0,
++		config_description ?: "",
++		config_description ? ")" : "");
++
++	if (!config_loadables || !config_loadables_len) {
++		pr_err("FIT: No loadables configured in \"%s\"\n",
++			bootconf ?: config_default);
++		ret = -ENOENT;
++		goto out_bootconf;
++	}
++
++	/* get images path in uImage.FIT */
++	images = fdt_path_offset(fit, FIT_IMAGES_PATH);
++	if (images < 0) {
++		pr_err("FIT: Cannot find %s node: %d\n", FIT_IMAGES_PATH, images);
++		ret = -EINVAL;
++		goto out_bootconf;
++	}
++
++	/* iterate over images in uImage.FIT */
++	fdt_for_each_subnode(node, fit, images) {
++		image_name = fdt_get_name(fit, node, &image_name_len);
++		image_type = fdt_getprop(fit, node, FIT_TYPE_PROP, &image_type_len);
++		image_offset_be = fdt_getprop(fit, node, FIT_DATA_OFFSET_PROP, NULL);
++		image_pos_be = fdt_getprop(fit, node, FIT_DATA_POSITION_PROP, NULL);
++		image_len_be = fdt_getprop(fit, node, FIT_DATA_SIZE_PROP, NULL);
++
++		if (!image_name || !image_type || !image_len_be ||
++		    !image_name_len || !image_type_len)
++			continue;
++
++		image_len = be32_to_cpu(*image_len_be);
++		if (!image_len)
++			continue;
++
++		if (image_offset_be)
++			image_pos = be32_to_cpu(*image_offset_be) + size;
++		else if (image_pos_be)
++			image_pos = be32_to_cpu(*image_pos_be);
++		else
++			continue;
++
++		image_description = fdt_getprop(fit, node, FIT_DESC_PROP,
++						&image_description_len);
++
++		pr_info("FIT: %16s sub-image 0x%08x..0x%08x \"%.*s\"%s%.*s%s\n",
++			image_type, image_pos, image_pos + image_len - 1,
++			image_name_len, image_name, image_description ? " (" : "",
++			image_description ? image_description_len : 0,
++			image_description ?: "", image_description ? ") " : "");
++
++		/* only 'filesystem' images should be mapped as partitions */
++		if (strncmp(image_type, FIT_FILESYSTEM_PROP, image_type_len))
++			continue;
++
++		/* check if sub-image is part of configured loadables */
++		found = false;
++		loadable = config_loadables;
++		loadables_rem_len = config_loadables_len;
++		for (loadcnt = 0; loadables_rem_len > 1 &&
++				  loadcnt < MAX_FIT_LOADABLES; ++loadcnt) {
++			loadable_len =
++				strnlen(loadable, loadables_rem_len - 1) + 1;
++			loadables_rem_len -= loadable_len;
++			if (!strncmp(image_name, loadable, loadable_len)) {
++				found = true;
++				break;
++			}
++			loadable += loadable_len;
++		}
++		if (!found)
++			continue;
++
++		if (image_pos % (1 << PAGE_SHIFT)) {
++			dev_err(dev, "FIT: image %.*s start not aligned to page boundaries, skipping\n",
++				image_name_len, image_name);
++			continue;
++		}
++
++		if (image_len % (1 << PAGE_SHIFT)) {
++			dev_err(dev, "FIT: sub-image %.*s end not aligned to page boundaries, skipping\n",
++				image_name_len, image_name);
++			continue;
++		}
++
++		start_sect = image_pos >> SECTOR_SHIFT;
++		nr_sects = image_len >> SECTOR_SHIFT;
++		imgmaxsect = max_t(sector_t, imgmaxsect, start_sect + nr_sects);
++
++		if (start_sect + nr_sects > dsectors) {
++			dev_err(dev, "FIT: sub-image %.*s disk access beyond EOD\n",
++				image_name_len, image_name);
++			continue;
++		}
++
++		if (!slot) {
++			ret = sysfs_create_link_nowarn(&pdev->dev.kobj, bdev_kobj(bdev), "lower_dev");
++			if (ret && ret != -EEXIST)
++				goto out_bootconf;
++
++			ret = 0;
++		}
++
++		add_fit_subimage_device(bdev, slot++, start_sect, nr_sects, true);
++	}
++
++	if (!found || !slot)
++		goto out_bootconf;
++
++	dev_info(dev, "mapped %u uImage.FIT filesystem sub-image%s as /dev/fit%s%u%s\n",
++		 slot, (slot > 1)?"s":"", (slot > 1)?"[0...":"", slot - 1,
++		 (slot > 1)?"]":"");
++
++	/* in case uImage.FIT is stored in a partition, map the remaining space */
++	if (!bdev->bd_read_only && bdev_is_partition(bdev) &&
++	    (imgmaxsect + MIN_FREE_SECT) < dsectors) {
++		add_fit_subimage_device(bdev, slot++, imgmaxsect,
++					dsectors - imgmaxsect, false);
++		dev_info(dev, "mapped remaing space as /dev/fitrw\n");
++	}
++
++out_bootconf:
++	kfree(bootconf);
++	kfree(fit);
++out_blkdev:
++	if (!found || ret)
++		blkdev_put(bdev, FMODE_READ | FMODE_EXCL);
++
++	return ret;
++}
++
++static int fitblk_match_of_node(struct device *dev, const void *np)
++{
++	int ret;
++
++	ret = device_match_of_node(dev, np);
++	if (ret)
++		return ret;
++
++	/*
++	 * To match ubiblock and mtdblock devices by their parent ubi
++	 * or mtd device, also consider block device parent
++	 */
++	if (!dev->parent)
++		return 0;
++
++	return device_match_of_node(dev->parent, np);
++}
++
++static int fitblk_probe(struct platform_device *pdev)
++{
++	struct device *dev;
++
++	dev = class_find_device(&block_class, NULL, rootdisk, fitblk_match_of_node);
++	if (!dev)
++		return -EPROBE_DEFER;
++
++	return parse_fit_on_dev(dev);
++}
++
++static struct platform_driver fitblk_driver = {
++	.probe		= fitblk_probe,
++	.driver		= {
++		.name   = "fitblk",
++		.owner   = THIS_MODULE,
++	},
++};
++
++static int __init fitblk_init(void)
++{
++	/* detect U-Boot firmware */
++	ubootver = of_get_property(of_chosen, "u-boot,version", NULL);
++	if (!ubootver)
++		return 0;
++
++	/* parse 'rootdisk' property phandle */
++	rootdisk = of_parse_phandle(of_chosen, "rootdisk", 0);
++	if (!rootdisk)
++		return 0;
++
++	if (platform_driver_register(&fitblk_driver))
++		return -ENODEV;
++
++	refcount_set(&num_devs, 1);
++	pdev = platform_device_register_simple("fitblk", -1, NULL, 0);
++	if (IS_ERR(pdev))
++		return PTR_ERR(pdev);
++
++	return 0;
++}
++device_initcall(fitblk_init);
+--- /dev/null
++++ b/include/uapi/linux/fitblk.h
+@@ -0,0 +1,10 @@
++/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
++#ifndef _UAPI_LINUX_FITBLK_H
++#define _UAPI_LINUX_FITBLK_H
++
++/*
++ * IOCTL commands --- we will commandeer 0x46 ('F')
++ */
++#define FITBLK_RELEASE             0x4600
++
++#endif /* _UAPI_LINUX_FITBLK_H */
diff --git a/lede/target/linux/generic/pending-6.1/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch b/lede/target/linux/generic/pending-6.1/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch
new file mode 100644
index 0000000000..685a5f9da5
--- /dev/null
+++ b/lede/target/linux/generic/pending-6.1/511-init-bypass-device-lookup-for-dev-fit-rootfs.patch
@@ -0,0 +1,25 @@
+From 5ede3f8aed9a1a579bf7304142600d1f3500add9 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Mon, 12 Jun 2023 03:58:42 +0100
+Subject: [PATCH 2/2] init: bypass device lookup for /dev/fit* rootfs
+
+Allow 'rootwait' as /dev/fit* can show up late if the underlaying
+device is probed late.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ init/do_mounts.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -645,7 +645,8 @@ void __init prepare_namespace(void)
+ 
+ 	if (saved_root_name[0]) {
+ 		root_device_name = saved_root_name;
+-		if (!strncmp(root_device_name, "mtd", 3) ||
++		if (!strncmp(root_device_name, "fit", 3) ||
++		    !strncmp(root_device_name, "mtd", 3) ||
+ 		    !strncmp(root_device_name, "ubi", 3)) {
+ 			mount_block_root(root_device_name, root_mountflags);
+ 			goto out;
diff --git a/lede/target/linux/mediatek/Makefile b/lede/target/linux/mediatek/Makefile
index b60b94de69..0175e62c17 100644
--- a/lede/target/linux/mediatek/Makefile
+++ b/lede/target/linux/mediatek/Makefile
@@ -8,8 +8,8 @@ BOARDNAME:=MediaTek Ralink ARM
 SUBTARGETS:=mt7622 mt7623 mt7629 filogic
 FEATURES:=dt-overlay emmc fpu gpio nand pci pcie rootfs-part separate_ramdisk squashfs usb
 
-KERNEL_PATCHVER:=6.6
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_PATCHVER:=6.1
+KERNEL_TESTING_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
diff --git a/lede/target/linux/mediatek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr.sh b/lede/target/linux/mediatek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr.sh
index e9cb4f921d..276ec1b19a 100644
--- a/lede/target/linux/mediatek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr.sh
+++ b/lede/target/linux/mediatek/base-files/etc/uci-defaults/99_fwenv-store-ethaddr.sh
@@ -10,7 +10,6 @@ unielec,u7623-02)
 		fw_setenv ethaddr "$(cat /sys/class/net/eth0/address)"
 	;;
 bananapi,bpi-r3|\
-bananapi,bpi-r3-mini|\
 bananapi,bpi-r4|\
 bananapi,bpi-r4-poe)
 	[ -z "$(fw_printenv -n ethaddr 2>/dev/null)" ] &&
diff --git a/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1-emmc.dts b/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1-emmc.dts
index eeeb632417..2fa31817f1 100644
--- a/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1-emmc.dts
+++ b/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1-emmc.dts
@@ -10,91 +10,5 @@
 	chosen {
 		bootargs = "root=PARTLABEL=rootfs rootwait rootfstype=squashfs,f2fs";
 	};
-
-	reg_1p8v: regulator-1p8v {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-1.8V";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
 };
 
-&mmc0 {
-	bus-width = <8>;
-	cap-mmc-highspeed;
-	hs400-ds-delay = <0x14014>;
-	max-frequency = <200000000>;
-	mmc-hs200-1_8v;
-	mmc-hs400-1_8v;
-	no-sd;
-	no-sdio;
-	non-removable;
-	pinctrl-names = "default", "state_uhs";
-	pinctrl-0 = <&mmc0_pins_default>;
-	pinctrl-1 = <&mmc0_pins_uhs>;
-	vmmc-supply = <&reg_3p3v>;
-	vqmmc-supply = <&reg_1p8v>;
-	status = "okay";
-};
-
-&pio {
-	mmc0_pins_default: mmc0-pins-default {
-		mux {
-			function = "emmc";
-			groups = "emmc_51";
-		};
-		conf-cmd-dat {
-			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
-			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
-			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
-			input-enable;
-			drive-strength = <4>;
-			mediatek,pull-up-adv = <1>;
-		};
-		conf-clk {
-			pins = "EMMC_CK";
-			drive-strength = <6>;
-			mediatek,pull-down-adv = <2>;
-		};
-		conf-ds {
-			pins = "EMMC_DSL";
-			mediatek,pull-down-adv = <2>;
-		};
-		conf-rst {
-			pins = "EMMC_RSTB";
-			drive-strength = <4>;
-			mediatek,pull-up-adv = <1>;
-		};
-	};
-
-	mmc0_pins_uhs: mmc0-uhs-pins {
-		mux {
-			function = "emmc";
-			groups = "emmc_51";
-		};
-		conf-cmd-dat {
-			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
-			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
-			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
-			input-enable;
-			drive-strength = <4>;
-			mediatek,pull-up-adv = <1>;
-		};
-		conf-clk {
-			pins = "EMMC_CK";
-			drive-strength = <6>;
-			mediatek,pull-down-adv = <2>;
-		};
-		conf-ds {
-			pins = "EMMC_DSL";
-			mediatek,pull-down-adv = <2>;
-		};
-		conf-rst {
-			pins = "EMMC_RSTB";
-			drive-strength = <4>;
-			mediatek,pull-up-adv = <1>;
-		};
-	};
-};
diff --git a/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1.dtsi b/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1.dtsi
index f4c58812ce..81011c59a7 100644
--- a/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1.dtsi
+++ b/lede/target/linux/mediatek/dts/mt7986a-hf-m7986r1.dtsi
@@ -86,6 +86,15 @@
 		regulator-boot-on;
 		regulator-always-on;
 	};
+	
+	reg_1p8v: regulator-1p8v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-1.8V";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &crypto {
@@ -185,6 +194,64 @@
 			output-low;
 		};
 	};
+	
+	mmc0_pins_default: mmc0-pins-default {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";
+		};
+		conf-cmd-dat {
+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+			input-enable;
+			drive-strength = <4>;
+			mediatek,pull-up-adv = <1>;
+		};
+		conf-clk {
+			pins = "EMMC_CK";
+			drive-strength = <6>;
+			mediatek,pull-down-adv = <2>;
+		};
+		conf-ds {
+			pins = "EMMC_DSL";
+			mediatek,pull-down-adv = <2>;
+		};
+		conf-rst {
+			pins = "EMMC_RSTB";
+			drive-strength = <4>;
+			mediatek,pull-up-adv = <1>;
+		};
+	};
+
+	mmc0_pins_uhs: mmc0-uhs-pins {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";
+		};
+		conf-cmd-dat {
+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+			input-enable;
+			drive-strength = <4>;
+			mediatek,pull-up-adv = <1>;
+		};
+		conf-clk {
+			pins = "EMMC_CK";
+			drive-strength = <6>;
+			mediatek,pull-down-adv = <2>;
+		};
+		conf-ds {
+			pins = "EMMC_DSL";
+			mediatek,pull-down-adv = <2>;
+		};
+		conf-rst {
+			pins = "EMMC_RSTB";
+			drive-strength = <4>;
+			mediatek,pull-up-adv = <1>;
+		};
+	};
 };
 
 &ssusb {
@@ -249,3 +316,22 @@
 &watchdog {
 	status = "okay";
 };
+
+&mmc0 {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	hs400-ds-delay = <0x14014>;
+	max-frequency = <200000000>;
+	mmc-hs200-1_8v;
+	mmc-hs400-1_8v;
+	no-sd;
+	no-sdio;
+	non-removable;
+	pinctrl-names = "default", "state_uhs";
+	pinctrl-0 = <&mmc0_pins_default>;
+	pinctrl-1 = <&mmc0_pins_uhs>;
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_1p8v>;
+	status = "okay";
+};
+
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso
new file mode 100644
index 0000000000..4945185d69
--- /dev/null
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Frank Wunderlich <frank-w@public-files.de>
+ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
+
+	fragment@0 {
+		target-path = "/soc/mmc@11230000";
+		__overlay__ {
+			pinctrl-names = "default", "state_uhs";
+			pinctrl-0 = <&mmc0_pins_emmc_51>;
+			pinctrl-1 = <&mmc0_pins_emmc_51>;
+			bus-width = <8>;
+			max-frequency = <200000000>;
+			cap-mmc-highspeed;
+			mmc-hs200-1_8v;
+			mmc-hs400-1_8v;
+			hs400-ds-delay = <0x12814>;
+			vqmmc-supply = <&reg_1p8v>;
+			vmmc-supply = <&reg_3p3v>;
+			non-removable;
+			no-sd;
+			no-sdio;
+			status = "okay";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			card@0 {
+				compatible = "mmc-card";
+				reg = <0>;
+
+				block {
+					compatible = "block-device";
+					partitions {
+						block-partition-env {
+							partname = "ubootenv";
+							nvmem-layout {
+								compatible = "u-boot,env-layout";
+							};
+						};
+						emmc_rootfs: block-partition-production {
+							partname = "production";
+						};
+					};
+				};
+			};
+		};
+	};
+
+	fragment@2 {
+		target-path = "/chosen";
+		__overlay__ {
+			rootdisk-emmc = <&emmc_rootfs>;
+		};
+	};
+};
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-poe.dts b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-poe.dts
new file mode 100644
index 0000000000..58f0bf3f7d
--- /dev/null
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-poe.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2022 MediaTek Inc.
+ * Author: Sam.Shih <sam.shih@mediatek.com>
+ */
+
+#include "mt7988a-bananapi-bpi-r4.dts"
+
+/ {
+	model = "Bananapi BPI-R4 2.5GE PoE";
+	compatible = "bananapi,bpi-r4-poe",
+		     "mediatek,mt7988a";
+};
+
+&gmac1 {
+	phy-mode = "internal";
+	phy-connection-type = "internal";
+	phy = <&int_2p5g_phy>;
+	status = "okay";
+};
+
+&int_2p5g_phy {
+	pinctrl-names = "i2p5gbe-led";
+	pinctrl-0 = <&i2p5gbe_led0_pins>;
+};
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-rtc.dtso b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-rtc.dtso
new file mode 100644
index 0000000000..39910b8cfe
--- /dev/null
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-rtc.dtso
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2023
+ * Author: Daniel Golle <daniel@makrotopia.org>
+ */
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
+
+	fragment@0 {
+		target = <&pcf8563>;
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso
new file mode 100644
index 0000000000..1f5e1491a4
--- /dev/null
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2023 MediaTek Inc.
+ * Author: Frank Wunderlich <frank-w@public-files.de>
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
+
+	fragment@1 {
+		target-path = "/soc/mmc@11230000";
+		__overlay__ {
+			pinctrl-names = "default", "state_uhs";
+			pinctrl-0 = <&mmc0_pins_sdcard>;
+			pinctrl-1 = <&mmc0_pins_sdcard>;
+			cd-gpios = <&pio 12 GPIO_ACTIVE_LOW>;
+			bus-width = <4>;
+			max-frequency = <52000000>;
+			cap-sd-highspeed;
+			vmmc-supply = <&reg_3p3v>;
+			vqmmc-supply = <&reg_3p3v>;
+			no-mmc;
+			status = "okay";
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			card@0 {
+				compatible = "mmc-card";
+				reg = <0>;
+
+				block {
+					compatible = "block-device";
+					partitions {
+						block-partition-env {
+							partname = "ubootenv";
+							nvmem-layout {
+								compatible = "u-boot,env-layout";
+							};
+						};
+						sd_rootfs: block-partition-production {
+							partname = "production";
+						};
+					};
+				};
+			};
+		};
+	};
+
+	fragment@2 {
+		target-path = "/chosen";
+		__overlay__ {
+			rootdisk-sd = <&sd_rootfs>;
+		};
+	};
+};
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-wifi-mt7996a.dtso b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-wifi-mt7996a.dtso
new file mode 100644
index 0000000000..8a029b149f
--- /dev/null
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-wifi-mt7996a.dtso
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
+
+	fragment@0 {
+		target-path = "/";
+		__overlay__ {
+			wifi_12v: regulator-wifi-12v {
+				compatible = "regulator-fixed";
+				regulator-name = "wifi";
+				regulator-min-microvolt = <12000000>;
+				regulator-max-microvolt = <12000000>;
+				gpio = <&pio 4 GPIO_ACTIVE_HIGH>;
+				enable-active-high;
+				regulator-always-on;
+			};
+		};
+	};
+
+	fragment@1 {
+		target = <&i2c_wifi>;
+		__overlay__ {
+			// 5G WIFI MAC Address EEPROM
+			wifi_eeprom@51 {
+				compatible = "atmel,24c02";
+				reg = <0x51>;
+				address-bits = <8>;
+				page-size = <8>;
+				size = <256>;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_5g: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+				};
+			};
+
+			// 6G WIFI MAC Address EEPROM
+			wifi_eeprom@52 {
+				compatible = "atmel,24c02";
+				reg = <0x52>;
+				address-bits = <8>;
+				page-size = <8>;
+				size = <256>;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_6g: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+				};
+			};
+		};
+	};
+
+	fragment@2 {
+		target = <&pcie0>;
+		__overlay__ {
+			pcie@0,0 {
+				reg = <0x0000 0 0 0 0>;
+
+				wifi@0,0 {
+					compatible = "mediatek,mt76";
+					reg = <0x0000 0 0 0 0>;
+					nvmem-cell-names = "mac-address";
+					nvmem-cells = <&macaddr_5g>;
+				};
+			};
+		};
+	};
+
+	fragment@3 {
+		target = <&pcie1>;
+		__overlay__ {
+			pcie@0,0 {
+				reg = <0x0000 0 0 0 0>;
+
+				wifi@0,0 {
+					compatible = "mediatek,mt76";
+					reg = <0x0000 0 0 0 0>;
+					nvmem-cell-names = "mac-address";
+					nvmem-cells = <&macaddr_6g>;
+				};
+			};
+		};
+	};
+};
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
new file mode 100644
index 0000000000..b4bf3400ff
--- /dev/null
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
@@ -0,0 +1,395 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2022 MediaTek Inc.
+ * Author: Sam.Shih <sam.shih@mediatek.com>
+ */
+
+/dts-v1/;
+#include "mt7988a.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/regulator/richtek,rt5190a-regulator.h>
+
+/ {
+	model = "Bananapi BPI-R4";
+	compatible = "bananapi,bpi-r4",
+		     "mediatek,mt7988";
+
+	aliases {
+		serial0 = &uart0;
+		led-boot = &led_green;
+		led-failsafe = &led_green;
+		led-running = &led_green;
+		led-upgrade = &led_green;
+	};
+
+	chosen {
+		stdout-path = &uart0;
+		bootargs = "console=ttyS0,115200n1 loglevel=8 pci=pcie_bus_perf ubi.block=0,fit root=/dev/fit0";
+		rootdisk-spim-nand = <&ubi_rootfs>;
+	};
+
+	memory {
+		reg = <0x00 0x40000000 0x00 0x10000000>;
+	};
+
+	/* SFP1 cage (WAN) */
+	sfp1: sfp1 {
+		compatible = "sff,sfp";
+		i2c-bus = <&i2c_sfp1>;
+		los-gpios = <&pio 54 GPIO_ACTIVE_HIGH>;
+		mod-def0-gpios = <&pio 82 GPIO_ACTIVE_LOW>;
+		tx-disable-gpios = <&pio 70 GPIO_ACTIVE_HIGH>;
+		tx-fault-gpios = <&pio 69 GPIO_ACTIVE_HIGH>;
+		rate-select0-gpios = <&pio 21 GPIO_ACTIVE_LOW>;
+		maximum-power-milliwatt = <3000>;
+	};
+
+	/* SFP2 cage (LAN) */
+	sfp2: sfp2 {
+		compatible = "sff,sfp";
+		i2c-bus = <&i2c_sfp2>;
+		los-gpios = <&pio 2 GPIO_ACTIVE_HIGH>;
+		mod-def0-gpios = <&pio 83 GPIO_ACTIVE_LOW>;
+		tx-disable-gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
+		tx-fault-gpios = <&pio 1 GPIO_ACTIVE_HIGH>;
+		rate-select0-gpios = <&pio 3 GPIO_ACTIVE_LOW>;
+		maximum-power-milliwatt = <3000>;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		wps {
+			label = "WPS";
+			linux,code = <KEY_RESTART>;
+			gpios = <&pio 14 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		led_green: led-green {
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&pio 79 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
+		};
+
+		led_blue: led-blue {
+			function = LED_FUNCTION_WPS;
+			color = <LED_COLOR_ID_BLUE>;
+			gpios = <&pio 63 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+	};
+};
+
+&eth {
+	status = "okay";
+};
+
+&gmac0 {
+	status = "okay";
+};
+
+&gmac1 {
+	sfp = <&sfp2>;
+	managed = "in-band-status";
+	phy-mode = "usxgmii";
+	status = "okay";
+};
+
+&gmac2 {
+	sfp = <&sfp1>;
+	managed = "in-band-status";
+	phy-mode = "usxgmii";
+	status = "okay";
+};
+
+&switch {
+	status = "okay";
+};
+
+&gsw_phy0 {
+	pinctrl-names = "gbe-led";
+	pinctrl-0 = <&gbe0_led0_pins>;
+};
+
+&gsw_port0 {
+	label = "wan";
+};
+
+&gsw_phy0_led0 {
+	status = "okay";
+	color = <LED_COLOR_ID_GREEN>;
+};
+
+&gsw_phy1 {
+	pinctrl-names = "gbe-led";
+	pinctrl-0 = <&gbe1_led0_pins>;
+};
+
+&gsw_phy1_led0 {
+	status = "okay";
+	color = <LED_COLOR_ID_GREEN>;
+};
+
+&gsw_phy2 {
+	pinctrl-names = "gbe-led";
+	pinctrl-0 = <&gbe2_led0_pins>;
+};
+
+&gsw_phy2_led0 {
+	status = "okay";
+	color = <LED_COLOR_ID_GREEN>;
+};
+
+&gsw_phy3 {
+	pinctrl-names = "gbe-led";
+	pinctrl-0 = <&gbe3_led0_pins>;
+};
+
+&gsw_phy3_led0 {
+	status = "okay";
+	color = <LED_COLOR_ID_GREEN>;
+};
+
+&cpu0 {
+	proc-supply = <&rt5190_buck3>;
+};
+
+&cpu1 {
+	proc-supply = <&rt5190_buck3>;
+};
+
+&cpu2 {
+	proc-supply = <&rt5190_buck3>;
+};
+
+&cpu3 {
+	proc-supply = <&rt5190_buck3>;
+};
+
+&cci {
+	proc-supply = <&rt5190_buck3>;
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins>;
+	status = "okay";
+
+	rt5190a_64: rt5190a@64 {
+		compatible = "richtek,rt5190a";
+		reg = <0x64>;
+		vin2-supply = <&rt5190_buck1>;
+		vin3-supply = <&rt5190_buck1>;
+		vin4-supply = <&rt5190_buck1>;
+
+		regulators {
+			rt5190_buck1: buck1 {
+				regulator-name = "rt5190a-buck1";
+				regulator-min-microvolt = <5090000>;
+				regulator-max-microvolt = <5090000>;
+				regulator-allowed-modes =
+				<RT5190A_OPMODE_AUTO RT5190A_OPMODE_FPWM>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+			buck2 {
+				regulator-name = "vcore";
+				regulator-min-microvolt = <600000>;
+				regulator-max-microvolt = <1400000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+			rt5190_buck3: buck3 {
+				regulator-name = "vproc";
+				regulator-min-microvolt = <600000>;
+				regulator-max-microvolt = <1400000>;
+				regulator-boot-on;
+			};
+			buck4 {
+				regulator-name = "rt5190a-buck4";
+				regulator-min-microvolt = <850000>;
+				regulator-max-microvolt = <850000>;
+				regulator-allowed-modes =
+				<RT5190A_OPMODE_AUTO RT5190A_OPMODE_FPWM>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+			ldo {
+				regulator-name = "rt5190a-ldo";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1200000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+		};
+	};
+};
+
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_1_pins>;
+	status = "okay";
+
+	pca9545: i2c-switch@70 {
+		reg = <0x70>;
+		compatible = "nxp,pca9545";
+		reset-gpios = <&pio 5 GPIO_ACTIVE_LOW>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		i2c_rtc: i2c@0 { //eeprom,rtc,ngff
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0>;
+
+			eeprom@50 {
+				compatible = "atmel,24c02";
+				reg = <0x50>;
+				address-bits = <8>;
+				page-size = <8>;
+				size = <256>;
+			};
+
+			eeprom@57 {
+				compatible = "atmel,24c02";
+				reg = <0x57>;
+				address-bits = <8>;
+				page-size = <8>;
+				size = <256>;
+			};
+
+			pcf8563: rtc@51 {
+				compatible = "nxp,pcf8563";
+				reg = <0x51>;
+				status = "disabled";
+			};
+		};
+
+		i2c_sfp1: i2c@1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+		};
+
+		i2c_sfp2: i2c@2 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <2>;
+		};
+
+		i2c_wifi: i2c@3 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <3>;
+		};
+	};
+};
+
+/* mPCIe SIM2 */
+&pcie0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie0_pins>;
+	status = "okay";
+};
+
+/* mPCIe SIM3 */
+&pcie1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie1_pins>;
+	status = "okay";
+};
+
+/* M.2 key-B SIM1 */
+&pcie2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie2_pins>;
+	status = "okay";
+};
+
+/* M.2 key-M SSD */
+&pcie3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie3_pins>;
+	status = "okay";
+};
+
+&ssusb1 {
+	status = "okay";
+};
+
+&tphy {
+	status = "okay";
+};
+
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi0_flash_pins>;
+	status = "okay";
+
+	spi_nand: spi_nand@0 {
+		compatible = "spi-nand";
+		reg = <0>;
+		spi-max-frequency = <52000000>;
+		spi-tx-buswidth = <4>;
+		spi-rx-buswidth = <4>;
+	};
+};
+
+&spi_nand {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "bl2";
+			reg = <0x0 0x200000>;
+			read-only;
+		};
+
+		partition@200000 {
+			label = "ubi";
+			reg = <0x200000 0x7e00000>;
+			compatible = "linux,ubi";
+
+			volumes {
+				ubi-volume-ubootenv {
+					volname = "ubootenv";
+					nvmem-layout {
+						compatible = "u-boot,env-redundant-bool-layout";
+					};
+				};
+
+				ubi-volume-ubootenv2 {
+					volname = "ubootenv2";
+					nvmem-layout {
+						compatible = "u-boot,env-redundant-bool-layout";
+					};
+				};
+
+				ubi_rootfs: ubi-volume-fit {
+					volname = "fit";
+				};
+			};
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&watchdog {
+	status = "okay";
+};
+
+&xphy {
+	status = "okay";
+};
diff --git a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a.dtsi b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
index 7fed1e1384..50b04e7773 100644
--- a/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
+++ b/lede/target/linux/mediatek/files-6.1/arch/arm64/boot/dts/mediatek/mt7988a.dtsi
@@ -1158,28 +1158,28 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 
-				port@0 {
+				gsw_port0: port@0 {
 					reg = <0>;
 					label = "lan0";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy0>;
 				};
 
-				port@1 {
+				gsw_port1: port@1 {
 					reg = <1>;
 					label = "lan1";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy1>;
 				};
 
-				port@2 {
+				gsw_port2: port@2 {
 					reg = <2>;
 					label = "lan2";
 					phy-mode = "internal";
 					phy-handle = <&gsw_phy2>;
 				};
 
-				port@3 {
+				gsw_port3: port@3 {
 					reg = <3>;
 					label = "lan3";
 					phy-mode = "internal";
diff --git a/lede/target/linux/mediatek/files/block/partitions/fit.c b/lede/target/linux/mediatek/files/block/partitions/fit.c
index 463cd4e9ab..0d531f49a3 100644
--- a/lede/target/linux/mediatek/files/block/partitions/fit.c
+++ b/lede/target/linux/mediatek/files/block/partitions/fit.c
@@ -73,7 +73,11 @@
 
 int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector, u64 sectors, int *slot, int add_remain)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
 	struct block_device *bdev = state->disk->part0;
+#else
+	struct block_device *bdev = state->bdev;
+#endif
 	struct address_space *mapping = bdev->bd_inode->i_mapping;
 	struct page *page;
 	void *fit, *init_fit;
@@ -100,11 +104,8 @@ int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector,
 		return -ERANGE;
 
 	page = read_mapping_page(mapping, fit_start_sector >> (PAGE_SHIFT - SECTOR_SHIFT), NULL);
-	if (IS_ERR(page))
-		return -EFAULT;
-
-	if (PageError(page))
-		return -EFAULT;
+	if (!page)
+		return -ENOMEM;
 
 	init_fit = page_address(page);
 
@@ -223,8 +224,8 @@ int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector,
 
 		image_description = fdt_getprop(fit, node, FIT_DESC_PROP, &image_description_len);
 
-		printk(KERN_DEBUG "FIT: %16s sub-image 0x%08x..0x%08x \"%s\" %s%s%s\n",
-			image_type, image_pos, image_pos + image_len - 1, image_name,
+		printk(KERN_DEBUG "FIT: %16s sub-image 0x%08x - 0x%08x \"%s\" %s%s%s\n",
+			image_type, image_pos, image_pos + image_len, image_name,
 			image_description?"(":"", image_description?:"", image_description?") ":"");
 
 		if (strcmp(image_type, FIT_FILESYSTEM_PROP))
diff --git a/lede/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/lede/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index 52d7618052..aaaeba2bfe 100644
--- a/lede/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/lede/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -9,7 +9,8 @@ case $board in
 abt,asr3000)
 	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
 	;;
-bananapi,bpi-r4)
+bananapi,bpi-r4|\
+bananapi,bpi-r4-poe)
 	ucidef_set_led_netdev "wan" "wan" "mt7530-0:00:green:lan" "wan" "link tx rx"
 	ucidef_set_led_netdev "lan1" "lan1" "mt7530-0:01:green:lan" "lan1" "link tx rx"
 	ucidef_set_led_netdev "lan2" "lan2" "mt7530-0:02:green:lan" "lan2" "link tx rx"
diff --git a/lede/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/lede/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 5586a6a8b3..8082fa3620 100644
--- a/lede/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/lede/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -24,7 +24,8 @@ mediatek_setup_interfaces()
 	bananapi,bpi-r3)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
 		;;
-	bananapi,bpi-r4)
+	bananapi,bpi-r4|\
+	bananapi,bpi-r4-poe)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 eth1" "wan eth2"
 		;;
 	cetron,ct3003*|\
@@ -82,7 +83,6 @@ mediatek_setup_macs()
 		lan_mac="${addr}"
 		;;
 	bananapi,bpi-r3|\
-	bananapi,bpi-r3-mini|\
 	bananapi,bpi-r4)
 		wan_mac=$(macaddr_add $(cat /sys/class/net/eth0/address) 1)
 		;;
diff --git a/lede/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/lede/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
index a1e86697fd..b143d4ded5 100644
--- a/lede/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
+++ b/lede/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
@@ -29,7 +29,8 @@ case "$board" in
 		[ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress
 		[ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress
 		;;
-	bananapi,bpi-r4)
+	bananapi,bpi-r4|\
+	bananapi,bpi-r4-poe)
 		addr=$(cat /sys/class/net/eth0/address)
 		[ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress
 		[ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress
diff --git a/lede/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/lede/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
index 218d16406b..52adac9c33 100755
--- a/lede/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/lede/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,4 @@
 REQUIRE_IMAGE_METADATA=1
-RAMFS_COPY_BIN='fitblk'
 
 asus_initial_setup()
 {
@@ -12,21 +11,6 @@ asus_initial_setup()
 	ubimkvol /dev/ubi0 -N jffs2 -s 0x3e000
 }
 
-platform_get_bootdev() {
-	local rootdisk="$(cat /sys/firmware/devicetree/base/chosen/rootdisk)"
-	local handle bootdev
-	for handle in /sys/class/block/*/of_node/phandle /sys/class/block/*/device/of_node/phandle; do
-		[ ! -e "$handle" ] && continue
-		if [ "$rootdisk" = "$(cat $handle)" ]; then
-			bootdev="${handle%/of_node/phandle}"
-			bootdev="${bootdev%/device}"
-			bootdev="${bootdev#/sys/class/block/}"
-			echo "$bootdev"
-			break
-		fi
-	done
-}
-
 platform_do_upgrade() {
 	local board=$(board_name)
 
@@ -36,7 +20,9 @@ platform_do_upgrade() {
 		CI_KERNPART="linux"
 		nand_do_upgrade "$1"
 		;;
-	bananapi,bpi-r3)
+	bananapi,bpi-r3|\
+	bananapi,bpi-r4|\
+	bananapi,bpi-r4-poe)
 		local rootdev="$(cmdline_get_var root)"
 		rootdev="${rootdev##*/}"
 		rootdev="${rootdev%p[0-9]*}"
@@ -56,21 +42,6 @@ platform_do_upgrade() {
 			;;
 		esac
 		;;
-	bananapi,bpi-r4)
-		[ -e /dev/fit0 ] && fitblk /dev/fit0
-		[ -e /dev/fitrw ] && fitblk /dev/fitrw
-		bootdev="$(platform_get_bootdev)"
-		case "$bootdev" in
-		mmcblk*)
-			EMMC_KERN_DEV="/dev/$bootdev"
-			emmc_do_upgrade "$1"
-			;;
-		ubiblock*)
-			CI_KERNPART="fit"
-			nand_do_upgrade "$1"
-			;;
-		esac
-		;;
 	cmcc,rax3000m-emmc|\
 	glinet,gl-mt2500|\
 	glinet,gl-mt6000|\
@@ -95,7 +66,8 @@ platform_check_image() {
 
 	case "$board" in
 	bananapi,bpi-r3|\
-	bananapi,bpi-r4)
+	bananapi,bpi-r4|\
+	bananapi,bpi-r4-poe)
 		[ "$magic" != "d00dfeed" ] && {
 			echo "Invalid image type."
 			return 1
@@ -113,20 +85,15 @@ platform_check_image() {
 
 platform_copy_config() {
 	case "$(board_name)" in
-	bananapi,bpi-r3)
+	bananapi,bpi-r3|\
+	bananapi,bpi-r4|\
+	bananapi,bpi-r4-poe)
 		case "$(cmdline_get_var root)" in
 		/dev/mmc*)
 			emmc_copy_config
 			;;
 		esac
 		;;
-	bananapi,bpi-r4)
-		case "$(platform_get_bootdev)" in
-		mmcblk*)
-			emmc_copy_config
-			;;
-		esac
-		;;
 	cmcc,rax3000m-emmc|\
 	glinet,gl-mt2500|\
 	glinet,gl-mt6000|\
@@ -134,8 +101,8 @@ platform_copy_config() {
 		emmc_copy_config
 		;;
 	esac
- }
- 
+}
+
 platform_pre_upgrade() {
 	local board=$(board_name)
 
diff --git a/lede/target/linux/mediatek/filogic/config-6.1 b/lede/target/linux/mediatek/filogic/config-6.1
index 36cb9c1e4e..c66bba9c9d 100644
--- a/lede/target/linux/mediatek/filogic/config-6.1
+++ b/lede/target/linux/mediatek/filogic/config-6.1
@@ -1,6 +1,6 @@
 CONFIG_64BIT=y
 # CONFIG_AHCI_MTK is not set
-CONFIG_AQUANTIA_PHY=y
+CONFIG_AIROHA_EN8801SC_PHY=y
 CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -44,6 +44,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_NVMEM=y
 CONFIG_BLK_PM=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -95,6 +96,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPU_RMAP=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CRC16=y
+CONFIG_CRC_CCITT=y
 CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
@@ -250,6 +252,7 @@ CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_NVMEM=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 # CONFIG_MTK_CMDQ is not set
 # CONFIG_MTK_CQDMA is not set
@@ -283,6 +286,7 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NR_CPUS=4
 CONFIG_NVMEM=y
+CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_MTK_EFUSE=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_OF=y
@@ -453,6 +457,7 @@ CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
 # CONFIG_UCLAMP_TASK is not set
+CONFIG_UIMAGE_FIT_BLK=y
 # CONFIG_UNMAP_KERNEL_AT_EL0 is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_VMAP_STACK=y
diff --git a/lede/target/linux/mediatek/filogic/config-6.6 b/lede/target/linux/mediatek/filogic/config-6.6
index f6c8ec6d9a..6d9d42853b 100644
--- a/lede/target/linux/mediatek/filogic/config-6.6
+++ b/lede/target/linux/mediatek/filogic/config-6.6
@@ -48,7 +48,6 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_NVMEM=y
 CONFIG_BLK_PM=y
 CONFIG_BLOCK_NOTIFIERS=y
 CONFIG_BSD_PROCESS_ACCT=y
diff --git a/lede/target/linux/mediatek/filogic/target.mk b/lede/target/linux/mediatek/filogic/target.mk
index 1c4843a98c..4e5cde3d6b 100644
--- a/lede/target/linux/mediatek/filogic/target.mk
+++ b/lede/target/linux/mediatek/filogic/target.mk
@@ -2,7 +2,7 @@ ARCH:=aarch64
 SUBTARGET:=filogic
 BOARDNAME:=Filogic 8x0 (MT798x)
 CPU_TYPE:=cortex-a53
-DEFAULT_PACKAGES += fitblk kmod-crypto-hw-safexcel kmod-mt7915e wpad-openssl uboot-envtools
+DEFAULT_PACKAGES += kmod-crypto-hw-safexcel kmod-mt7915e wpad-openssl uboot-envtools
 KERNELNAME:=Image dtbs
 
 define Target/Description
diff --git a/lede/target/linux/mediatek/image/filogic.mk b/lede/target/linux/mediatek/image/filogic.mk
index d5eb8b8114..15dc26c4fa 100644
--- a/lede/target/linux/mediatek/image/filogic.mk
+++ b/lede/target/linux/mediatek/image/filogic.mk
@@ -196,6 +196,15 @@ define Device/bananapi_bpi-r4
 endef
 TARGET_DEVICES += bananapi_bpi-r4
 
+define Device/bananapi_bpi-r4-poe
+  DEVICE_MODEL := BPi-R4 2.5GE
+  DEVICE_DTS := mt7988a-bananapi-bpi-r4-poe
+  DEVICE_DTS_CONFIG := config-mt7988a-bananapi-bpi-r4-poe
+  $(call Device/bananapi_bpi-r4-common)
+  DEVICE_PACKAGES += mt7988-2p5g-phy-firmware
+endef
+TARGET_DEVICES += bananapi_bpi-r4-poe
+
 define Device/cetron_ct3003
   DEVICE_VENDOR := Cetron
   DEVICE_MODEL := CT3003
diff --git a/lede/target/linux/mediatek/mt7629/config-5.15 b/lede/target/linux/mediatek/mt7629/config-5.15
index fcf7ae32f6..81dd1070ca 100644
--- a/lede/target/linux/mediatek/mt7629/config-5.15
+++ b/lede/target/linux/mediatek/mt7629/config-5.15
@@ -98,6 +98,7 @@ CONFIG_DTC=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
+# CONFIG_FIT_PARTITION is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FWNODE_MDIO=y
diff --git a/lede/target/linux/mediatek/mt7629/config-6.1 b/lede/target/linux/mediatek/mt7629/config-6.1
index c0c501e59e..16edd787a8 100644
--- a/lede/target/linux/mediatek/mt7629/config-6.1
+++ b/lede/target/linux/mediatek/mt7629/config-6.1
@@ -107,6 +107,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+# CONFIG_FIT_PARTITION is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_WARN=1024
diff --git a/lede/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/lede/target/linux/mediatek/patches-5.15/041-block-fit-partition-parser.patch
similarity index 100%
rename from lede/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
rename to lede/target/linux/mediatek/patches-5.15/041-block-fit-partition-parser.patch
diff --git a/lede/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch b/lede/target/linux/mediatek/patches-6.1/041-block-fit-partition-parser.patch
similarity index 100%
rename from lede/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch
rename to lede/target/linux/mediatek/patches-6.1/041-block-fit-partition-parser.patch
diff --git a/mieru/pkg/congestion/bbr_sender.go b/mieru/pkg/congestion/bbr_sender.go
new file mode 100644
index 0000000000..cfc7638771
--- /dev/null
+++ b/mieru/pkg/congestion/bbr_sender.go
@@ -0,0 +1,210 @@
+// Copyright (C) 2024  mieru authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package congestion
+
+import "time"
+
+type bbrMode int
+
+const (
+	// Startup phase of the connection.
+	modeStartUp bbrMode = iota
+
+	// After achieving the highest possible bandwidth during the startup, lower
+	// the pacing rate in order to drain the queue.
+	modeDrain
+
+	// Cruising mode.
+	modeProbeBW
+
+	// Temporarily slow down sending in order to empty the buffer and measure
+	// the real minimum RTT.
+	modeProbeRTT
+)
+
+// Indicates how the congestion control limits the amount of bytes in flight.
+type bbrRecoveryState int
+
+const (
+	// Do not limit.
+	stateNotInRecovery bbrRecoveryState = iota
+
+	// Allow 1 extra outstanding byte for each byte acknowledged.
+	stateConservation
+
+	// Allow 1.5 extra outstanding bytes for each byte acknowledged.
+	stateMediumGrowth
+
+	// Allow 2 extra outstanding bytes for each byte acknowledged (slow start).
+	stateGrowth
+)
+
+type BBRSender struct {
+	rttStats *RTTStats
+
+	// unackedPackets *QuicUnackedPacketMap
+
+	// Current BBR running mode.
+	mode bbrMode
+
+	// Bandwidth sampler provides BBR with the bandwidth measurements at
+	// individual points.
+	sampler BandwidthSamplerInterface
+
+	// The number of the round trips that have occurred during the connection.
+	roundTripCount uint64
+
+	// The packet number of the most recently sent packet.
+	lastSentPacket int64
+
+	// Acknowledgement of any packet after currentRoundTripEnd will cause
+	// the round trip counter to advance.
+	currentRoundTripEnd int64
+
+	// Tracks the maximum bandwidth over the multiple recent round-trips.
+	maxBandwidth WindowedFilter[uint64]
+
+	// Tracks the maximum number of bytes acked faster than the sending rate.
+	maxAckHeight WindowedFilter[uint64]
+
+	// The time this aggregation started and the number of bytes acked during it.
+	aggregationEpochStartTime time.Time
+	aggregationEpochBytes     int64
+
+	// The number of bytes acknowledged since the last time bytes in flight
+	// dropped below the target window.
+	bytesAckedSinceQueueDrained int64
+
+	// The muliplier for calculating the max amount of extra CWND to add to
+	// compensate for ack aggregation.
+	maxAggregationBytesMultiplier float64
+
+	// Minimum RTT estimate. Automatically expires within 10 seconds
+	// (and triggers PROBE_RTT mode) if no new value is sampled
+	// during that period.
+	minRTT time.Duration
+
+	// The time at which the current value of minRTT was assigned.
+	minRTTTimestamp time.Time
+
+	// The maximum allowed number of bytes in flight.
+	congestionWindow int64
+
+	// The initial value of the congestionWindow.
+	initialCongestionWindow int64
+
+	// The largest value the congestionWindow can achieve.
+	maxCongestionWindow int64
+
+	// The smallest value the congestionWindow can achieve.
+	minCongestionWindow int64
+
+	// The current pacing rate of the connection.
+	pacingRate int64
+
+	// The gain currently applied to the pacing rate.
+	pacingGain float64
+
+	// The gain currently applied to the congestion window.
+	congestionWindowGain float64
+
+	// The gain used for the congestion window during PROBE_BW.
+	congestionWindowGainConstant float64
+
+	// The coefficient by which mean RTT variance is added to the congestion window.
+	rttVarianceWeight float64
+
+	// The number of RTTs to stay in STARTUP mode. Defaults to 3.
+	numStartupRTTs uint64
+
+	// If true, exit startup if 1 RTT has passed with no bandwidth increase and
+	// the connection is in recovery.
+	exitStartupOnLoss bool
+
+	// Number of round-trips in PROBE_BW mode, used for determining the current
+	// pacing gain cycle.
+	cycleCurrentOffset int
+
+	// The time at which the last pacing gain cycle was started.
+	lastCycleStart time.Time
+
+	// Indicates whether the connection has reached the full bandwidth mode.
+	isAtFullBandwidth bool
+
+	// Number of rounds during which there was no significant bandwidth increase.
+	roundsWithoutBandwidthGain uint64
+
+	// The bandwidth compared to which the increase is measured.
+	bandwidthAtLastRound int64
+
+	// Set to true upon exiting quiescence.
+	exitingQuiescence bool
+
+	// Time at which PROBE_RTT has to be exited. Setting it to zero indicates
+	// that the time is yet unknown as the number of packets in flight has not
+	// reached the required value.
+	exitProbeRTTAt time.Time
+
+	// Indicates whether a round-trip has passed since PROBE_RTT became active.
+	probeRTTRoundPassed bool
+
+	// Indicates whether the most recent bandwidth sample was marked as
+	// app-limited.
+	lastSampleIsAppLimited bool
+
+	// Current state of recovery.
+	recoveryState bbrRecoveryState
+
+	// Receiving acknowledgement of a packet after endRecoveryAt will cause
+	// BBR to exit the recovery mode. A value above zero indicates at least one
+	// loss has been detected, so it must not be set back to zero.
+	endRecoveryAt int64
+
+	// A window used to limit the number of bytes in flight during loss recovery.
+	recoveryWindow int64
+
+	// When true, recovery is rate based rather than congestion window based.
+	rateBasedRecovery bool
+
+	// When true, pace at 1.5x and disable packet conservation in STARTUP.
+	slowerStartup bool
+
+	// When true, disables packet conservation in STARTUP.
+	rateBasedStartup bool
+
+	// Used as the initial packet conservation mode when first entering recovery.
+	initialConservationInStartup bbrRecoveryState
+
+	// If true, will not exit low gain mode until bytesInFlight drops below BDP
+	// or it's time for high gain mode.
+	fullyDrainQueue bool
+
+	// If true, use a CWND of 0.75*BDP during probe_rtt instead of 4 packets.
+	probeRTTBasedOnBDP bool
+
+	// If true, skip PROBE_RTT and update the timestamp of the existing minRTT to
+	// now if minRTT over the last cycle is within 12.5% of the current minRTT.
+	// Even if the minRTT is 12.5% too low, the 25% gain cycling and 2x CWND gain
+	// should overcome an overly small minRTT.
+	probeRTTSkippedIfSimilarRTT bool
+
+	// If true, disable PROBE_RTT entirely as long as the connection was recently
+	// app limited.
+	probeRTTDisabledIfAppLimited bool
+
+	appLimitedSinceLastProbeRTT bool
+	minRTTSinceLastProbeRTT     time.Duration
+}
diff --git a/openwrt-packages/luci-app-store/Makefile b/openwrt-packages/luci-app-store/Makefile
index 90dad63202..1ea7580aea 100644
--- a/openwrt-packages/luci-app-store/Makefile
+++ b/openwrt-packages/luci-app-store/Makefile
@@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua
 LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.20-0
+PKG_VERSION:=0.1.21-0
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 
diff --git a/openwrt-packages/luci-app-store/luasrc/controller/store.lua b/openwrt-packages/luci-app-store/luasrc/controller/store.lua
index 6f65f438a5..ea6ac96ee5 100644
--- a/openwrt-packages/luci-app-store/luasrc/controller/store.lua
+++ b/openwrt-packages/luci-app-store/luasrc/controller/store.lua
@@ -77,6 +77,7 @@ local function user_config()
     local data = {
         hide_docker = uci:get("istore", "istore", "hide_docker") == "1",
         ignore_arch = uci:get("istore", "istore", "ignore_arch") == "1",
+        last_path = uci:get("istore", "istore", "last_path"),
         super_arch = uci:get("istore", "istore", "super_arch"),
         channel = uci:get("istore", "istore", "channel")
     }
@@ -300,6 +301,9 @@ function store_action(param)
                     local autoenable = luci.http.formvalue("enable")
                     if autopath ~= nil then
                         autoenv = autoenv .. " path=" .. luci.util.shellquote(autopath)
+                        local uci  = require "luci.model.uci".cursor()
+                        uci:set("istore", "istore", "last_path", autopath)
+                        uci:commit("istore")
                     end
                     autoenv = autoenv .. " enable=" .. autoenable
                     code, out, err = _action(myopkg, luci.util.shellquote(autoenv), action, metapkg)
diff --git a/openwrt-packages/luci-app-store/root/etc/config/istore b/openwrt-packages/luci-app-store/root/etc/config/istore
index da48f7f5d6..deccf26489 100644
--- a/openwrt-packages/luci-app-store/root/etc/config/istore
+++ b/openwrt-packages/luci-app-store/root/etc/config/istore
@@ -1,6 +1,7 @@
 config istore 'istore'
 #    option hide_docker '0'
 #    option ignore_arch '0'
+#    option last_path '/mnt/nvme'
 #    option channel 'istore'
 #    option super_arch 'x86_64'
 #    option super_arch 'aarch64'
diff --git a/small/hysteria/Makefile b/small/hysteria/Makefile
index 8c8d304038..2b284c8b06 100644
--- a/small/hysteria/Makefile
+++ b/small/hysteria/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hysteria
-PKG_VERSION:=2.4.5
+PKG_VERSION:=2.5.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)?
-PKG_HASH:=e0d5ffb3ddd5e98092f29e908edb64468b1d8b40af78281cc0054b26f542a48b
+PKG_HASH:=78afca9c9c3f2c1a89c2356c66e70489bba74d3b4ede42f4194d179a09959d8c
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-app-v$(PKG_VERSION)
 
 PKG_LICENSE:=MIT
diff --git a/small/v2ray-geodata/Makefile b/small/v2ray-geodata/Makefile
index 474ef5282a..5b35ae1acb 100644
--- a/small/v2ray-geodata/Makefile
+++ b/small/v2ray-geodata/Makefile
@@ -30,13 +30,13 @@ define Download/geosite
   HASH:=2542bbc017ae060da37260da02f7567fb2b016f0e825aee5c23b1e8567c0649e
 endef
 
-GEOSITE_IRAN_VER:=202406240029
+GEOSITE_IRAN_VER:=202407010032
 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER)
 define Download/geosite-ir
   URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/
   URL_FILE:=iran.dat
   FILE:=$(GEOSITE_IRAN_FILE)
-  HASH:=86503687cbca94889b9c94504d4310983060cdb2d813929b6da6f077776d5096
+  HASH:=1306992448a10f1e1c0c0a566c0bb6057e999a0029bb1004b17763299013b893
 endef
 
 define Package/v2ray-geodata/template
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
index a5458edc5d..fd54c1adb3 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
@@ -387,9 +387,9 @@ object AngConfigManager {
 //    }
 
     fun importBatchConfig(server: String?, subid: String, append: Boolean): Int {
-        var count = parseBatchConfig(server, subid, append)
+        var count = parseBatchConfig(Utils.decode(server), subid, append)
         if (count <= 0) {
-            count = parseBatchConfig(Utils.decode(server), subid, append)
+            count = parseBatchConfig(server, subid, append)
         }
         if (count <= 0) {
             count = parseCustomConfigServer(server, subid)
@@ -577,9 +577,9 @@ object AngConfigManager {
     }
 
     private fun parseConfigViaSub(server: String?, subid: String, append: Boolean): Int {
-        var count = parseBatchConfig(server, subid, append)
+        var count = parseBatchConfig(Utils.decode(server), subid, append)
         if (count <= 0) {
-            count = parseBatchConfig(Utils.decode(server), subid, append)
+            count = parseBatchConfig(server, subid, append)
         }
         if (count <= 0) {
             count = parseCustomConfigServer(server, subid)
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
index 3e589f3e36..b2b0135c23 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -356,7 +356,7 @@ object Utils {
     }
 
     @Throws(IOException::class)
-    fun getUrlContentWithCustomUserAgent(urlStr: String?, httpPort: Int = 0): String {
+    fun getUrlContentWithCustomUserAgent(urlStr: String?, timeout: Int = 30000, httpPort: Int = 0): String {
         val url = URL(urlStr)
         val conn = if (httpPort == 0) {
             url.openConnection()
@@ -368,6 +368,8 @@ object Utils {
                 )
             )
         }
+        conn.connectTimeout = timeout
+        conn.readTimeout = timeout
         conn.setRequestProperty("Connection", "close")
         conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
         url.userInfo?.let {
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
index 27900f9786..9c0b2bbaa1 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
@@ -25,7 +25,7 @@ object WireguardFmt {
                         ?: AppConfig.WIREGUARD_LOCAL_ADDRESS_V4).removeWhiteSpace()
                         .split(",")
                 wireguard.peers?.get(0)?.publicKey = queryParam["publickey"] ?: ""
-                wireguard.peers?.get(0)?.endpoint = "${uri.idnHost}:${uri.port}"
+                wireguard.peers?.get(0)?.endpoint = Utils.getIpv6Address(uri.idnHost) + ":${uri.port}"
                 wireguard.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
                 wireguard.reserved =
                     (queryParam["reserved"] ?: "0,0,0").removeWhiteSpace().split(",")
diff --git a/v2rayu/Podfile b/v2rayu/Podfile
index c5dec19cb7..e4ffe1ba23 100644
--- a/v2rayu/Podfile
+++ b/v2rayu/Podfile
@@ -1,7 +1,7 @@
 # Uncomment the next line to define a global platform for your project
 # platform :ios, '9.0'
 source 'https://github.com/CocoaPods/Specs.git'
-platform :osx, '10.14'
+platform :osx, '11.0'
 
 target 'V2rayU' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
@@ -14,7 +14,6 @@ target 'V2rayU' do
   pod 'SwiftyJSON'
   # master branch
   pod 'Preferences', :git => 'https://github.com/sindresorhus/Preferences.git'
-  pod 'Sparkle' ,'~> 2.0'
   pod 'QRCoder'
   pod 'MASShortcut'
   pod 'Swifter'
diff --git a/v2rayu/V2rayU.xcodeproj/project.pbxproj b/v2rayu/V2rayU.xcodeproj/project.pbxproj
index e8cbf8a33f..5dc3a9e413 100755
--- a/v2rayu/V2rayU.xcodeproj/project.pbxproj
+++ b/v2rayu/V2rayU.xcodeproj/project.pbxproj
@@ -18,9 +18,9 @@
 		6618372E23E9BF74000F7410 /* ToastWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6618372C23E9BF73000F7410 /* ToastWindow.xib */; };
 		66193A8623EE45B200289B6A /* PreferenceRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66193A8523EE45B200289B6A /* PreferenceRouting.swift */; };
 		66193A8923EE46BC00289B6A /* PreferenceRouting.xib in Resources */ = {isa = PBXBuildFile; fileRef = 66193A8723EE46BC00289B6A /* PreferenceRouting.xib */; };
-		6633A43F2C0A120000C54CA5 /* Sparkle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6633A43E2C0A120000C54CA5 /* Sparkle.swift */; };
 		663F040625ED4B2C00687600 /* V2rayLaunch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663F040525ED4B2C00687600 /* V2rayLaunch.swift */; };
 		664BAC472C2DB0E100654FB7 /* V2rayRouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664BAC462C2DB0E100654FB7 /* V2rayRouting.swift */; };
+		664BAC492C314CD600654FB7 /* AppVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664BAC482C314CD600654FB7 /* AppVersion.swift */; };
 		664EB375216C9A5E00B6AE0D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664EB374216C9A5E00B6AE0D /* AppDelegate.swift */; };
 		664EB377216C9A5F00B6AE0D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 664EB376216C9A5F00B6AE0D /* Assets.xcassets */; };
 		664EB392216CA9E800B6AE0D /* ConfigWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 664EB390216CA9E800B6AE0D /* ConfigWindow.swift */; };
@@ -121,11 +121,11 @@
 		6625848D2AB745E700DFDC1E /* sign.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = sign.sh; sourceTree = "<group>"; };
 		6625848E2AB746D500DFDC1E /* appdmg.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = appdmg.sh; sourceTree = "<group>"; };
 		662F0ACE2AB720C700884C17 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ../en.lproj/PreferenceGeneral.strings; sourceTree = "<group>"; };
-		6633A43E2C0A120000C54CA5 /* Sparkle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sparkle.swift; sourceTree = "<group>"; };
 		663F040525ED4B2C00687600 /* V2rayLaunch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = V2rayLaunch.swift; sourceTree = "<group>"; };
 		664666A021CBD6C60094F0B7 /* libPods-V2rayUTool.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libPods-V2rayUTool.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		664B95DD217062A500DBC941 /* Alamofire */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Alamofire; path = Pods/Alamofire; sourceTree = "<group>"; };
 		664BAC462C2DB0E100654FB7 /* V2rayRouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = V2rayRouting.swift; sourceTree = "<group>"; };
+		664BAC482C314CD600654FB7 /* AppVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersion.swift; sourceTree = "<group>"; };
 		664EB371216C9A5E00B6AE0D /* V2rayU.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = V2rayU.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		664EB374216C9A5E00B6AE0D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		664EB376216C9A5F00B6AE0D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -267,6 +267,7 @@
 				6608D9B82182BBAC00A0E0DD /* v2ray */,
 				664EB376216C9A5F00B6AE0D /* Assets.xcassets */,
 				664EB374216C9A5E00B6AE0D /* AppDelegate.swift */,
+				664BAC482C314CD600654FB7 /* AppVersion.swift */,
 				66ACB19F21757D5B005B5881 /* MainMenu.swift */,
 				664EB378216C9A5F00B6AE0D /* MainMenu.xib */,
 				664EB390216CA9E800B6AE0D /* ConfigWindow.swift */,
@@ -287,7 +288,6 @@
 				6D6DF7F662C35646734A352E /* install.sh */,
 				6D6DF11F0983AFCBEF1E347B /* Uri.swift */,
 				6D6DF79424C83391C205CB9C /* Share.swift */,
-				6633A43E2C0A120000C54CA5 /* Sparkle.swift */,
 			);
 			path = V2rayU;
 			sourceTree = "<group>";
@@ -556,6 +556,7 @@
 				6608D9DA2182C69D00A0E0DD /* v2rayStruct.swift in Sources */,
 				66F07CF9236D79540088A4AE /* Ping.swift in Sources */,
 				664EB392216CA9E800B6AE0D /* ConfigWindow.swift in Sources */,
+				664BAC492C314CD600654FB7 /* AppVersion.swift in Sources */,
 				66193A8623EE45B200289B6A /* PreferenceRouting.swift in Sources */,
 				6D6DF8BFC33F97E9AFCA5A4B /* V2rayConfig.swift in Sources */,
 				6D6DF6F065067CD879201FF9 /* Import.swift in Sources */,
@@ -568,7 +569,6 @@
 				6D6DF807BE591BE396221EF3 /* PreferenceAdvance.swift in Sources */,
 				6D6DFC1D9432F2A60D2156E2 /* PreferenceDns.swift in Sources */,
 				6D6DF670FFB063EE2360776C /* Uri.swift in Sources */,
-				6633A43F2C0A120000C54CA5 /* Sparkle.swift in Sources */,
 				6D6DF41FA8F7C7B020AC4115 /* Share.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -768,7 +768,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -827,7 +827,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -849,7 +849,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4.2.0;
+				CURRENT_PROJECT_VERSION = 4.0.0;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_ONLY_ACTIVE_RESOURCES = YES;
@@ -859,8 +859,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.2.0;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MARKETING_VERSION = 4.0.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -883,7 +883,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4.2.0;
+				CURRENT_PROJECT_VERSION = 4.0.0;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_ONLY_ACTIVE_RESOURCES = YES;
@@ -893,8 +893,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.2.0;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
+				MARKETING_VERSION = 4.0.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -915,7 +915,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
@@ -930,7 +930,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 			};
diff --git a/v2rayu/V2rayU/AppDelegate.swift b/v2rayu/V2rayU/AppDelegate.swift
index 48a0c377e6..8b34a33770 100644
--- a/v2rayu/V2rayU/AppDelegate.swift
+++ b/v2rayu/V2rayU/AppDelegate.swift
@@ -10,12 +10,10 @@ import Cocoa
 import ServiceManagement
 import MASShortcut
 import Preferences
-import Sparkle
 import FirebaseCore
 
 let launcherAppIdentifier = "net.yanue.V2rayU.Launcher"
 let appVersion = getAppVersion()
-let V2rayUpdater = V2rayUpdaterController()
 
 let NOTIFY_TOGGLE_RUNNING_SHORTCUT = Notification.Name(rawValue: "NOTIFY_TOGGLE_RUNNING_SHORTCUT")
 let NOTIFY_SWITCH_PROXY_MODE_SHORTCUT = Notification.Name(rawValue: "NOTIFY_SWITCH_PROXY_MODE_SHORTCUT")
@@ -42,6 +40,9 @@ let preferencesWindowController = PreferencesWindowController(
         ]
 )
 
+let langStr = Locale.current.languageCode
+let isMainland = langStr == "zh-CN" || langStr == "zh" || langStr == "zh-Hans" || langStr == "zh-Hant"
+
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
     // bar menu
diff --git a/v2rayu/V2rayU/AppVersion.swift b/v2rayu/V2rayU/AppVersion.swift
new file mode 100644
index 0000000000..ea0b929490
--- /dev/null
+++ b/v2rayu/V2rayU/AppVersion.swift
@@ -0,0 +1,614 @@
+//
+//  AppVersion.swift
+//  V2rayU
+//
+//  Created by yanue on 2024/6/30.
+//  Copyright © 2024 yanue. All rights reserved.
+//
+import SwiftUI
+import ServiceManagement
+
+// 手动实现检查版本下载更新 UI.
+// 基于 SwiftUI + NSWindowController 实现
+// 参考 UI: Sparkle(https://github.com/sparkle-project/Sparkle) 
+// 基于 https://github.com/yanue/V2rayU/releases 进行版本检查
+
+struct GithubRelease: Codable {
+    let id: Int
+    let tagName: String
+    let name: String
+    let draft: Bool
+    let prerelease: Bool
+    let publishedAt: Date // 2024-06-30T09:00:00Z, 用于排序
+    let assets: [GithubAsset]
+    let body: String
+
+    enum CodingKeys: String, CodingKey {
+        case id
+        case tagName = "tag_name"
+        case name
+        case draft
+        case prerelease
+        case publishedAt = "published_at"
+        case assets
+        case body
+    }
+}
+
+struct GithubAsset: Codable {
+    let name: String
+    let browserDownloadUrl: String
+
+    enum CodingKeys: String, CodingKey {
+        case name
+        case browserDownloadUrl = "browser_download_url"
+    }
+}
+
+let V2rayUpdater = AppCheckController()
+
+// AppCheckController - 检查新版本页面
+
+class AppCheckController: NSWindowController {
+    // Declare the contentView as a property to avoid using self before super.init
+    private var contentView: NSHostingView<ContentView>!
+    var bindData = BindData()
+
+    // Initialize the view and window
+    init() {
+        // Initialize the content view with a placeholder closure
+        let contentView = NSHostingView(rootView: ContentView(
+            bindData: bindData,
+            closeWindow: {}
+        ))
+        
+        // Create the window with specified dimensions and styles
+        let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 400, height: 300),
+                              styleMask: [.titled, .closable, .resizable],
+                              backing: .buffered, defer: false)
+        window.title = "Check V2rayU"
+        window.contentView = contentView
+        
+        // Call the super init with the created window
+        super.init(window: window)
+        
+        // Update the contentView with the actual closure after super.init
+        contentView.rootView = ContentView(
+            bindData: bindData,
+            closeWindow: closeWindow
+        )
+    }
+    
+    required init?(coder: NSCoder) {
+       fatalError("init(coder:) has not been implemented")
+    }
+
+    override func windowDidLoad() {
+       super.windowDidLoad()
+    }
+   
+    func checkForUpdates(showWindow: Bool = false) {
+        if showWindow {
+            DispatchQueue.main.async {
+                self.window?.orderFrontRegardless()
+                self.window?.center()
+                self.window?.makeKeyAndOrderFront(nil)
+                NSApp.activate(ignoringOtherApps: true)
+            }
+        } else {
+            // close window
+            DispatchQueue.main.async {
+                self.window?.close()
+            }
+        }
+        guard let url = URL(string: "https://api.github.com/repos/yanue/V2rayU/releases") else {
+            return
+        }
+        print("checkForUpdates: \(url)")
+        let checkTask = URLSession.shared.dataTask(with: url) { data, response, error in
+            if let error = error {
+                print("Error fetching release: \(error)")
+                return
+            }
+
+            guard let data = data else {
+                print("No data returned")
+                return
+            }
+            
+            print("checkForUpdates: \n \(data)")
+            
+            do {
+                let decoder = JSONDecoder()
+                decoder.dateDecodingStrategy = .iso8601 // 解析日期
+
+                // try decode data
+                let data: [GithubRelease] = try decoder.decode([GithubRelease].self, from: data)
+                
+                // 按日期倒序排序
+                let sortedData = data.sorted { $0.publishedAt > $1.publishedAt }
+
+                // 取第一个
+                if let release = sortedData.first {
+                    print("release: \(release.tagName)")
+                    DispatchQueue.main.async {
+                        let releaseVersion = release.tagName.replacingOccurrences(of: "v", with: "").replacingOccurrences(of: "V", with: "").trimmingCharacters(in: .whitespaces) // v4.1.0 => 4.1.0
+                        // get old version
+                        let appVer = appVersion.versionToInt()
+                        let releaseVer = releaseVersion.versionToInt()
+
+                        // new version is bigger than old version
+                        if appVer.lexicographicallyPrecedes(releaseVer) {
+                            // 点击菜单栏检查新版本,不过滤
+                            if !showWindow {
+                                // 如果用户选择跳过版本更新, 则不显示新版本详情页面
+                                if let skipVersion = UserDefaults.standard.string(forKey: "skipAppVersion") {
+                                    if skipVersion == release.tagName {
+                                        print("Skip version: \(skipVersion)")
+                                        return
+                                    }
+                                }
+                            }
+                            // 显示新版本详情页面
+                            let versionController = AppVersionController()
+                            versionController.show(release: release)
+                            // close window
+                            self.closeWindow()
+                        } else {
+                            var title = "You are up to date!"
+                            var toast = "V2rayU \(appVersion) is currently the newest version available."
+                            if isMainland {
+                                title = "当前已经是最新版了"
+                                toast = "V2rayU \(appVersion) 已经是当前最新版了.";
+                            }
+                            // open dialog
+                            alertDialog(title: title, message: toast)
+                            // close window
+                            self.closeWindow()
+                        }
+                    }
+                }
+            } catch {
+                print("Error decoding JSON: \(error)")
+                DispatchQueue.main.async {
+                    // update progress text
+                    self.bindData.progressText = "Check failed: \(error)"
+                    var title = "Check failed!"
+                    var toast = "\(error)"
+                    if isMainland {
+                        title = "检查失败"
+                        toast = "\(error)";
+                    }
+                    // open dialog
+                    alertDialog(title: title, message: toast)
+                    // sleep 2s
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                        // close window
+                        self.closeWindow()
+                    }
+                }
+            }
+        }
+        checkTask.resume()
+    }
+    
+    func closeWindow() {
+        DispatchQueue.main.async {
+            self.window?.close()
+        }
+    }
+    
+    
+    class BindData: ObservableObject {
+        @Published var progressText = "check for updates..."
+    }
+
+    struct ContentView: View {
+        @ObservedObject var bindData: BindData
+
+        var closeWindow: () -> Void
+
+        var body: some View {
+            VStack(spacing: 20) {
+                HStack {
+                    Image("V2rayU")
+                        .resizable()
+                        .frame(width: 64, height: 64)
+                        .cornerRadius(8)
+
+                    Spacer()
+
+                    VStack {
+                        HStack {
+                            ProgressView(bindData.progressText) .progressViewStyle(LinearProgressViewStyle()).padding(.horizontal)
+                        }
+
+                        HStack {
+                            Spacer()
+                            Button(action: {
+                                closeWindow()
+                            }) {
+                                Text("Cancel").font(.body)
+                            }
+                            .padding(.trailing, 20)
+                        }
+                    }
+                }
+                .padding()
+            }
+        }
+
+    }
+}
+
+
+// AppVersionController - 新版本详情页面
+
+class AppVersionController: NSWindowController {
+    var bindData = BindData()
+    private var contentView: NSHostingView<ContentView>!
+    private var release: GithubRelease!
+
+    init() {
+       let contentView = NSHostingView(rootView: ContentView(
+           bindData: bindData,
+           skipAction: { print("Skip action") },
+           installAction: { print("Install action") }
+       ))
+       let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 500, height: 300),
+                             styleMask: [.titled, .closable, .resizable],
+                             backing: .buffered, defer: false)
+       window.title = "Software Update"
+       window.contentView = contentView
+        
+       super.init(window: window)
+        
+        // Update the contentView with the actual closure after super.init
+        contentView.rootView = ContentView(
+            bindData: bindData,
+            skipAction: self.skipAction,
+            installAction: self.installAction
+        )
+    }
+
+    func show(release: GithubRelease) {
+        bindData.title = "A new version of V2rayU is available!"
+        bindData.description = "V2rayU \(appVersion) is now available—you have \(release.tagName). Would you like to download it now?"
+        bindData.releaseNotes = release.name + "\n" + release.body
+        self.release = release
+        print("bindData.releaseNotes", bindData.releaseNotes)
+        // bring window to front
+        window?.orderFrontRegardless()
+        // center position
+        window?.center()
+        // make window key
+        window?.makeKeyAndOrderFront(nil)
+        // activate app
+        NSApp.activate(ignoringOtherApps: true)
+    }
+    
+    required init?(coder: NSCoder) {
+       fatalError("init(coder:) has not been implemented")
+    }
+
+    override func windowDidLoad() {
+       super.windowDidLoad()
+    }
+    
+    // 安装新版本
+    func installAction() {
+        DispatchQueue.main.async {
+            // 显示下载页面
+            let downloadController = AppDownloadController()
+            downloadController.show(release: self.release)
+            // 关闭窗口
+            self.window?.close()
+        }
+    }
+
+    
+    func skipAction() {
+        print("Skip action")
+        // UserDefaults 记录是否跳过版本更新
+        UserDefaults.standard.set(release.tagName, forKey: "skipAppVersion")
+        // 关闭窗口
+        DispatchQueue.main.async {
+            self.window?.close()
+        }
+    }
+    
+    class BindData: ObservableObject {
+        @Published var title = "A new version of V2rayU App is available!"
+        @Published var description = ""
+        @Published var releaseNotes = """
+        """
+    }
+
+    struct ContentView: View {
+        @ObservedObject var bindData: BindData
+        var skipAction: () -> Void
+        var installAction: () -> Void
+        
+        var body: some View {
+            VStack(alignment: .leading, spacing: 10) {
+                HStack(alignment: .top, spacing: 10) {
+                    // use AppIcon.appiconset to Image
+                    Image("V2rayU")
+                        .resizable()
+                        .frame(width: 64, height: 64)
+                        .padding(.top, 20)
+                        .padding(.leading, 20)
+
+                    VStack(alignment: .leading, spacing: 5) {
+                        Text(bindData.title)
+                            .font(.headline)
+                            .padding(.top, 20)
+                        
+                        Text(bindData.description)
+                            .padding(.trailing, 20)
+                        
+                        Text("Release Notes:")
+                            .font(.headline)
+                            .bold()
+                            .padding(.top, 20)
+
+                        HStack {
+                        
+                            // 文字可选中
+                            TextEditor(text: $bindData.releaseNotes)
+                                .lineSpacing(6) // 行间距
+                                .frame(height: 120)
+                                .border(Color.gray, width: 1) // 黑色边框，宽度为 2
+                                .fixedSize(horizontal: false, vertical: true)
+                        
+                               
+                            Spacer(minLength: 20) // 右边 margin 40
+                        }
+                    }
+                }
+
+                HStack {
+                    Button("Skip This Version") {
+                        skipAction()
+                    }
+                    
+                    Spacer()
+                    
+                    Button("Install Update") {
+                        installAction()
+                    }
+                    .keyboardShortcut(.defaultAction)
+                }
+                .padding(20)
+            }
+            .frame(width: 500, height: 300)
+        }
+    }
+}
+
+// AppDownloadController - 下载安装页面
+
+class AppDownloadController: NSWindowController, URLSessionDownloadDelegate {
+    private var contentView: NSHostingView<ContentView>!
+    var bindData = BindData()
+    private var downloadTask: URLSessionDownloadTask?
+    private var destinationURL: URL?
+
+    init() {
+        let contentView = NSHostingView(rootView: ContentView(
+            bindData: bindData,
+            cancelDownload: {},
+            doInstall: {}
+        ))
+        let window = NSWindow(contentRect: NSRect(x: 0, y: 0, width: 400, height: 300),
+                              styleMask: [.titled, .closable, .resizable],
+                              backing: .buffered, defer: false)
+        window.title = "Download V2rayU"
+        window.contentView = contentView
+        super.init(window: window)
+
+        // Update the contentView with the actual closure after super.init
+        contentView.rootView = ContentView(
+            bindData: bindData,
+            cancelDownload: cancelDownload,
+            doInstall: doInstall
+        )
+        self.contentView = contentView
+    }
+
+    
+    required init?(coder: NSCoder) {
+       fatalError("init(coder:) has not been implemented")
+    }
+
+    override func windowDidLoad() {
+       super.windowDidLoad()
+    }
+    
+    func show(release: GithubRelease) {
+        DispatchQueue.main.async {
+            self.window?.orderFrontRegardless()
+            self.window?.center()
+            self.window?.makeKeyAndOrderFront(nil)
+            NSApp.activate(ignoringOtherApps: true)
+        }
+        download(release: release)
+    }
+    
+    func download(release: GithubRelease) {
+        DispatchQueue.main.async {
+            if let asset = release.assets.first {
+                self.bindData.dmgUrl = asset.browserDownloadUrl
+                print("download: \(self.bindData.dmgUrl)")
+                self.startDownload()
+            } else {
+                self.bindData.progressText = "No dmg asset found"
+                return
+            }
+        }
+    }
+
+    private func startDownload() {
+        guard let url = URL(string: bindData.dmgUrl) else {
+            DispatchQueue.main.async {
+                self.bindData.isDownloading = true
+                self.bindData.progressText = "Invalid dmg url"
+            }
+            return
+        }
+        DispatchQueue.main.async {
+            self.bindData.isDownloading = true
+            self.bindData.progress = 0.0
+            self.bindData.progressText = "Downloading..."
+        }
+        let urlSession = URLSession(configuration: .default, delegate: self, delegateQueue: OperationQueue())
+        downloadTask = urlSession.downloadTask(with: url)
+        downloadTask?.resume()
+            
+    }
+
+    private func cancelDownload() {
+        DispatchQueue.main.async {
+            self.bindData.isDownloading = false
+            self.bindData.progress = 0.0
+            self.bindData.progressText = "Download canceled"
+            self.downloadTask?.cancel()
+            print("Download canceled")
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            self.window?.close()
+        }
+    }
+
+    func doInstall() {
+        DispatchQueue.main.async {
+            if let destinationURL = self.destinationURL {
+                // open downloaded dmg
+                NSWorkspace.shared.open(destinationURL)
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    // close window
+                    self.window?.close()
+                    NSApplication.shared.terminate(self)
+                }
+            }
+        }
+       
+        print("Installing V2rayU")
+    }
+    
+    // ---------------------- ui 相关 --------------------------------
+    // MARK: - 下载进度数据
+    class BindData: ObservableObject {
+        @Published var progressText = "Downloading..."
+        @Published var dmgUrl: String = ""
+        @Published var progress: Float = 0.0
+        @Published var isDownloading: Bool = false
+    }
+    
+    // MARK: - 下载进度视图
+
+    struct ContentView: View {
+        @ObservedObject var bindData: BindData
+        var cancelDownload: () -> Void
+        var doInstall: () -> Void
+
+        var body: some View {
+            VStack(spacing: 20) {
+                VStack(spacing: 20) {
+                    HStack {
+                        Image("V2rayU")
+                            .resizable()
+                            .frame(width: 64, height: 64)
+                            .cornerRadius(8)
+
+                        Spacer()
+
+                        VStack {
+                            HStack {
+                                ProgressView(value: bindData.progress, total: 100) {
+                                   Text(bindData.progressText)
+                                }
+                            }
+
+                            HStack {
+                                Spacer()
+                                if bindData.isDownloading {
+                                    Button(action: {
+                                        cancelDownload()
+                                    }) {
+                                        Text("Cancel").font(.body)
+                                    }
+                                } else {
+                                    Button(action: {
+                                        doInstall()
+                                    }) {
+                                        Text("Install V2rayU").font(.body)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    .padding()
+                }
+            }
+            .padding()
+        }
+    }
+
+    // ---------------------- 下载相关 --------------------------------
+    
+    // MARK: - URLSessionDownloadDelegate
+    func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL) {
+        let fileManager = FileManager.default
+        let downloadsDirectory = fileManager.urls(for: .downloadsDirectory, in: .userDomainMask).first!
+        destinationURL = downloadsDirectory.appendingPathComponent(downloadTask.response?.suggestedFilename ?? "V2rayU-macOS.dmg")
+        
+        do {
+            try fileManager.moveItem(at: location, to: destinationURL!)
+            DispatchQueue.main.async {
+                self.bindData.isDownloading = false
+                self.bindData.progress = 100.0
+                self.bindData.progressText = "Download Completed"
+            }
+            print("Download finished: \(destinationURL!)")
+        } catch {
+            DispatchQueue.main.async {
+                self.bindData.isDownloading = false
+                self.bindData.progressText = "File move error: \(error.localizedDescription)"
+                var title = "Download failed!"
+                var toast = "\(error)"
+                if isMainland {
+                    title = "移动文件失败"
+                    toast = "\(error)";
+                }
+                // open dialog
+                alertDialog(title: title, message: toast)
+            }
+            print("File move error: \(error.localizedDescription)")
+        }
+    }
+
+    func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
+        DispatchQueue.main.async {
+            self.bindData.progress = Float(totalBytesWritten) / Float(totalBytesExpectedToWrite) * 100
+        }
+    }
+
+    func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
+        if let error = error {
+            DispatchQueue.main.async {
+                self.bindData.isDownloading = false
+                self.bindData.progressText = "Download Failed: \(error.localizedDescription)"
+            }
+            var title = "Download failed!"
+            var toast = "\(error)"
+            if isMainland {
+                title = "下载文件失败"
+                toast = "\(error)";
+            }
+            // open dialog
+            alertDialog(title: title, message: toast)
+            print("Download error: \(error.localizedDescription)")
+        }
+    }
+}
diff --git a/v2rayu/V2rayU/Assets.xcassets/Contents.json b/v2rayu/V2rayU/Assets.xcassets/Contents.json
index da4a164c91..73c00596a7 100644
--- a/v2rayu/V2rayU/Assets.xcassets/Contents.json
+++ b/v2rayu/V2rayU/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/Contents.json b/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/Contents.json
index 55bdf0abe7..b816fd1c78 100644
--- a/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/Contents.json
+++ b/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/Contents.json
@@ -1,26 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "icon.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "icon@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "icon@3x 1.png",
       "idiom" : "universal",
-      "filename" : "icon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
\ No newline at end of file
+}
diff --git a/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/icon@3x 1.png b/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/icon@3x 1.png
new file mode 100644
index 0000000000..1834aa6826
Binary files /dev/null and b/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/icon@3x 1.png differ
diff --git a/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/icon@3x.png b/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/icon@3x.png
deleted file mode 100644
index 9f439c8df3..0000000000
Binary files a/v2rayu/V2rayU/Assets.xcassets/IconOn.imageset/icon@3x.png and /dev/null differ
diff --git a/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/1024.png b/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/1024.png
new file mode 100644
index 0000000000..f6b8946ec0
Binary files /dev/null and b/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/1024.png differ
diff --git a/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/128.png b/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/128.png
new file mode 100644
index 0000000000..c7b46f6a4d
Binary files /dev/null and b/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/128.png differ
diff --git a/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/Contents.json b/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/Contents.json
new file mode 100644
index 0000000000..cd69d6b111
--- /dev/null
+++ b/v2rayu/V2rayU/Assets.xcassets/V2rayU.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "filename" : "128.png",
+      "idiom" : "mac",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "mac",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/v2rayu/V2rayU/Base.lproj/PreferenceAbout.xib b/v2rayu/V2rayU/Base.lproj/PreferenceAbout.xib
index 7bb74cdc51..e0920c6546 100755
--- a/v2rayu/V2rayU/Base.lproj/PreferenceAbout.xib
+++ b/v2rayu/V2rayU/Base.lproj/PreferenceAbout.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
         <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,7 +19,7 @@
             <rect key="frame" x="0.0" y="0.0" width="700" height="360"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YO4-aZ-Rwa">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YO4-aZ-Rwa">
                     <rect key="frame" x="309" y="272" width="62" height="19"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="V2rayU" id="09i-pj-m0K">
@@ -28,7 +28,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5SZ-ig-pGf">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5SZ-ig-pGf">
                     <rect key="frame" x="266" y="184" width="24" height="25"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="🌍" id="K46-M8-1zq">
@@ -37,7 +37,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Te4-BT-hGI">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Te4-BT-hGI">
                     <rect key="frame" x="286" y="189" width="152" height="16"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="github.com/yanue/v2rayU" id="Qby-y7-vli">
@@ -46,7 +46,7 @@
                         <color key="backgroundColor" name="systemIndigoColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e05-pp-m5L">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e05-pp-m5L">
                     <rect key="frame" x="288" y="166" width="122" height="16"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="yanue@outlook.com" id="Guc-nt-FeY">
@@ -55,7 +55,7 @@
                         <color key="backgroundColor" name="systemIndigoColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wuh-jp-WUO">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wuh-jp-WUO">
                     <rect key="frame" x="266" y="162" width="24" height="25"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="📬" id="OUg-qH-sDe">
@@ -64,7 +64,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oNz-CM-Geb">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oNz-CM-Geb">
                     <rect key="frame" x="267" y="138" width="24" height="25"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="🔗" id="rUl-Lc-b4S">
@@ -73,7 +73,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hji-yO-Zff">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hji-yO-Zff">
                     <rect key="frame" x="287" y="143" width="146" height="16"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="https://github.com/XTLS" id="Sw8-ch-1M9">
@@ -82,7 +82,7 @@
                         <color key="backgroundColor" name="systemIndigoColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="huF-fy-g3j">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="huF-fy-g3j">
                     <rect key="frame" x="262" y="92" width="156" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Copyright © 2021 yanue.net" id="bCA-au-e3o">
@@ -91,7 +91,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gws-ge-QLa">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gws-ge-QLa">
                     <rect key="frame" x="264" y="69" width="156" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" controlSize="mini" lineBreakMode="charWrapping" enabled="NO" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="center" title="based on Xray-core v1.4.2" usesSingleLineMode="YES" bezelStyle="round" id="8bU-0Q-dTD">
@@ -100,7 +100,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GfP-Xl-Rdf">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GfP-Xl-Rdf">
                     <rect key="frame" x="306" y="251" width="73" height="13"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Version 1.0" id="gsf-1V-bbM">
diff --git a/v2rayu/V2rayU/Base.lproj/ToastWindow.xib b/v2rayu/V2rayU/Base.lproj/ToastWindow.xib
index 0cde5efea2..4b007f438d 100644
--- a/v2rayu/V2rayU/Base.lproj/ToastWindow.xib
+++ b/v2rayu/V2rayU/Base.lproj/ToastWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,13 +18,13 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" visibleAtLaunch="NO" animationBehavior="default" id="kRK-Pd-y69" customClass="NSPanel">
             <windowStyleMask key="styleMask" closable="YES" miniaturizable="YES" resizable="YES" utility="YES"/>
             <rect key="contentRect" x="139" y="81" width="300" height="100"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
             <value key="minSize" type="size" width="200" height="100"/>
             <view key="contentView" id="KRY-zc-8By" userLabel="Panel View">
                 <rect key="frame" x="0.0" y="0.0" width="300" height="100"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="162" translatesAutoresizingMaskIntoConstraints="NO" id="scG-hz-bja" userLabel="Is Name">
+                    <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="162" translatesAutoresizingMaskIntoConstraints="NO" id="scG-hz-bja" userLabel="Is Name">
                         <rect key="frame" x="24" y="33" width="258" height="31"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Label" usesSingleLineMode="YES" id="eQL-ri-Y7Z">
diff --git a/v2rayu/V2rayU/ConfigWindow.swift b/v2rayu/V2rayU/ConfigWindow.swift
index 5d5c7b9c50..5da5e94a15 100644
--- a/v2rayu/V2rayU/ConfigWindow.swift
+++ b/v2rayu/V2rayU/ConfigWindow.swift
@@ -7,7 +7,6 @@
 //
 
 import Cocoa
-import Alamofire
 
 var v2rayConfig: V2rayConfig = V2rayConfig()
 
@@ -645,22 +644,6 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
 
         if let importUri = ImportUri.importUri(uri: uri, checkExist: false) {
             self.saveImport(importUri: importUri)
-        } else {
-            // download json file
-            Alamofire.request(jsonUrl.stringValue).responseString { DataResponse in
-                if (DataResponse.error != nil) {
-                    DispatchQueue.main.async{
-                        self.errTip.stringValue = "error: " + DataResponse.error.debugDescription
-                    }
-                    return
-                }
-
-                if DataResponse.value != nil {
-                    DispatchQueue.main.async{
-                        self.configText.string = v2rayConfig.formatJson(json: DataResponse.value ?? text)
-                    }
-                }
-            }
         }
     }
 
diff --git a/v2rayu/V2rayU/Info.plist b/v2rayu/V2rayU/Info.plist
index f943f715fa..2fca0a39bb 100644
--- a/v2rayu/V2rayU/Info.plist
+++ b/v2rayu/V2rayU/Info.plist
@@ -7,7 +7,11 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconFile</key>
+	<string>AppIcon</string>
+	<key>CFBundleGetInfoString</key>
 	<string></string>
+	<key>CFBundleDisplayName</key>
+	<true/>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -47,14 +51,10 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 yanue. All rights reserved.</string>
+	<string>Copyright © 2024 yanue. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>SUFeedURL</key>
-	<string>https://v2rayu-61f76.web.app/appcast.xml</string>
-	<key>SUPublicEDKey</key>
-	<string>PW8pDnr5VZkmC93gZjUDlHI8gkJSspPoDU3DdhsMkps</string>
 </dict>
 </plist>
diff --git a/v2rayu/V2rayU/MainMenu.swift b/v2rayu/V2rayU/MainMenu.swift
index 5152a70b1b..96615b9996 100644
--- a/v2rayu/V2rayU/MainMenu.swift
+++ b/v2rayu/V2rayU/MainMenu.swift
@@ -8,8 +8,6 @@
 
 import Cocoa
 import ServiceManagement
-import Sparkle
-import Alamofire
 
 let menuController = (NSApplication.shared.delegate as? AppDelegate)?.statusMenu.delegate as! MenuController
 
@@ -335,8 +333,7 @@ class MenuController: NSObject, NSMenuDelegate {
     }
 
     @IBAction func checkForUpdate(_ sender: NSMenuItem) {
-        // need set SUFeedURL into plist
-        V2rayUpdater.checkForUpdates()
+        V2rayUpdater.checkForUpdates(showWindow: true)
     }
 
     @IBAction func generateQrcode(_ sender: NSMenuItem) {
diff --git a/v2rayu/V2rayU/Ping.swift b/v2rayu/V2rayU/Ping.swift
index 59de2a6e2d..456f2ca663 100644
--- a/v2rayu/V2rayU/Ping.swift
+++ b/v2rayu/V2rayU/Ping.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2019 yanue. All rights reserved.
 //
 
-import Alamofire
 import SwiftyJSON
 
 // ping and choose fastest v2ray
diff --git a/v2rayu/V2rayU/Preference/PreferenceGeneral.swift b/v2rayu/V2rayU/Preference/PreferenceGeneral.swift
index 0bf18ae3bb..0b2959b19f 100644
--- a/v2rayu/V2rayU/Preference/PreferenceGeneral.swift
+++ b/v2rayu/V2rayU/Preference/PreferenceGeneral.swift
@@ -68,7 +68,6 @@ final class PreferenceGeneralViewController: NSViewController, PreferencePane {
     }
 
     @IBAction func checkVersion(_ sender: NSButton) {
-        // need set SUFeedURL into plist
         V2rayUpdater.checkForUpdates()
     }
 
diff --git a/v2rayu/V2rayU/Preference/PreferencePac.swift b/v2rayu/V2rayU/Preference/PreferencePac.swift
index 7ea2fba2ce..e5d4817c49 100644
--- a/v2rayu/V2rayU/Preference/PreferencePac.swift
+++ b/v2rayu/V2rayU/Preference/PreferencePac.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2018 yanue. All rights reserved.
 //
 
-import Alamofire
 import Cocoa
 import Preferences
 
diff --git a/v2rayu/V2rayU/Preference/PreferenceSubscription.swift b/v2rayu/V2rayU/Preference/PreferenceSubscription.swift
index b16e199443..214b8afdcd 100644
--- a/v2rayu/V2rayU/Preference/PreferenceSubscription.swift
+++ b/v2rayu/V2rayU/Preference/PreferenceSubscription.swift
@@ -8,7 +8,6 @@
 
 import Cocoa
 import Preferences
-import Alamofire
 import SwiftyJSON
 
 final class PreferenceSubscribeViewController: NSViewController, PreferencePane, NSTabViewDelegate {
diff --git a/v2rayu/V2rayU/Sparkle.swift b/v2rayu/V2rayU/Sparkle.swift
index 7827bb86c0..778bce71d6 100644
--- a/v2rayu/V2rayU/Sparkle.swift
+++ b/v2rayu/V2rayU/Sparkle.swift
@@ -23,7 +23,7 @@ class V2rayUpdaterController: NSObject, SPUUpdaterDelegate {
 
     func checkForUpdates() {
         // check version by github release
-        checkV2rayUVersion()
+//        checkV2rayUVersion()
         // check by sparkle
         fetchAppcast(from: primaryFeedURL) { success in
             // 主线程
diff --git a/v2rayu/V2rayU/Util.swift b/v2rayu/V2rayU/Util.swift
index 40252c9e98..0d49788183 100644
--- a/v2rayu/V2rayU/Util.swift
+++ b/v2rayu/V2rayU/Util.swift
@@ -7,7 +7,6 @@
 //
 
 import Cocoa
-import Alamofire
 
 extension UserDefaults {
     enum KEY: String {
diff --git a/v2rayu/V2rayU/V2rayLaunch.swift b/v2rayu/V2rayU/V2rayLaunch.swift
index 734e463bd0..ee7ff2f109 100644
--- a/v2rayu/V2rayU/V2rayLaunch.swift
+++ b/v2rayu/V2rayU/V2rayLaunch.swift
@@ -428,58 +428,3 @@ class V2rayLaunch: NSObject {
         }
     }
 }
-
-func checkV2rayUVersion() {
-    // 当前版本检测
-    Alamofire.request("https://api.github.com/repos/yanue/V2rayU/releases/latest").responseJSON { response in
-        //to get status code
-        if let status = response.response?.statusCode {
-            if status != 200 {
-                NSLog("error with response status: ", status)
-                return
-            }
-        }
-
-        //to get JSON return value
-        if let result = response.result.value {
-            guard let JSON = result as? NSDictionary else {
-                NSLog("error: no tag_name")
-                return
-            }
-
-            // get tag_name (version)
-            guard let tag_name = JSON["tag_name"] else {
-                NSLog("error: no tag_name")
-                return
-            }
-
-            // get prerelease and draft
-            guard let prerelease = JSON["prerelease"], let draft = JSON["draft"] else {
-                // get
-                NSLog("error: get prerelease or draft")
-                return
-            }
-
-            // not pre release or draft
-            if prerelease as! Bool == true || draft as! Bool == true {
-                NSLog("this release is a prerelease or draft")
-                return
-            }
-
-            let newVer = (tag_name as! String)
-            // get old version
-            let oldVer = appVersion.replacingOccurrences(of: "v", with: "").versionToInt()
-            let curVer = newVer.replacingOccurrences(of: "v", with: "").versionToInt()
-
-            // compare with [Int]
-            DispatchQueue.main.async {
-                if oldVer.lexicographicallyPrecedes(curVer) {
-                    menuController.newVersionItem.isHidden = false
-                    menuController.newVersionItem.title = "has new version " + newVer
-                } else {
-                    menuController.newVersionItem.isHidden = true
-                }
-            }
-        }
-    }
-}
diff --git a/v2rayu/V2rayU/V2raySubscription.swift b/v2rayu/V2rayU/V2raySubscription.swift
index fba04ce134..e0d9add155 100644
--- a/v2rayu/V2rayU/V2raySubscription.swift
+++ b/v2rayu/V2rayU/V2raySubscription.swift
@@ -7,7 +7,6 @@
 //
 
 import Cocoa
-import Alamofire
 import SwiftyJSON
 import Yams
 
diff --git a/xray-core/transport/internet/splithttp/dialer.go b/xray-core/transport/internet/splithttp/dialer.go
index cecab58f24..1a927a4993 100644
--- a/xray-core/transport/internet/splithttp/dialer.go
+++ b/xray-core/transport/internet/splithttp/dialer.go
@@ -1,6 +1,7 @@
 package splithttp
 
 import (
+	"bytes"
 	"context"
 	gotls "crypto/tls"
 	"io"
@@ -263,6 +264,7 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 					return
 				}
 
+				req.ContentLength = int64(chunk.Len())
 				req.Header = transportConfiguration.GetRequestHeader()
 
 				if httpClient.isH2 {
@@ -280,11 +282,19 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 						return
 					}
 				} else {
-					var err error
 					var uploadConn any
-					for i := 0; i < 5; i++ {
+
+					// stringify the entire HTTP/1.1 request so it can be
+					// safely retried. if instead req.Write is called multiple
+					// times, the body is already drained after the first
+					// request
+					requestBytes := new(bytes.Buffer)
+					common.Must(req.Write(requestBytes))
+
+					for {
 						uploadConn = httpClient.uploadRawPool.Get()
-						if uploadConn == nil {
+						newConnection := uploadConn == nil
+						if newConnection {
 							uploadConn, err = httpClient.dialUploadConn(context.WithoutCancel(ctx))
 							if err != nil {
 								errors.LogInfoInner(ctx, err, "failed to connect upload")
@@ -293,18 +303,21 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 							}
 						}
 
-						err = req.Write(uploadConn.(net.Conn))
+						_, err = uploadConn.(net.Conn).Write(requestBytes.Bytes())
+
+						// if the write failed, we try another connection from
+						// the pool, until the write on a new connection fails.
+						// failed writes to a pooled connection are normal when
+						// the connection has been closed in the meantime.
 						if err == nil {
 							break
+						} else if newConnection {
+							errors.LogInfoInner(ctx, err, "failed to send upload")
+							uploadPipeReader.Interrupt()
+							return
 						}
 					}
 
-					if err != nil {
-						errors.LogInfoInner(ctx, err, "failed to send upload")
-						uploadPipeReader.Interrupt()
-						return
-					}
-
 					httpClient.uploadRawPool.Put(uploadConn)
 				}
 			}()
diff --git a/yass/.github/workflows/releases-rpm.yml b/yass/.github/workflows/releases-rpm.yml
index 8742f92773..05913197e7 100644
--- a/yass/.github/workflows/releases-rpm.yml
+++ b/yass/.github/workflows/releases-rpm.yml
@@ -107,10 +107,10 @@ jobs:
           #   gui_variant: gtk3
           # - container: 'opensuse15'
           #   gui_variant: qt5
-          # - container: 'opensuse15'
-          #   gui_variant: gtk4
-          # except for qt6 package
+          # except for gtk4 and qt6 packages
           # glibc: 2.31 for opensuse15.5
+          - container: 'opensuse15'
+            gui_variant: gtk4
           - container: 'opensuse15'
             gui_variant: qt6
     runs-on: ubuntu-22.04
diff --git a/yass/README.md b/yass/README.md
index 095baf4813..0393a8e0ae 100644
--- a/yass/README.md
+++ b/yass/README.md
@@ -16,8 +16,8 @@ More details are at [Latest Release Page](https://github.com/Chilledheart/yass/r
 ### Prebuilt binaries (Linux)
 - GTK3 [download rpm](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-gtk3.el7.x86_64.1.11.3.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-gtk3-ubuntu-16.04-xenial_amd64.1.11.3.deb) (require glibc >= 2.16)
 - Qt5 [download rpm](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-qt5.el7.x86_64.1.11.3.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-qt5-ubuntu-16.04-xenial_amd64.1.11.3.deb) (require glibc >= 2.16)
-- GTK4 [download rpm](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-gtk4.el9.x86_64.1.11.3.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-gtk4-ubuntu-22.04-jammy_amd64.1.11.3.deb) (require glibc >= 2.34)
-- Qt6 [download rpm](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-qt6.lp155.x86_64.1.11.3.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-qt6-ubuntu-22.04-jammy_amd64.1.11.3.deb) (require glibc >= 2.36)
+- GTK4 [download rpm](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-gtk4.el9.x86_64.1.11.3.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-gtk4-ubuntu-22.04-jammy_amd64.1.11.3.deb) (require glibc >= 2.35)
+- Qt6 [download rpm](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-qt6.lp155.x86_64.1.11.3.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.11.3/yass-qt6-ubuntu-22.04-jammy_amd64.1.11.3.deb) (require glibc >= 2.35)
 
 [![aur yass-proxy-gtk3](https://img.shields.io/aur/version/yass-proxy-gtk3)](https://aur.archlinux.org/packages/yass-proxy-gtk3)
 [![aur yass-proxy-qt5](https://img.shields.io/aur/version/yass-proxy-qt5)](https://aur.archlinux.org/packages/yass-proxy-qt5)
diff --git a/yass/src/android/jni.cpp b/yass/src/android/jni.cpp
index 02ebc24326..479605d87f 100644
--- a/yass/src/android/jni.cpp
+++ b/yass/src/android/jni.cpp
@@ -9,6 +9,8 @@
 #include "config/config.hpp"
 #include "crypto/crypter_export.hpp"
 
+#include <pthread.h>
+#include <signal.h>
 #include <string>
 #include <vector>
 
@@ -18,6 +20,20 @@ jobject g_activity_obj = nullptr;
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
   g_jvm = vm;
 
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+
   return JNI_VERSION_1_6;
 }
 
diff --git a/yass/src/cli/cli.cpp b/yass/src/cli/cli.cpp
index ff51b94aee..83e912982c 100644
--- a/yass/src/cli/cli.cpp
+++ b/yass/src/cli/cli.cpp
@@ -57,6 +57,21 @@ static asio::ip::tcp::resolver::results_type ResolveAddress(const std::string& d
 }
 
 int main(int argc, const char* argv[]) {
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+#endif
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
@@ -206,10 +221,6 @@ int main(int argc, const char* argv[]) {
   };
   signals.async_wait(cb);
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_OHOS)
-  CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
-#endif
-
   io_context.run();
 
   PrintMallocStats();
diff --git a/yass/src/cli/cli_worker.cpp b/yass/src/cli/cli_worker.cpp
index f3877e8d92..0771605b63 100644
--- a/yass/src/cli/cli_worker.cpp
+++ b/yass/src/cli/cli_worker.cpp
@@ -5,11 +5,13 @@
 #include <absl/flags/flag.h>
 #include <absl/strings/str_cat.h>
 #include <absl/strings/str_join.h>
-#include <signal.h>
 #include "third_party/boringssl/src/include/openssl/crypto.h"
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
+#else
+#include <pthread.h>
+#include <signal.h>
 #endif
 
 #include "cli/cli_server.hpp"
@@ -41,10 +43,6 @@ Worker::Worker()
 
   CRYPTO_library_init();
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_OHOS)
-  CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
-#endif
-
   thread_ = std::make_unique<std::thread>([this] { WorkFunc(); });
 }
 
@@ -173,6 +171,22 @@ void Worker::WorkFunc() {
   }
 
   LOG(INFO) << "worker: background thread started";
+
+#ifndef _WIN32
+  /* Check if we have blocked SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, nullptr, &saved_mask) == 0) {
+    if (sigismember(&saved_mask, SIGPIPE)) {
+      LOG(INFO) << "worker: signal SIGPIPE is masked as BLOCKED";
+    } else {
+      PLOG(WARNING) << "worker: signal SIGPIPE is not masked as BLOCKED!";
+    }
+  } else {
+    PLOG(WARNING) << "worker: pthread_sigmask failed";
+  }
+#endif
+
   while (!in_destroy_) {
     work_guard_ =
         std::make_unique<asio::executor_work_guard<asio::io_context::executor_type>>(io_context_.get_executor());
diff --git a/yass/src/gtk/yass.cpp b/yass/src/gtk/yass.cpp
index fbe09e3bf4..2fd6b0342f 100644
--- a/yass/src/gtk/yass.cpp
+++ b/yass/src/gtk/yass.cpp
@@ -33,6 +33,21 @@ static const char* kAppId = "it.gui.yass";
 static const char* kAppName = YASS_APP_PRODUCT_NAME;
 
 int main(int argc, const char** argv) {
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+#endif
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
diff --git a/yass/src/gtk4/yass.cpp b/yass/src/gtk4/yass.cpp
index 8397a18966..0ae6207647 100644
--- a/yass/src/gtk4/yass.cpp
+++ b/yass/src/gtk4/yass.cpp
@@ -98,6 +98,21 @@ YASSGtkApp* yass_app_new(void) {
 }  // extern "C"
 
 int main(int argc, const char** argv) {
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+#endif
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
diff --git a/yass/src/harmony/yass.cpp b/yass/src/harmony/yass.cpp
index 005f2c5902..222dc7cef3 100644
--- a/yass/src/harmony/yass.cpp
+++ b/yass/src/harmony/yass.cpp
@@ -9,6 +9,8 @@
 #include <js_native_api_types.h>
 #include <napi/native_api.h>
 
+#include <pthread.h>
+#include <signal.h>
 #include <unistd.h>
 #include <memory>
 #include <thread>
@@ -1153,6 +1155,20 @@ static napi_module yassModule = {
 };
 
 extern "C" __attribute__((constructor)) void RegisterEntryModule(void) {
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+
   napi_module_register(&yassModule);
 }
 
diff --git a/yass/src/ios/extensions/YassPacketTunnelProvider.mm b/yass/src/ios/extensions/YassPacketTunnelProvider.mm
index 4d529bb5fc..7cb1af0c79 100644
--- a/yass/src/ios/extensions/YassPacketTunnelProvider.mm
+++ b/yass/src/ios/extensions/YassPacketTunnelProvider.mm
@@ -3,6 +3,8 @@
 
 #import "YassPacketTunnelProvider.h"
 
+#include <pthread.h>
+#include <signal.h>
 #include <atomic>
 #include <thread>
 
@@ -34,6 +36,22 @@ static constexpr const uint32_t kYieldConcurrencyOfConnections = 12u;
 
 - (void)startTunnelWithOptions:(NSDictionary*)options completionHandler:(void (^)(NSError*))completionHandler {
   stopped_ = false;
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    completionHandler([NSError errorWithDomain:@"it.gui.ios.yass"
+                                          code:200
+                                      userInfo:@{@"Error reason" : @(strerror(errno))}]);
+    return;
+  }
   SetExecutablePath("UNKNOWN.ext");
 
   NETunnelProviderProtocol* protocolConfiguration = (NETunnelProviderProtocol*)self.protocolConfiguration;
diff --git a/yass/src/ios/main.mm b/yass/src/ios/main.mm
index c9c37ff11c..76eebe41b4 100644
--- a/yass/src/ios/main.mm
+++ b/yass/src/ios/main.mm
@@ -5,6 +5,8 @@
 
 #include <locale.h>
 #include <mach-o/dyld.h>
+#include <pthread.h>
+#include <signal.h>
 #include <stdexcept>
 #include <string>
 
@@ -26,6 +28,19 @@
 const ProgramType pType = YASS_CLIENT_SLAVE;
 
 int main(int argc, const char** argv) {
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
diff --git a/yass/src/mac/main.mm b/yass/src/mac/main.mm
index 1d460bc420..50e0125ddc 100644
--- a/yass/src/mac/main.mm
+++ b/yass/src/mac/main.mm
@@ -5,6 +5,8 @@
 
 #include <locale.h>
 #include <mach-o/dyld.h>
+#include <pthread.h>
+#include <signal.h>
 #include <stdexcept>
 #include <string>
 
@@ -37,6 +39,20 @@ __attribute__((used)) const char kGrossPaddingForCrbug1300598[68 * 1024] = {};
 #endif
 
 int main(int argc, const char** argv) {
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
diff --git a/yass/src/qt6/yass.cpp b/yass/src/qt6/yass.cpp
index cfcdbe9d50..e9f20eedbc 100644
--- a/yass/src/qt6/yass.cpp
+++ b/yass/src/qt6/yass.cpp
@@ -27,6 +27,21 @@
 #include "version.h"
 
 int main(int argc, const char** argv) {
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+#endif
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
@@ -59,30 +74,6 @@ int main(int argc, const char** argv) {
 
   YASSApp program(argc, const_cast<char**>(argv));
 
-#ifndef _WIN32
-  // setup signal handler
-  signal(SIGPIPE, SIG_IGN);
-
-  struct sigaction sig_handler;
-
-  sig_handler.sa_handler = [](int signal_num) { App()->quit(); };
-  sigemptyset(&sig_handler.sa_mask);
-  sig_handler.sa_flags = 0;
-
-  sigaction(SIGINT, &sig_handler, nullptr);
-
-  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
-     a closed pipe. */
-  sigset_t sigpipe_mask;
-  sigemptyset(&sigpipe_mask);
-  sigaddset(&sigpipe_mask, SIGPIPE);
-  sigset_t saved_mask;
-  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
-    PLOG(WARNING) << "pthread_sigmask failed";
-    return -1;
-  }
-#endif
-
   // call program init
   if (!program.Init()) {
     return 0;
diff --git a/yass/src/server/server.cpp b/yass/src/server/server.cpp
index f8219ae646..709627a757 100644
--- a/yass/src/server/server.cpp
+++ b/yass/src/server/server.cpp
@@ -35,6 +35,21 @@ const ProgramType pType = YASS_SERVER;
 using namespace net::server;
 
 int main(int argc, const char* argv[]) {
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+#endif
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
@@ -176,10 +191,6 @@ int main(int argc, const char* argv[]) {
   };
   signals.async_wait(cb);
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
-  CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
-#endif
-
 #ifndef _WIN32
   // change user and change group
   std::string username = absl::GetFlag(FLAGS_user);
diff --git a/yass/src/ss_benchmark.cpp b/yass/src/ss_benchmark.cpp
index 99a08c61e8..b3c8f8aca1 100644
--- a/yass/src/ss_benchmark.cpp
+++ b/yass/src/ss_benchmark.cpp
@@ -131,10 +131,6 @@ class ContentProviderConnection : public RefCountedThreadSafe<ContentProviderCon
   ContentProviderConnection& operator=(ContentProviderConnection&&) = delete;
 
   void start() {
-    // FIXME check out why testcases fail with nonblocking mode
-    asio::error_code ec;
-    downlink_->socket_.native_non_blocking(false, ec);
-    downlink_->socket_.non_blocking(false, ec);
     do_io();
   }
 
@@ -582,6 +578,21 @@ int xc_main() {
   char* argv[] = {(char*)"xc_main", nullptr};
 #else
 int main(int argc, char** argv) {
+#endif
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
 #endif
   SetExecutablePath(argv[0]);
   std::string exec_path;
@@ -631,10 +642,6 @@ int main(int argc, char** argv) {
 
   CRYPTO_library_init();
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_OHOS)
-  CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
-#endif
-
   if (absl::GetFlag(FLAGS_ipv6_mode)) {
     CHECK(Net_ipv6works()) << "IPv6 stack is required but not available";
   }
diff --git a/yass/src/ss_test.cpp b/yass/src/ss_test.cpp
index 079d74fd94..fbc9d5f3f4 100644
--- a/yass/src/ss_test.cpp
+++ b/yass/src/ss_test.cpp
@@ -144,10 +144,6 @@ class ContentProviderConnection : public RefCountedThreadSafe<ContentProviderCon
   ContentProviderConnection& operator=(ContentProviderConnection&&) = delete;
 
   void start() {
-    // FIXME check out why testcases fail with nonblocking mode
-    asio::error_code ec;
-    downlink_->socket_.native_non_blocking(false, ec);
-    downlink_->socket_.non_blocking(false, ec);
     do_io();
   }
 
@@ -736,6 +732,22 @@ int xc_main() {
 #else
 int main(int argc, char** argv) {
 #endif
+#ifndef _WIN32
+  // setup signal handler
+  signal(SIGPIPE, SIG_IGN);
+
+  /* Block SIGPIPE in all threads, this can happen if a thread calls write on
+     a closed pipe. */
+  sigset_t sigpipe_mask;
+  sigemptyset(&sigpipe_mask);
+  sigaddset(&sigpipe_mask, SIGPIPE);
+  sigset_t saved_mask;
+  if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) == -1) {
+    perror("pthread_sigmask failed");
+    return -1;
+  }
+#endif
+
   SetExecutablePath(argv[0]);
   std::string exec_path;
   if (!GetExecutablePath(&exec_path)) {
@@ -788,10 +800,6 @@ int main(int argc, char** argv) {
   curl_global_init(CURL_GLOBAL_ALL);
 #endif
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_OHOS)
-  CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
-#endif
-
   if (absl::GetFlag(FLAGS_ipv6_mode)) {
     CHECK(Net_ipv6works()) << "IPv6 stack is required but not available";
   }
diff --git a/yass/yass.spec.in b/yass/yass.spec.in
index 1d77d08935..3083964d99 100644
--- a/yass/yass.spec.in
+++ b/yass/yass.spec.in
@@ -9,14 +9,16 @@
 %endif
 
 # on centos, nghttp2 sits in epel repo
-%if 0%{?fedora} || 0%{?sle_version}
+# on opensuse, nghttp might be outdated
+%if 0%{?fedora}
 %global enable_system_nghttp2_opt on
 %else
 %global enable_system_nghttp2_opt off
 %endif
 
 # on centos, mbedtls sits in epel repo
-%if 0%{?fedora} || 0%{?sle_version}
+# on opensuse, mbedtls might be outdated
+%if 0%{?fedora}
 %global enable_system_mbedtls_opt on
 %else
 %global enable_system_mbedtls_opt off
@@ -157,7 +159,7 @@ BuildRequires: cmake3 >= 3.12, pkgconfig
 %if 0%{?fedora}
 BuildRequires: c-ares-devel
 %endif
-%if 0%{?fedora} || 0%{?sle_version}
+%if 0%{?fedora}
 BuildRequires: mbedtls-devel
 %endif
 %if 0%{?fedora} && !%{with use_libcxx}
@@ -167,7 +169,7 @@ BuildRequires: gperftools-devel
 BuildRequires: json-devel
 %endif
 BuildRequires: zlib-devel
-%if 0%{?fedora} || 0%{?sle_version}
+%if 0%{?fedora}
 BuildRequires: libnghttp2-devel
 %endif
 BuildRequires: gcc, gcc-c++, golang >= 1.4
diff --git a/yt-dlp/README.md b/yt-dlp/README.md
index ea7c671748..ed022c0b9d 100644
--- a/yt-dlp/README.md
+++ b/yt-dlp/README.md
@@ -1288,6 +1288,8 @@ The available fields are:
  - `playlist_autonumber` (numeric): Position of the video in the playlist download queue padded with leading zeros according to the total length of the playlist
  - `playlist_uploader` (string): Full name of the playlist uploader
  - `playlist_uploader_id` (string): Nickname or id of the playlist uploader
+ - `playlist_channel` (string): Display name of the channel that uploaded the playlist
+ - `playlist_channel_id` (string): Identifier of the channel that uploaded the playlist
  - `webpage_url` (string): A URL to the video webpage which if given to yt-dlp should allow to get the same result again
  - `webpage_url_basename` (string): The basename of the webpage URL
  - `webpage_url_domain` (string): The domain of the webpage URL
@@ -1851,6 +1853,9 @@ The following extractors use this feature:
 #### soundcloud
 * `formats`: Formats to request from the API. Requested values should be in the format of `{protocol}_{extension}` (omitting the bitrate), e.g. `hls_opus,http_aac`. The `*` character functions as a wildcard, e.g. `*_mp3`, and can passed by itself to request all formats. Known protocols include `http`, `hls` and `hls-aes`; known extensions include `aac`, `opus` and `mp3`. Original `download` formats are always extracted. Default is `http_aac,hls_aac,http_opus,hls_opus,http_mp3,hls_mp3`
 
+#### orfon (orf:on)
+* `prefer_segments_playlist`: Prefer a playlist of program segments instead of a single complete video when available. If individual segments are desired, use `--concat-playlist never --extractor-args "orfon:prefer_segments_playlist"`
+
 **Note**: These options may be changed/removed in the future without concern for backward compatibility
 
 <!-- MANPAGE: MOVE "INSTALLATION" SECTION HERE -->
diff --git a/yt-dlp/yt_dlp/YoutubeDL.py b/yt-dlp/yt_dlp/YoutubeDL.py
index 7ed01bf840..ba29b29dcb 100644
--- a/yt-dlp/yt_dlp/YoutubeDL.py
+++ b/yt-dlp/yt_dlp/YoutubeDL.py
@@ -1926,6 +1926,8 @@ class YoutubeDL:
             'playlist_title': ie_result.get('title'),
             'playlist_uploader': ie_result.get('uploader'),
             'playlist_uploader_id': ie_result.get('uploader_id'),
+            'playlist_channel': ie_result.get('channel'),
+            'playlist_channel_id': ie_result.get('channel_id'),
             **kwargs,
         }
         if strict:
diff --git a/yt-dlp/yt_dlp/extractor/_extractors.py b/yt-dlp/yt_dlp/extractor/_extractors.py
index c411efb5aa..7f6507defd 100644
--- a/yt-dlp/yt_dlp/extractor/_extractors.py
+++ b/yt-dlp/yt_dlp/extractor/_extractors.py
@@ -76,6 +76,7 @@ from .aenetworks import (
 )
 from .aeonco import AeonCoIE
 from .afreecatv import (
+    AfreecaTVCatchStoryIE,
     AfreecaTVIE,
     AfreecaTVLiveIE,
     AfreecaTVUserIE,
@@ -779,6 +780,7 @@ from .gopro import GoProIE
 from .goshgay import GoshgayIE
 from .gotostage import GoToStageIE
 from .gputechconf import GPUTechConfIE
+from .graspop import GraspopIE
 from .gronkh import (
     GronkhFeedIE,
     GronkhIE,
@@ -969,6 +971,10 @@ from .la7 import (
     LA7PodcastEpisodeIE,
     LA7PodcastIE,
 )
+from .laracasts import (
+    LaracastsIE,
+    LaracastsPlaylistIE,
+)
 from .lastfm import (
     LastFMIE,
     LastFMPlaylistIE,
@@ -1113,12 +1119,15 @@ from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .metacritic import MetacriticIE
 from .mgtv import MGTVIE
-from .microsoftembed import MicrosoftEmbedIE
-from .microsoftstream import MicrosoftStreamIE
-from .microsoftvirtualacademy import (
-    MicrosoftVirtualAcademyCourseIE,
-    MicrosoftVirtualAcademyIE,
+from .microsoftembed import (
+    MicrosoftBuildIE,
+    MicrosoftEmbedIE,
+    MicrosoftLearnEpisodeIE,
+    MicrosoftLearnPlaylistIE,
+    MicrosoftLearnSessionIE,
+    MicrosoftMediusIE,
 )
+from .microsoftstream import MicrosoftStreamIE
 from .mildom import (
     MildomClipIE,
     MildomIE,
@@ -1603,6 +1612,7 @@ from .qqmusic import (
     QQMusicPlaylistIE,
     QQMusicSingerIE,
     QQMusicToplistIE,
+    QQMusicVideoIE,
 )
 from .r7 import (
     R7IE,
diff --git a/yt-dlp/yt_dlp/extractor/afreecatv.py b/yt-dlp/yt_dlp/extractor/afreecatv.py
index bcfb02cb95..f51b5a68b5 100644
--- a/yt-dlp/yt_dlp/extractor/afreecatv.py
+++ b/yt-dlp/yt_dlp/extractor/afreecatv.py
@@ -72,7 +72,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
                             )\?.*?\bnTitleNo=|
                             vod\.afreecatv\.com/(PLAYER/STATION|player)/
                         )
-                        (?P<id>\d+)
+                        (?P<id>\d+)/?(?:$|[?#&])
                     '''
     _TESTS = [{
         'url': 'http://live.afreecatv.com:8079/app/index.cgi?szType=read_ucc_bbs&szBjId=dailyapril&nStationNo=16711924&nBbsNo=18605867&nTitleNo=36164052&szSkin=',
@@ -189,7 +189,7 @@ class AfreecaTVIE(AfreecaTVBaseIE):
             headers={'Referer': url}, data=urlencode_postdata({
                 'nTitleNo': video_id,
                 'nApiLevel': 10,
-            }))['data']
+            }), impersonate=True)['data']
 
         error_code = traverse_obj(data, ('code', {int}))
         if error_code == -6221:
@@ -253,6 +253,43 @@ class AfreecaTVIE(AfreecaTVBaseIE):
         return self.playlist_result(entries, video_id, multi_video=True, **common_info)
 
 
+class AfreecaTVCatchStoryIE(AfreecaTVBaseIE):
+    IE_NAME = 'afreecatv:catchstory'
+    IE_DESC = 'afreecatv.com catch story'
+    _VALID_URL = r'https?://vod\.afreecatv\.com/player/(?P<id>\d+)/catchstory'
+    _TESTS = [{
+        'url': 'https://vod.afreecatv.com/player/103247/catchstory',
+        'info_dict': {
+            'id': '103247',
+        },
+        'playlist_count': 2,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._download_json(
+            'https://api.m.afreecatv.com/catchstory/a/view', video_id, headers={'Referer': url},
+            query={'aStoryListIdx': '', 'nStoryIdx': video_id}, impersonate=True)
+
+        return self.playlist_result(self._entries(data), video_id)
+
+    @staticmethod
+    def _entries(data):
+        # 'files' is always a list with 1 element
+        yield from traverse_obj(data, (
+            'data', lambda _, v: v['story_type'] == 'catch',
+            'catch_list', lambda _, v: v['files'][0]['file'], {
+                'id': ('files', 0, 'file_info_key', {str}),
+                'url': ('files', 0, 'file', {url_or_none}),
+                'duration': ('files', 0, 'duration', {functools.partial(int_or_none, scale=1000)}),
+                'title': ('title', {str}),
+                'uploader': ('writer_nick', {str}),
+                'uploader_id': ('writer_id', {str}),
+                'thumbnail': ('thumb', {url_or_none}),
+                'timestamp': ('write_timestamp', {int_or_none}),
+            }))
+
+
 class AfreecaTVLiveIE(AfreecaTVBaseIE):
     IE_NAME = 'afreecatv:live'
     IE_DESC = 'afreecatv.com livestreams'
diff --git a/yt-dlp/yt_dlp/extractor/digitalconcerthall.py b/yt-dlp/yt_dlp/extractor/digitalconcerthall.py
index 594ce2d0b9..8b4d5c0fc4 100644
--- a/yt-dlp/yt_dlp/extractor/digitalconcerthall.py
+++ b/yt-dlp/yt_dlp/extractor/digitalconcerthall.py
@@ -1,16 +1,16 @@
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
-    parse_resolution,
-    traverse_obj,
     try_get,
+    url_or_none,
     urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
 class DigitalConcertHallIE(InfoExtractor):
     IE_DESC = 'DigitalConcertHall extractor'
-    _VALID_URL = r'https?://(?:www\.)?digitalconcerthall\.com/(?P<language>[a-z]+)/(?P<type>film|concert)/(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?digitalconcerthall\.com/(?P<language>[a-z]+)/(?P<type>film|concert|work)/(?P<id>[0-9]+)-?(?P<part>[0-9]+)?'
     _OAUTH_URL = 'https://api.digitalconcerthall.com/v2/oauth2/token'
     _ACCESS_TOKEN = None
     _NETRC_MACHINE = 'digitalconcerthall'
@@ -26,7 +26,8 @@ class DigitalConcertHallIE(InfoExtractor):
             'upload_date': '20210624',
             'timestamp': 1624548600,
             'duration': 2798,
-            'album_artist': 'Members of the Berliner Philharmoniker / Simon Rössler',
+            'album_artists': ['Members of the Berliner Philharmoniker', 'Simon Rössler'],
+            'composers': ['Kurt Weill'],
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -34,8 +35,9 @@ class DigitalConcertHallIE(InfoExtractor):
         'url': 'https://www.digitalconcerthall.com/en/concert/53785',
         'info_dict': {
             'id': '53785',
-            'album_artist': 'Berliner Philharmoniker / Kirill Petrenko',
+            'album_artists': ['Berliner Philharmoniker', 'Kirill Petrenko'],
             'title': 'Kirill Petrenko conducts Mendelssohn and Shostakovich',
+            'thumbnail': r're:^https?://images.digitalconcerthall.com/cms/thumbnails.*\.jpg$',
         },
         'params': {'skip_download': 'm3u8'},
         'playlist_count': 3,
@@ -49,9 +51,20 @@ class DigitalConcertHallIE(InfoExtractor):
             'thumbnail': r're:^https?://images.digitalconcerthall.com/cms/thumbnails.*\.jpg$',
             'upload_date': '20220714',
             'timestamp': 1657785600,
-            'album_artist': 'Frank Peter Zimmermann / Benedikt von Bernstorff / Jakob von Bernstorff',
+            'album_artists': ['Frank Peter Zimmermann', 'Benedikt von Bernstorff', 'Jakob von Bernstorff'],
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'Concert with several works and an interview',
+        'url': 'https://www.digitalconcerthall.com/en/work/53785-1',
+        'info_dict': {
+            'id': '53785',
+            'album_artists': ['Berliner Philharmoniker', 'Kirill Petrenko'],
+            'title': 'Kirill Petrenko conducts Mendelssohn and Shostakovich',
+            'thumbnail': r're:^https?://images.digitalconcerthall.com/cms/thumbnails.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+        'playlist_count': 1,
     }]
 
     def _perform_login(self, username, password):
@@ -97,15 +110,14 @@ class DigitalConcertHallIE(InfoExtractor):
                     'Accept-Language': language,
                 })
 
-            m3u8_url = traverse_obj(
-                stream_info, ('channel', lambda k, _: k.startswith('vod_mixed'), 'stream', 0, 'url'), get_all=False)
-            formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', 'm3u8_native', fatal=False)
+            formats = []
+            for m3u8_url in traverse_obj(stream_info, ('channel', ..., 'stream', ..., 'url', {url_or_none})):
+                formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', fatal=False))
 
             yield {
                 'id': video_id,
                 'title': item.get('title'),
                 'composer': item.get('name_composer'),
-                'url': m3u8_url,
                 'formats': formats,
                 'duration': item.get('duration_total'),
                 'timestamp': traverse_obj(item, ('date', 'published')),
@@ -119,31 +131,32 @@ class DigitalConcertHallIE(InfoExtractor):
             }
 
     def _real_extract(self, url):
-        language, type_, video_id = self._match_valid_url(url).group('language', 'type', 'id')
+        language, type_, video_id, part = self._match_valid_url(url).group('language', 'type', 'id', 'part')
         if not language:
             language = 'en'
 
-        thumbnail_url = self._html_search_regex(
-            r'(https?://images\.digitalconcerthall\.com/cms/thumbnails/.*\.jpg)',
-            self._download_webpage(url, video_id), 'thumbnail')
-        thumbnails = [{
-            'url': thumbnail_url,
-            **parse_resolution(thumbnail_url),
-        }]
-
+        api_type = 'concert' if type_ == 'work' else type_
         vid_info = self._download_json(
-            f'https://api.digitalconcerthall.com/v2/{type_}/{video_id}', video_id, headers={
+            f'https://api.digitalconcerthall.com/v2/{api_type}/{video_id}', video_id, headers={
                 'Accept': 'application/json',
                 'Accept-Language': language,
             })
-        album_artist = ' / '.join(traverse_obj(vid_info, ('_links', 'artist', ..., 'name')) or '')
+        album_artists = traverse_obj(vid_info, ('_links', 'artist', ..., 'name'))
         videos = [vid_info] if type_ == 'film' else traverse_obj(vid_info, ('_embedded', ..., ...))
 
+        if type_ == 'work':
+            videos = [videos[int(part) - 1]]
+
+        thumbnail = traverse_obj(vid_info, (
+            'image', ..., {self._proto_relative_url}, {url_or_none},
+            {lambda x: x.format(width=0, height=0)}, any))  # NB: 0x0 is the original size
+
         return {
             '_type': 'playlist',
             'id': video_id,
             'title': vid_info.get('title'),
-            'entries': self._entries(videos, language, thumbnails=thumbnails, album_artist=album_artist, type_=type_),
-            'thumbnails': thumbnails,
-            'album_artist': album_artist,
+            'entries': self._entries(
+                videos, language, type_, thumbnail=thumbnail, album_artists=album_artists),
+            'thumbnail': thumbnail,
+            'album_artists': album_artists,
         }
diff --git a/yt-dlp/yt_dlp/extractor/graspop.py b/yt-dlp/yt_dlp/extractor/graspop.py
new file mode 100644
index 0000000000..09371f8c46
--- /dev/null
+++ b/yt-dlp/yt_dlp/extractor/graspop.py
@@ -0,0 +1,32 @@
+from .common import InfoExtractor
+from ..utils import update_url, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class GraspopIE(InfoExtractor):
+    _VALID_URL = r'https?://vod\.graspop\.be/[a-z]{2}/(?P<id>\d+)/'
+    _TESTS = [{
+        'url': 'https://vod.graspop.be/fr/101556/thy-art-is-murder-concert/',
+        'info_dict': {
+            'id': '101556',
+            'ext': 'mp4',
+            'title': 'Thy Art Is Murder',
+            'thumbnail': r're:https://cdn-mds\.pickx\.be/festivals/v3/global/original/.+\.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        metadata = self._download_json(
+            f'https://tv.proximus.be/MWC/videocenter/festivals/{video_id}/stream', video_id)
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(
+                # Downgrade manifest request to avoid incomplete certificate chain error
+                update_url(metadata['source']['assetUri'], scheme='http'), video_id, 'mp4'),
+            **traverse_obj(metadata, {
+                'title': ('name', {str}),
+                'thumbnail': ('source', 'poster', {url_or_none}),
+            }),
+        }
diff --git a/yt-dlp/yt_dlp/extractor/jiocinema.py b/yt-dlp/yt_dlp/extractor/jiocinema.py
index 5898e1f497..30d98ba796 100644
--- a/yt-dlp/yt_dlp/extractor/jiocinema.py
+++ b/yt-dlp/yt_dlp/extractor/jiocinema.py
@@ -364,20 +364,25 @@ class JioCinemaSeriesIE(JioCinemaBaseIE):
             'title': 'naagin',
         },
         'playlist_mincount': 120,
+    }, {
+        'url': 'https://www.jiocinema.com/tv-shows/mtv-splitsvilla-x5/3499820',
+        'info_dict': {
+            'id': '3499820',
+            'title': 'mtv-splitsvilla-x5',
+        },
+        'playlist_mincount': 310,
     }]
 
     def _entries(self, series_id):
-        seasons = self._download_json(
-            f'{self._METADATA_API_BASE}/voot/v1/voot-web/content/generic/season-by-show', series_id,
-            'Downloading series metadata JSON', query={
-                'sort': 'season:asc',
-                'id': series_id,
-                'responseType': 'common',
-            })
+        seasons = traverse_obj(self._download_json(
+            f'{self._METADATA_API_BASE}/voot/v1/voot-web/view/show/{series_id}', series_id,
+            'Downloading series metadata JSON', query={'responseType': 'common'}), (
+            'trays', lambda _, v: v['trayId'] == 'season-by-show-multifilter',
+            'trayTabs', lambda _, v: v['id']))
 
-        for season_num, season in enumerate(traverse_obj(seasons, ('result', lambda _, v: v['id'])), 1):
+        for season_num, season in enumerate(seasons, start=1):
             season_id = season['id']
-            label = season.get('season') or season_num
+            label = season.get('label') or season_num
             for page_num in itertools.count(1):
                 episodes = traverse_obj(self._download_json(
                     f'{self._METADATA_API_BASE}/voot/v1/voot-web/content/generic/series-wise-episode',
diff --git a/yt-dlp/yt_dlp/extractor/laracasts.py b/yt-dlp/yt_dlp/extractor/laracasts.py
new file mode 100644
index 0000000000..4494c4b79a
--- /dev/null
+++ b/yt-dlp/yt_dlp/extractor/laracasts.py
@@ -0,0 +1,114 @@
+import json
+
+from .common import InfoExtractor
+from .vimeo import VimeoIE
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    get_element_html_by_id,
+    int_or_none,
+    parse_duration,
+    str_or_none,
+    unified_strdate,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class LaracastsBaseIE(InfoExtractor):
+    def _get_prop_data(self, url, display_id):
+        webpage = self._download_webpage(url, display_id)
+        return traverse_obj(
+            get_element_html_by_id('app', webpage),
+            ({extract_attributes}, 'data-page', {json.loads}, 'props'))
+
+    def _parse_episode(self, episode):
+        if not traverse_obj(episode, 'vimeoId'):
+            self.raise_login_required('This video is only available for subscribers.')
+        return self.url_result(
+            VimeoIE._smuggle_referrer(
+                f'https://player.vimeo.com/video/{episode["vimeoId"]}', 'https://laracasts.com/'),
+            VimeoIE, url_transparent=True,
+            **traverse_obj(episode, {
+                'id': ('id', {int}, {str_or_none}),
+                'webpage_url': ('path', {lambda x: urljoin('https://laracasts.com', x)}),
+                'title': ('title', {clean_html}),
+                'season_number': ('chapter', {int_or_none}),
+                'episode_number': ('position', {int_or_none}),
+                'description': ('body', {clean_html}),
+                'thumbnail': ('largeThumbnail', {url_or_none}),
+                'duration': ('length', {int_or_none}),
+                'date': ('dateSegments', 'published', {unified_strdate}),
+            }))
+
+
+class LaracastsIE(LaracastsBaseIE):
+    IE_NAME = 'laracasts'
+    _VALID_URL = r'https?://(?:www\.)?laracasts\.com/series/(?P<id>[\w-]+/episodes/\d+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://laracasts.com/series/30-days-to-learn-laravel-11/episodes/1',
+        'md5': 'c8f5e7b02ad0e438ef9280a08c8493dc',
+        'info_dict': {
+            'id': '922040563',
+            'title': 'Hello, Laravel',
+            'ext': 'mp4',
+            'duration': 519,
+            'date': '20240312',
+            'thumbnail': 'https://laracasts.s3.amazonaws.com/videos/thumbnails/youtube/30-days-to-learn-laravel-11-1.png',
+            'description': 'md5:ddd658bb241975871d236555657e1dd1',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'uploader': 'Laracasts',
+            'uploader_id': 'user20182673',
+            'uploader_url': 'https://vimeo.com/user20182673',
+        },
+        'expected_warnings': ['Failed to parse XML'],  # TODO: Remove when vimeo extractor is fixed
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        return self._parse_episode(self._get_prop_data(url, display_id)['lesson'])
+
+
+class LaracastsPlaylistIE(LaracastsBaseIE):
+    IE_NAME = 'laracasts:series'
+    _VALID_URL = r'https?://(?:www\.)?laracasts\.com/series/(?P<id>[\w-]+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://laracasts.com/series/30-days-to-learn-laravel-11',
+        'info_dict': {
+            'title': '30 Days to Learn Laravel',
+            'id': '210',
+            'thumbnail': 'https://laracasts.s3.amazonaws.com/series/thumbnails/social-cards/30-days-to-learn-laravel-11.png?v=2',
+            'duration': 30600.0,
+            'modified_date': '20240511',
+            'description': 'md5:27c260a1668a450984e8f901579912dd',
+            'categories': ['Frameworks'],
+            'tags': ['Laravel'],
+            'display_id': '30-days-to-learn-laravel-11',
+        },
+        'playlist_count': 30,
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        series = self._get_prop_data(url, display_id)['series']
+
+        metadata = {
+            'display_id': display_id,
+            **traverse_obj(series, {
+                'title': ('title', {str}),
+                'id': ('id', {int}, {str_or_none}),
+                'description': ('body', {clean_html}),
+                'thumbnail': (('large_thumbnail', 'thumbnail'), {url_or_none}, any),
+                'duration': ('runTime', {parse_duration}),
+                'categories': ('taxonomy', 'name', {str}, {lambda x: x and [x]}),
+                'tags': ('topics', ..., 'name', {str}),
+                'modified_date': ('lastUpdated', {unified_strdate}),
+            }),
+        }
+
+        return self.playlist_result(traverse_obj(
+            series, ('chapters', ..., 'episodes', lambda _, v: v['vimeoId'], {self._parse_episode})), **metadata)
diff --git a/yt-dlp/yt_dlp/extractor/microsoftembed.py b/yt-dlp/yt_dlp/extractor/microsoftembed.py
index 98d50b18a9..d0135f5a9c 100644
--- a/yt-dlp/yt_dlp/extractor/microsoftembed.py
+++ b/yt-dlp/yt_dlp/extractor/microsoftembed.py
@@ -1,5 +1,14 @@
+import re
+
 from .common import InfoExtractor
-from ..utils import int_or_none, traverse_obj, unified_timestamp
+from ..utils import (
+    int_or_none,
+    parse_iso8601,
+    traverse_obj,
+    unified_timestamp,
+    url_basename,
+    url_or_none,
+)
 
 
 class MicrosoftEmbedIE(InfoExtractor):
@@ -63,3 +72,250 @@ class MicrosoftEmbedIE(InfoExtractor):
             'subtitles': subtitles,
             'thumbnails': thumbnails,
         }
+
+
+class MicrosoftMediusBaseIE(InfoExtractor):
+    @staticmethod
+    def _sub_to_dict(subtitle_list):
+        subtitles = {}
+        for sub in subtitle_list:
+            subtitles.setdefault(sub.pop('tag', 'und'), []).append(sub)
+        return subtitles
+
+    def _extract_ism(self, ism_url, video_id):
+        formats = self._extract_ism_formats(ism_url, video_id)
+        for fmt in formats:
+            if fmt['language'] != 'eng' and 'English' not in fmt['format_id']:
+                fmt['language_preference'] = -10
+        return formats
+
+
+class MicrosoftMediusIE(MicrosoftMediusBaseIE):
+    _VALID_URL = r'https?://medius\.microsoft\.com/Embed/(?:Video\?id=|video-nc/|VideoDetails/)(?P<id>[\da-f-]+)'
+
+    _TESTS = [{
+        'url': 'https://medius.microsoft.com/Embed/video-nc/9640d86c-f513-4889-959e-5dace86e7d2b',
+        'info_dict': {
+            'id': '9640d86c-f513-4889-959e-5dace86e7d2b',
+            'ext': 'ismv',
+            'title': 'Rapidly code, test and ship from secure cloud developer environments',
+            'description': 'md5:33c8e4facadc438613476eea24165f71',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+            'subtitles': 'count:30',
+        },
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/video-nc/81215af5-c813-4dcd-aede-94f4e1a7daa3',
+        'info_dict': {
+            'id': '81215af5-c813-4dcd-aede-94f4e1a7daa3',
+            'ext': 'ismv',
+            'title': 'Microsoft Build opening',
+            'description': 'md5:43455096141077a1f23144cab8cec1cb',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+            'subtitles': 'count:31',
+        },
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/VideoDetails/78493569-9b3b-4a85-a409-ee76e789e25c',
+        'info_dict': {
+            'id': '78493569-9b3b-4a85-a409-ee76e789e25c',
+            'ext': 'ismv',
+            'title': ' Anomaly Detection & Root cause at Edge',
+            'description': 'md5:f8f1ad93d7918649bfb97fa081b03b83',
+            'thumbnail': r're:https://mediusdownload.event.microsoft.com/asset.*\.jpg.*',
+            'subtitles': 'count:17',
+        },
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/Video?id=0dc69bda-079b-4070-a7db-a8da1a06a9c7',
+        'only_matching': True,
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/video-nc/fe823a91-959c-465b-96d4-8f4db624f72c',
+        'only_matching': True,
+    }]
+
+    def _extract_subtitle(self, webpage, video_id):
+        captions = traverse_obj(
+            self._search_json(r'const\s+captionsConfiguration\s*=', webpage, 'captions', video_id, default=None),
+            ('languageList', lambda _, v: url_or_none(v['src']), {
+                'url': 'src',
+                'tag': ('srclang', {str}),
+                'name': ('kind', {str}),
+            })) or [{'url': url, 'tag': url_basename(url).split('.vtt')[0].split('_')[-1]}
+                    for url in re.findall(r'var\s+file\s+=\s+\{[^}]+\'(https://[^\']+\.vtt\?[^\']+)', webpage)]
+
+        return self._sub_to_dict(captions)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(f'https://medius.microsoft.com/Embed/video-nc/{video_id}', video_id)
+
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            'formats': self._extract_ism(
+                self._search_regex(r'StreamUrl\s*=\s*"([^"]+manifest)"', webpage, 'ism url'), video_id),
+            'thumbnail': self._og_search_thumbnail(webpage),
+            'subtitles': self._extract_subtitle(webpage, video_id),
+        }
+
+
+class MicrosoftLearnPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://learn\.microsoft\.com/(?:[\w-]+/)?(?P<type>shows|events)/(?P<id>[\w-]+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://learn.microsoft.com/en-us/shows/bash-for-beginners',
+        'info_dict': {
+            'id': 'bash-for-beginners',
+            'title': 'Bash for Beginners',
+            'description': 'md5:16a91c07222117d1e00912f0dbc02c2c',
+        },
+        'playlist_count': 20,
+    }, {
+        'url': 'https://learn.microsoft.com/en-us/events/build-2022',
+        'info_dict': {
+            'id': 'build-2022',
+            'title': 'Microsoft Build 2022 - Events',
+            'description': 'md5:c16b43848027df837b22c6fbac7648d3',
+        },
+        'playlist_count': 201,
+    }]
+
+    def _entries(self, url_base, video_id):
+        skip = 0
+        while True:
+            playlist_info = self._download_json(url_base, video_id, f'Downloading entries {skip}', query={
+                'locale': 'en-us',
+                '$skip': skip,
+            })
+            url_paths = traverse_obj(playlist_info, ('results', ..., 'url', {str}))
+            for url_path in url_paths:
+                yield self.url_result(f'https://learn.microsoft.com/en-us{url_path}')
+            skip += len(url_paths)
+            if skip >= playlist_info.get('count', 0) or not url_paths:
+                break
+
+    def _real_extract(self, url):
+        playlist_id, playlist_type = self._match_valid_url(url).group('id', 'type')
+        webpage = self._download_webpage(url, playlist_id)
+
+        metainfo = {
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+        }
+        sub_type = 'episodes' if playlist_type == 'shows' else 'sessions'
+
+        url_base = f'https://learn.microsoft.com/api/contentbrowser/search/{playlist_type}/{playlist_id}/{sub_type}'
+        return self.playlist_result(self._entries(url_base, playlist_id), playlist_id, **metainfo)
+
+
+class MicrosoftLearnEpisodeIE(MicrosoftMediusBaseIE):
+    _VALID_URL = r'https?://learn\.microsoft\.com/(?:[\w-]+/)?shows/[\w-]+/(?P<id>[^?#/]+)'
+    _TESTS = [{
+        'url': 'https://learn.microsoft.com/en-us/shows/bash-for-beginners/what-is-the-difference-between-a-terminal-and-a-shell-2-of-20-bash-for-beginners/',
+        'info_dict': {
+            'id': 'd44e1a03-a0e5-45c2-9496-5c9fa08dc94c',
+            'ext': 'ismv',
+            'title': 'What is the Difference Between a Terminal and a Shell? (Part 2 of 20)',
+            'description': 'md5:7bbbfb593d21c2cf2babc3715ade6b88',
+            'timestamp': 1676339547,
+            'upload_date': '20230214',
+            'thumbnail': r're:https://learn\.microsoft\.com/video/media/.*\.png',
+            'subtitles': 'count:14',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        entry_id = self._html_search_meta('entryId', webpage, 'entryId', fatal=True)
+        video_info = self._download_json(
+            f'https://learn.microsoft.com/api/video/public/v1/entries/{entry_id}', video_id)
+        return {
+            'id': entry_id,
+            'formats': self._extract_ism(video_info['publicVideo']['adaptiveVideoUrl'], video_id),
+            'subtitles': self._sub_to_dict(traverse_obj(video_info, (
+                'publicVideo', 'captions', lambda _, v: url_or_none(v['url']), {
+                    'tag': ('language', {str}),
+                    'url': 'url',
+                }))),
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            **traverse_obj(video_info, {
+                'timestamp': ('createTime', {parse_iso8601}),
+                'thumbnails': ('publicVideo', 'thumbnailOtherSizes', ..., {'url': {url_or_none}}),
+            }),
+        }
+
+
+class MicrosoftLearnSessionIE(InfoExtractor):
+    _VALID_URL = r'https?://learn\.microsoft\.com/(?:[\w-]+/)?events/[\w-]+/(?P<id>[^?#/]+)'
+    _TESTS = [{
+        'url': 'https://learn.microsoft.com/en-us/events/build-2022/ts01-rapidly-code-test-ship-from-secure-cloud-developer-environments',
+        'info_dict': {
+            'id': '9640d86c-f513-4889-959e-5dace86e7d2b',
+            'ext': 'ismv',
+            'title': 'Rapidly code, test and ship from secure cloud developer environments - Events',
+            'description': 'md5:f26c1a85d41c1cffd27a0279254a25c3',
+            'timestamp': 1653408600,
+            'upload_date': '20220524',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        metainfo = {
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            'timestamp': parse_iso8601(self._html_search_meta('startDate', webpage, 'startDate')),
+        }
+
+        return self.url_result(
+            self._html_search_meta('externalVideoUrl', webpage, 'videoUrl', fatal=True),
+            url_transparent=True, ie=MicrosoftMediusIE, **metainfo)
+
+
+class MicrosoftBuildIE(InfoExtractor):
+    _VALID_URL = [
+        r'https?://build\.microsoft\.com/[\w-]+/sessions/(?P<id>[\da-f-]+)',
+        r'https?://build\.microsoft\.com/[\w-]+/(?P<id>sessions)/?(?:[?#]|$)',
+    ]
+
+    _TESTS = [{
+        'url': 'https://build.microsoft.com/en-US/sessions/b49feb31-afcd-4217-a538-d3ca1d171198?source=sessions',
+        'info_dict': {
+            'id': 'aee55fb5-fcf9-4b38-b764-a3527cb57554',
+            'ext': 'ismv',
+            'title': 'Microsoft Build opening keynote',
+            'description': 'md5:d38338f336ef4b6ef9ad2a7466a76655',
+            'timestamp': 1716307200,
+            'upload_date': '20240521',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+        },
+    }, {
+        'url': 'https://build.microsoft.com/en-US/sessions',
+        'info_dict': {
+            'id': 'sessions',
+        },
+        'playlist_mincount': 418,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        entries = [
+            self.url_result(
+                video_info['onDemand'], ie=MicrosoftMediusIE, url_transparent=True, **traverse_obj(video_info, {
+                    'id': ('sessionId', {str}),
+                    'title': ('title', {str}),
+                    'description': ('description', {str}),
+                    'timestamp': ('startDateTime', {parse_iso8601}),
+                }))
+            for video_info in self._download_json(
+                'https://api-v2.build.microsoft.com/api/session/all/en-US', video_id, 'Downloading video info')
+        ]
+        if video_id == 'sessions':
+            return self.playlist_result(entries, video_id)
+        else:
+            return traverse_obj(entries, (lambda _, v: v['id'] == video_id), get_all=False)
diff --git a/yt-dlp/yt_dlp/extractor/microsoftvirtualacademy.py b/yt-dlp/yt_dlp/extractor/microsoftvirtualacademy.py
deleted file mode 100644
index e354d8a507..0000000000
--- a/yt-dlp/yt_dlp/extractor/microsoftvirtualacademy.py
+++ /dev/null
@@ -1,188 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_duration,
-    smuggle_url,
-    unsmuggle_url,
-    xpath_text,
-)
-
-
-class MicrosoftVirtualAcademyBaseIE(InfoExtractor):
-    def _extract_base_url(self, course_id, display_id):
-        return self._download_json(
-            f'https://api-mlxprod.microsoft.com/services/products/anonymous/{course_id}',
-            display_id, 'Downloading course base URL')
-
-    def _extract_chapter_and_title(self, title):
-        if not title:
-            return None, None
-        m = re.search(r'(?P<chapter>\d+)\s*\|\s*(?P<title>.+)', title)
-        return (int(m.group('chapter')), m.group('title')) if m else (None, title)
-
-
-class MicrosoftVirtualAcademyIE(MicrosoftVirtualAcademyBaseIE):
-    IE_NAME = 'mva'
-    IE_DESC = 'Microsoft Virtual Academy videos'
-    _VALID_URL = rf'(?:{IE_NAME}:|https?://(?:mva\.microsoft|(?:www\.)?microsoftvirtualacademy)\.com/[^/]+/training-courses/[^/?#&]+-)(?P<course_id>\d+)(?::|\?l=)(?P<id>[\da-zA-Z]+_\d+)'
-
-    _TESTS = [{
-        'url': 'https://mva.microsoft.com/en-US/training-courses/microsoft-azure-fundamentals-virtual-machines-11788?l=gfVXISmEB_6804984382',
-        'md5': '7826c44fc31678b12ad8db11f6b5abb9',
-        'info_dict': {
-            'id': 'gfVXISmEB_6804984382',
-            'ext': 'mp4',
-            'title': 'Course Introduction',
-            'formats': 'mincount:3',
-            'subtitles': {
-                'en': [{
-                    'ext': 'ttml',
-                }],
-            },
-        },
-    }, {
-        'url': 'mva:11788:gfVXISmEB_6804984382',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-
-        mobj = self._match_valid_url(url)
-        course_id = mobj.group('course_id')
-        video_id = mobj.group('id')
-
-        base_url = smuggled_data.get('base_url') or self._extract_base_url(course_id, video_id)
-
-        settings = self._download_xml(
-            f'{base_url}/content/content_{video_id}/videosettings.xml?v=1',
-            video_id, 'Downloading video settings XML')
-
-        _, title = self._extract_chapter_and_title(xpath_text(
-            settings, './/Title', 'title', fatal=True))
-
-        formats = []
-
-        for sources in settings.findall('.//MediaSources'):
-            sources_type = sources.get('videoType')
-            for source in sources.findall('./MediaSource'):
-                video_url = source.text
-                if not video_url or not video_url.startswith('http'):
-                    continue
-                if sources_type == 'smoothstreaming':
-                    formats.extend(self._extract_ism_formats(
-                        video_url, video_id, 'mss', fatal=False))
-                    continue
-                video_mode = source.get('videoMode')
-                height = int_or_none(self._search_regex(
-                    r'^(\d+)[pP]$', video_mode or '', 'height', default=None))
-                codec = source.get('codec')
-                acodec, vcodec = [None] * 2
-                if codec:
-                    codecs = codec.split(',')
-                    if len(codecs) == 2:
-                        acodec, vcodec = codecs
-                    elif len(codecs) == 1:
-                        vcodec = codecs[0]
-                formats.append({
-                    'url': video_url,
-                    'format_id': video_mode,
-                    'height': height,
-                    'acodec': acodec,
-                    'vcodec': vcodec,
-                })
-
-        subtitles = {}
-        for source in settings.findall('.//MarkerResourceSource'):
-            subtitle_url = source.text
-            if not subtitle_url:
-                continue
-            subtitles.setdefault('en', []).append({
-                'url': f'{base_url}/{subtitle_url}',
-                'ext': source.get('type'),
-            })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'subtitles': subtitles,
-            'formats': formats,
-        }
-
-
-class MicrosoftVirtualAcademyCourseIE(MicrosoftVirtualAcademyBaseIE):
-    IE_NAME = 'mva:course'
-    IE_DESC = 'Microsoft Virtual Academy courses'
-    _VALID_URL = rf'(?:{IE_NAME}:|https?://(?:mva\.microsoft|(?:www\.)?microsoftvirtualacademy)\.com/[^/]+/training-courses/(?P<display_id>[^/?#&]+)-)(?P<id>\d+)'
-
-    _TESTS = [{
-        'url': 'https://mva.microsoft.com/en-US/training-courses/microsoft-azure-fundamentals-virtual-machines-11788',
-        'info_dict': {
-            'id': '11788',
-            'title': 'Microsoft Azure Fundamentals: Virtual Machines',
-        },
-        'playlist_count': 36,
-    }, {
-        # with emphasized chapters
-        'url': 'https://mva.microsoft.com/en-US/training-courses/developing-windows-10-games-with-construct-2-16335',
-        'info_dict': {
-            'id': '16335',
-            'title': 'Developing Windows 10 Games with Construct 2',
-        },
-        'playlist_count': 10,
-    }, {
-        'url': 'https://www.microsoftvirtualacademy.com/en-US/training-courses/microsoft-azure-fundamentals-virtual-machines-11788',
-        'only_matching': True,
-    }, {
-        'url': 'mva:course:11788',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if MicrosoftVirtualAcademyIE.suitable(url) else super().suitable(url)
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        course_id = mobj.group('id')
-        display_id = mobj.group('display_id')
-
-        base_url = self._extract_base_url(course_id, display_id)
-
-        manifest = self._download_json(
-            f'{base_url}/imsmanifestlite.json',
-            display_id, 'Downloading course manifest JSON')['manifest']
-
-        organization = manifest['organizations']['organization'][0]
-
-        entries = []
-        for chapter in organization['item']:
-            chapter_number, chapter_title = self._extract_chapter_and_title(chapter.get('title'))
-            chapter_id = chapter.get('@identifier')
-            for item in chapter.get('item', []):
-                item_id = item.get('@identifier')
-                if not item_id:
-                    continue
-                metadata = item.get('resource', {}).get('metadata') or {}
-                if metadata.get('learningresourcetype') != 'Video':
-                    continue
-                _, title = self._extract_chapter_and_title(item.get('title'))
-                duration = parse_duration(metadata.get('duration'))
-                description = metadata.get('description')
-                entries.append({
-                    '_type': 'url_transparent',
-                    'url': smuggle_url(
-                        f'mva:{course_id}:{item_id}', {'base_url': base_url}),
-                    'title': title,
-                    'description': description,
-                    'duration': duration,
-                    'chapter': chapter_title,
-                    'chapter_number': chapter_number,
-                    'chapter_id': chapter_id,
-                })
-
-        title = organization.get('title') or manifest.get('metadata', {}).get('title')
-
-        return self.playlist_result(entries, course_id, title)
diff --git a/yt-dlp/yt_dlp/extractor/nuum.py b/yt-dlp/yt_dlp/extractor/nuum.py
index 3db663ded0..697fc6b32e 100644
--- a/yt-dlp/yt_dlp/extractor/nuum.py
+++ b/yt-dlp/yt_dlp/extractor/nuum.py
@@ -43,15 +43,17 @@ class NuumBaseIE(InfoExtractor):
         is_live = media.get('media_status') == 'RUNNING'
 
         formats, subtitles = None, None
+        headers = {'Referer': 'https://nuum.ru/'}
         if extract_formats:
             formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-                media_url, video_id, 'mp4', live=is_live)
+                media_url, video_id, 'mp4', live=is_live, headers=headers)
 
         return filter_dict({
             'id': video_id,
             'is_live': is_live,
             'formats': formats,
             'subtitles': subtitles,
+            'http_headers': headers,
             **traverse_obj(container, {
                 'title': ('media_container_name', {str}),
                 'description': ('media_container_description', {str}),
@@ -78,7 +80,7 @@ class NuumMediaIE(NuumBaseIE):
         'only_matching': True,
     }, {
         'url': 'https://nuum.ru/videos/1567547-toxi-hurtz',
-        'md5': 'f1d9118a30403e32b702a204eb03aca3',
+        'md5': 'ce28837a5bbffe6952d7bfd3d39811b0',
         'info_dict': {
             'id': '1567547',
             'ext': 'mp4',
diff --git a/yt-dlp/yt_dlp/extractor/orf.py b/yt-dlp/yt_dlp/extractor/orf.py
index f1403d9207..9c37a54d62 100644
--- a/yt-dlp/yt_dlp/extractor/orf.py
+++ b/yt-dlp/yt_dlp/extractor/orf.py
@@ -550,7 +550,8 @@ class ORFONIE(InfoExtractor):
             return self._extract_video_info(segment_id, selected_segment)
 
         # Even some segmented videos have an unsegmented version available in API response root
-        if not traverse_obj(api_json, ('sources', ..., ..., 'src', {url_or_none})):
+        if (self._configuration_arg('prefer_segments_playlist')
+                or not traverse_obj(api_json, ('sources', ..., ..., 'src', {url_or_none}))):
             return self.playlist_result(
                 (self._extract_video_info(str(segment['id']), segment) for segment in segments),
                 video_id, **self._parse_metadata(api_json), multi_video=True)
diff --git a/yt-dlp/yt_dlp/extractor/pokergo.py b/yt-dlp/yt_dlp/extractor/pokergo.py
index e22348053c..72cbce0a0c 100644
--- a/yt-dlp/yt_dlp/extractor/pokergo.py
+++ b/yt-dlp/yt_dlp/extractor/pokergo.py
@@ -5,6 +5,7 @@ from ..utils import (
     ExtractorError,
     try_get,
 )
+from ..utils.traversal import traverse_obj
 
 
 class PokerGoBaseIE(InfoExtractor):
@@ -65,7 +66,7 @@ class PokerGoIE(PokerGoBaseIE):
             'width': image.get('width'),
             'height': image.get('height'),
         } for image in data_json.get('images') or [] if image.get('url')]
-        series_json = next(dct for dct in data_json.get('show_tags') or [] if dct.get('video_id') == video_id) or {}
+        series_json = traverse_obj(data_json, ('show_tags', lambda _, v: v['video_id'] == video_id, any)) or {}
 
         return {
             '_type': 'url_transparent',
diff --git a/yt-dlp/yt_dlp/extractor/qqmusic.py b/yt-dlp/yt_dlp/extractor/qqmusic.py
index a57dd5fb35..d0238692f6 100644
--- a/yt-dlp/yt_dlp/extractor/qqmusic.py
+++ b/yt-dlp/yt_dlp/extractor/qqmusic.py
@@ -1,48 +1,125 @@
+import base64
+import functools
+import json
 import random
-import re
 import time
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    OnDemandPagedList,
     clean_html,
+    int_or_none,
+    join_nonempty,
+    js_to_json,
+    str_or_none,
     strip_jsonp,
+    traverse_obj,
     unescapeHTML,
+    url_or_none,
+    urljoin,
 )
 
 
-class QQMusicIE(InfoExtractor):
+class QQMusicBaseIE(InfoExtractor):
+    def _get_cookie(self, key, default=None):
+        return getattr(self._get_cookies('https://y.qq.com').get(key), 'value', default)
+
+    def _get_g_tk(self):
+        n = 5381
+        for c in self._get_cookie('qqmusic_key', ''):
+            n += (n << 5) + ord(c)
+        return n & 2147483647
+
+    def _get_uin(self):
+        return int_or_none(self._get_cookie('uin')) or 0
+
+    @property
+    def is_logged_in(self):
+        return bool(self._get_uin() and self._get_cookie('fqm_pvqid'))
+
+    # Reference: m_r_GetRUin() in top_player.js
+    # http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js
+    @staticmethod
+    def _m_r_get_ruin():
+        cur_ms = int(time.time() * 1000) % 1000
+        return int(round(random.random() * 2147483647) * cur_ms % 1E10)
+
+    def _download_init_data(self, url, mid, fatal=True):
+        webpage = self._download_webpage(url, mid, fatal=fatal)
+        return self._search_json(r'window\.__INITIAL_DATA__\s*=', webpage,
+                                 'init data', mid, transform_source=js_to_json, fatal=fatal)
+
+    def _make_fcu_req(self, req_dict, mid, headers={}, **kwargs):
+        return self._download_json(
+            'https://u.y.qq.com/cgi-bin/musicu.fcg', mid, data=json.dumps({
+                'comm': {
+                    'cv': 0,
+                    'ct': 24,
+                    'format': 'json',
+                    'uin': self._get_uin(),
+                },
+                **req_dict,
+            }, separators=(',', ':')).encode(), headers=headers, **kwargs)
+
+
+class QQMusicIE(QQMusicBaseIE):
     IE_NAME = 'qqmusic'
     IE_DESC = 'QQ音乐'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/song/(?P<id>[0-9A-Za-z]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/songDetail/(?P<id>[0-9A-Za-z]+)'
     _TESTS = [{
-        'url': 'https://y.qq.com/n/yqq/song/004295Et37taLD.html',
+        'url': 'https://y.qq.com/n/ryqq/songDetail/004Ti8rT003TaZ',
+        'md5': 'd7adc5c438d12e2cb648cca81593fd47',
+        'info_dict': {
+            'id': '004Ti8rT003TaZ',
+            'ext': 'mp3',
+            'title': '永夜のパレード (永夜的游行)',
+            'album': '幻想遊園郷 -Fantastic Park-',
+            'release_date': '20111230',
+            'duration': 281,
+            'creators': ['ケーキ姫', 'JUMA'],
+            'genres': ['Pop'],
+            'description': 'md5:b5261f3d595657ae561e9e6aee7eb7d9',
+            'size': 4501244,
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+            'subtitles': 'count:1',
+        },
+    }, {
+        'url': 'https://y.qq.com/n/ryqq/songDetail/004295Et37taLD',
         'md5': '5f1e6cea39e182857da7ffc5ef5e6bb8',
         'info_dict': {
             'id': '004295Et37taLD',
             'ext': 'mp3',
             'title': '可惜没如果',
-            'release_date': '20141227',
-            'creator': '林俊杰',
-            'description': 'md5:d85afb3051952ecc50a1ee8a286d1eac',
-            'thumbnail': r're:^https?://.*\.jpg$',
+            'album': '新地球 - 人 (Special Edition)',
+            'release_date': '20150129',
+            'duration': 298,
+            'creators': ['林俊杰'],
+            'genres': ['Pop'],
+            'description': 'md5:f568421ff618d2066e74b65a04149c4e',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
         },
+        'skip': 'premium member only',
     }, {
         'note': 'There is no mp3-320 version of this song.',
-        'url': 'https://y.qq.com/n/yqq/song/004MsGEo3DdNxV.html',
-        'md5': 'fa3926f0c585cda0af8fa4f796482e3e',
+        'url': 'https://y.qq.com/n/ryqq/songDetail/004MsGEo3DdNxV',
+        'md5': '028aaef1ae13d8a9f4861a92614887f9',
         'info_dict': {
             'id': '004MsGEo3DdNxV',
             'ext': 'mp3',
             'title': '如果',
+            'album': '新传媒电视连续剧金曲系列II',
             'release_date': '20050626',
-            'creator': '李季美',
-            'description': 'md5:46857d5ed62bc4ba84607a805dccf437',
-            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 220,
+            'creators': ['李季美'],
+            'genres': [],
+            'description': 'md5:fc711212aa623b28534954dc4bd67385',
+            'size': 3535730,
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
         },
     }, {
         'note': 'lyrics not in .lrc format',
-        'url': 'https://y.qq.com/n/yqq/song/001JyApY11tIp6.html',
+        'url': 'https://y.qq.com/n/ryqq/songDetail/001JyApY11tIp6',
         'info_dict': {
             'id': '001JyApY11tIp6',
             'ext': 'mp3',
@@ -50,185 +127,193 @@ class QQMusicIE(InfoExtractor):
             'release_date': '19970225',
             'creator': 'Dark Funeral',
             'description': 'md5:c9b20210587cbcd6836a1c597bab4525',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        },
-        'params': {
-            'skip_download': True,
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
         },
+        'params': {'skip_download': True},
+        'skip': 'no longer available',
     }]
 
     _FORMATS = {
-        'mp3-320': {'prefix': 'M800', 'ext': 'mp3', 'preference': 40, 'abr': 320},
-        'mp3-128': {'prefix': 'M500', 'ext': 'mp3', 'preference': 30, 'abr': 128},
-        'm4a': {'prefix': 'C200', 'ext': 'm4a', 'preference': 10},
+        'F000': {'name': 'flac', 'prefix': 'F000', 'ext': 'flac', 'preference': 60},
+        'A000': {'name': 'ape', 'prefix': 'A000', 'ext': 'ape', 'preference': 50},
+        'M800': {'name': '320mp3', 'prefix': 'M800', 'ext': 'mp3', 'preference': 40, 'abr': 320},
+        'M500': {'name': '128mp3', 'prefix': 'M500', 'ext': 'mp3', 'preference': 30, 'abr': 128},
+        'C400': {'name': '96aac', 'prefix': 'C400', 'ext': 'm4a', 'preference': 20, 'abr': 96},
+        'C200': {'name': '48aac', 'prefix': 'C200', 'ext': 'm4a', 'preference': 20, 'abr': 48},
     }
 
-    # Reference: m_r_GetRUin() in top_player.js
-    # http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js
-    @staticmethod
-    def m_r_get_ruin():
-        cur_ms = int(time.time() * 1000) % 1000
-        return int(round(random.random() * 2147483647) * cur_ms % 1E10)
-
     def _real_extract(self, url):
         mid = self._match_id(url)
 
-        detail_info_page = self._download_webpage(
-            f'http://s.plcloud.music.qq.com/fcgi-bin/fcg_yqq_song_detail_info.fcg?songmid={mid}&play=0',
-            mid, note='Download song detail info',
-            errnote='Unable to get song detail info', encoding='gbk')
+        init_data = self._download_init_data(url, mid, fatal=False)
+        info_data = self._make_fcu_req({'info': {
+            'module': 'music.pf_song_detail_svr',
+            'method': 'get_song_detail_yqq',
+            'param': {
+                'song_mid': mid,
+                'song_type': 0,
+            },
+        }}, mid, note='Downloading song info')['info']['data']['track_info']
 
-        song_name = self._html_search_regex(
-            r"songname:\s*'([^']+)'", detail_info_page, 'song name')
+        media_mid = info_data['file']['media_mid']
 
-        publish_time = self._html_search_regex(
-            r'发行时间：(\d{4}-\d{2}-\d{2})', detail_info_page,
-            'publish time', default=None)
-        if publish_time:
-            publish_time = publish_time.replace('-', '')
-
-        singer = self._html_search_regex(
-            r"singer:\s*'([^']+)", detail_info_page, 'singer', default=None)
-
-        lrc_content = self._html_search_regex(
-            r'<div class="content" id="lrc_content"[^<>]*>([^<>]+)</div>',
-            detail_info_page, 'LRC lyrics', default=None)
-        if lrc_content:
-            lrc_content = lrc_content.replace('\\n', '\n')
-
-        thumbnail_url = None
-        albummid = self._search_regex(
-            [r'albummid:\'([0-9a-zA-Z]+)\'', r'"albummid":"([0-9a-zA-Z]+)"'],
-            detail_info_page, 'album mid', default=None)
-        if albummid:
-            thumbnail_url = f'http://i.gtimg.cn/music/photo/mid_album_500/{albummid[-2:-1]}/{albummid[-1]}/{albummid}.jpg'
-
-        guid = self.m_r_get_ruin()
-
-        vkey = self._download_json(
-            f'http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?json=3&guid={guid}',
-            mid, note='Retrieve vkey', errnote='Unable to get vkey',
-            transform_source=strip_jsonp)['key']
+        data = self._make_fcu_req({
+            'req_1': {
+                'module': 'vkey.GetVkeyServer',
+                'method': 'CgiGetVkey',
+                'param': {
+                    'guid': str(self._m_r_get_ruin()),
+                    'songmid': [mid] * len(self._FORMATS),
+                    'songtype': [0] * len(self._FORMATS),
+                    'uin': str(self._get_uin()),
+                    'loginflag': 1,
+                    'platform': '20',
+                    'filename': [f'{f["prefix"]}{media_mid}.{f["ext"]}' for f in self._FORMATS.values()],
+                },
+            },
+            'req_2': {
+                'module': 'music.musichallSong.PlayLyricInfo',
+                'method': 'GetPlayLyricInfo',
+                'param': {'songMID': mid},
+            },
+        }, mid, note='Downloading formats and lyric', headers=self.geo_verification_headers())
 
+        code = traverse_obj(data, ('req_1', 'code', {int}))
+        if code != 0:
+            raise ExtractorError(f'Failed to download format info, error code {code or "unknown"}')
         formats = []
-        for format_id, details in self._FORMATS.items():
+        for media_info in traverse_obj(data, (
+            'req_1', 'data', 'midurlinfo', lambda _, v: v['songmid'] == mid and v['purl']),
+        ):
+            format_key = traverse_obj(media_info, ('filename', {str}, {lambda x: x[:4]}))
+            format_info = self._FORMATS.get(format_key) or {}
+            format_id = format_info.get('name')
             formats.append({
-                'url': 'http://cc.stream.qqmusic.qq.com/{}{}.{}?vkey={}&guid={}&fromtag=0'.format(
-                    details['prefix'], mid, details['ext'], vkey, guid),
+                'url': urljoin('https://dl.stream.qqmusic.qq.com', media_info['purl']),
                 'format': format_id,
                 'format_id': format_id,
-                'quality': details['preference'],
-                'abr': details.get('abr'),
+                'size': traverse_obj(info_data, ('file', f'size_{format_id}', {int_or_none})),
+                'quality': format_info.get('preference'),
+                'abr': format_info.get('abr'),
+                'ext': format_info.get('ext'),
+                'vcodec': 'none',
             })
-        self._check_formats(formats, mid)
 
-        actual_lrc_lyrics = ''.join(
-            line + '\n' for line in re.findall(
-                r'(?m)^(\[[0-9]{2}:[0-9]{2}(?:\.[0-9]{2,})?\][^\n]*|\[[^\]]*\])', lrc_content))
+        if not formats and not self.is_logged_in:
+            self.raise_login_required()
+
+        if traverse_obj(data, ('req_2', 'code')):
+            self.report_warning(f'Failed to download lyric, error {data["req_2"]["code"]!r}')
+        lrc_content = traverse_obj(data, ('req_2', 'data', 'lyric', {lambda x: base64.b64decode(x).decode('utf-8')}))
 
         info_dict = {
             'id': mid,
             'formats': formats,
-            'title': song_name,
-            'release_date': publish_time,
-            'creator': singer,
-            'description': lrc_content,
-            'thumbnail': thumbnail_url,
+            **traverse_obj(info_data, {
+                'title': ('title', {str}),
+                'album': ('album', 'title', {str}, {lambda x: x or None}),
+                'release_date': ('time_public', {lambda x: x.replace('-', '') or None}),
+                'creators': ('singer', ..., 'name', {str}),
+                'alt_title': ('subtitle', {str}, {lambda x: x or None}),
+                'duration': ('interval', {int_or_none}),
+            }),
+            **traverse_obj(init_data, ('detail', {
+                'thumbnail': ('picurl', {url_or_none}),
+                'description': ('info', 'intro', 'content', ..., 'value', {str}),
+                'genres': ('info', 'genre', 'content', ..., 'value', {str}, all),
+            }), get_all=False),
         }
-        if actual_lrc_lyrics:
-            info_dict['subtitles'] = {
-                'origin': [{
-                    'ext': 'lrc',
-                    'data': actual_lrc_lyrics,
-                }],
-            }
+        if lrc_content:
+            info_dict['subtitles'] = {'origin': [{'ext': 'lrc', 'data': lrc_content}]}
+            info_dict['description'] = join_nonempty(info_dict.get('description'), lrc_content, delim='\n')
         return info_dict
 
 
-class QQPlaylistBaseIE(InfoExtractor):
-    @staticmethod
-    def qq_static_url(category, mid):
-        return f'http://y.qq.com/y/static/{category}/{mid[-2]}/{mid[-1]}/{mid}.html'
-
-    def get_singer_all_songs(self, singmid, num):
-        return self._download_webpage(
-            r'https://c.y.qq.com/v8/fcg-bin/fcg_v8_singer_track_cp.fcg', singmid,
-            query={
-                'format': 'json',
-                'inCharset': 'utf8',
-                'outCharset': 'utf-8',
-                'platform': 'yqq',
-                'needNewCode': 0,
-                'singermid': singmid,
-                'order': 'listen',
-                'begin': 0,
-                'num': num,
-                'songstatus': 1,
-            })
-
-    def get_entries_from_page(self, singmid):
-        entries = []
-
-        default_num = 1
-        json_text = self.get_singer_all_songs(singmid, default_num)
-        json_obj_all_songs = self._parse_json(json_text, singmid)
-
-        if json_obj_all_songs['code'] == 0:
-            total = json_obj_all_songs['data']['total']
-            json_text = self.get_singer_all_songs(singmid, total)
-            json_obj_all_songs = self._parse_json(json_text, singmid)
-
-        for item in json_obj_all_songs['data']['list']:
-            if item['musicData'].get('songmid') is not None:
-                songmid = item['musicData']['songmid']
-                entries.append(self.url_result(
-                    rf'https://y.qq.com/n/yqq/song/{songmid}.html', 'QQMusic', songmid))
-
-        return entries
-
-
-class QQMusicSingerIE(QQPlaylistBaseIE):
+class QQMusicSingerIE(QQMusicBaseIE):
     IE_NAME = 'qqmusic:singer'
     IE_DESC = 'QQ音乐 - 歌手'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/singer/(?P<id>[0-9A-Za-z]+)\.html'
-    _TEST = {
-        'url': 'https://y.qq.com/n/yqq/singer/001BLpXF2DyJe2.html',
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/singer/(?P<id>[0-9A-Za-z]+)'
+    _TESTS = [{
+        'url': 'https://y.qq.com/n/ryqq/singer/001BLpXF2DyJe2',
         'info_dict': {
             'id': '001BLpXF2DyJe2',
             'title': '林俊杰',
-            'description': 'md5:870ec08f7d8547c29c93010899103751',
+            'description': 'md5:10624ce73b06fa400bc846f59b0305fa',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
         },
-        'playlist_mincount': 12,
-    }
+        'playlist_mincount': 100,
+    }, {
+        'url': 'https://y.qq.com/n/ryqq/singer/000Q00f213YzNV',
+        'info_dict': {
+            'id': '000Q00f213YzNV',
+            'title': '桃几OvO',
+            'description': '小破站小唱见~希望大家喜欢听我唱歌~！',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+        },
+        'playlist_count': 12,
+        'playlist': [{
+            'info_dict': {
+                'id': '0016cvsy02mmCl',
+                'ext': 'mp3',
+                'title': '群青',
+                'album': '桃几2021年翻唱集',
+                'release_date': '20210913',
+                'duration': 248,
+                'creators': ['桃几OvO'],
+                'genres': ['Pop'],
+                'description': 'md5:4296005a04edcb5cdbe0889d5055a7ae',
+                'size': 3970822,
+                'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+            },
+        }],
+    }]
+
+    _PAGE_SIZE = 50
+
+    def _fetch_page(self, mid, page_size, page_num):
+        data = self._make_fcu_req({'req_1': {
+            'module': 'music.web_singer_info_svr',
+            'method': 'get_singer_detail_info',
+            'param': {
+                'sort': 5,
+                'singermid': mid,
+                'sin': page_num * page_size,
+                'num': page_size,
+            }}}, mid, note=f'Downloading page {page_num}')
+        yield from traverse_obj(data, ('req_1', 'data', 'songlist', ..., {lambda x: self.url_result(
+            f'https://y.qq.com/n/ryqq/songDetail/{x["mid"]}', QQMusicIE, x['mid'], x.get('title'))}))
 
     def _real_extract(self, url):
         mid = self._match_id(url)
+        init_data = self._download_init_data(url, mid, fatal=False)
 
-        entries = self.get_entries_from_page(mid)
-        singer_page = self._download_webpage(url, mid, 'Download singer page')
-        singer_name = self._html_search_regex(
-            r"singername\s*:\s*'(.*?)'", singer_page, 'singer name', default=None)
-        singer_desc = None
+        return self.playlist_result(
+            OnDemandPagedList(functools.partial(self._fetch_page, mid, self._PAGE_SIZE), self._PAGE_SIZE),
+            mid, **traverse_obj(init_data, ('singerDetail', {
+                'title': ('basic_info', 'name', {str}),
+                'description': ('ex_info', 'desc', {str}),
+                'thumbnail': ('pic', 'pic', {url_or_none}),
+            })))
 
-        if mid:
-            singer_desc_page = self._download_xml(
-                'http://s.plcloud.music.qq.com/fcgi-bin/fcg_get_singer_desc.fcg', mid,
-                'Donwload singer description XML',
-                query={'utf8': 1, 'outCharset': 'utf-8', 'format': 'xml', 'singermid': mid},
-                headers={'Referer': 'https://y.qq.com/n/yqq/singer/'})
 
-            singer_desc = singer_desc_page.find('./data/info/desc').text
-
-        return self.playlist_result(entries, mid, singer_name, singer_desc)
+class QQPlaylistBaseIE(InfoExtractor):
+    def _extract_entries(self, info_json, path):
+        for song in traverse_obj(info_json, path):
+            song_mid = song.get('songmid')
+            if not song_mid:
+                continue
+            yield self.url_result(
+                f'https://y.qq.com/n/ryqq/songDetail/{song_mid}',
+                QQMusicIE, song_mid, song.get('songname'))
 
 
 class QQMusicAlbumIE(QQPlaylistBaseIE):
     IE_NAME = 'qqmusic:album'
     IE_DESC = 'QQ音乐 - 专辑'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/album/(?P<id>[0-9A-Za-z]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/albumDetail/(?P<id>[0-9A-Za-z]+)'
 
     _TESTS = [{
-        'url': 'https://y.qq.com/n/yqq/album/000gXCTb2AhRR1.html',
+        'url': 'https://y.qq.com/n/ryqq/albumDetail/000gXCTb2AhRR1',
         'info_dict': {
             'id': '000gXCTb2AhRR1',
             'title': '我们都是这样长大的',
@@ -236,10 +321,10 @@ class QQMusicAlbumIE(QQPlaylistBaseIE):
         },
         'playlist_count': 4,
     }, {
-        'url': 'https://y.qq.com/n/yqq/album/002Y5a3b3AlCu3.html',
+        'url': 'https://y.qq.com/n/ryqq/albumDetail/002Y5a3b3AlCu3',
         'info_dict': {
             'id': '002Y5a3b3AlCu3',
-            'title': '그리고...',
+            'title': '그리고…',
             'description': 'md5:a48823755615508a95080e81b51ba729',
         },
         'playlist_count': 8,
@@ -248,49 +333,45 @@ class QQMusicAlbumIE(QQPlaylistBaseIE):
     def _real_extract(self, url):
         mid = self._match_id(url)
 
-        album = self._download_json(
-            f'http://i.y.qq.com/v8/fcg-bin/fcg_v8_album_info_cp.fcg?albummid={mid}&format=json',
-            mid, 'Download album page')['data']
+        album_json = self._download_json(
+            'http://i.y.qq.com/v8/fcg-bin/fcg_v8_album_info_cp.fcg',
+            mid, 'Download album page',
+            query={'albummid': mid, 'format': 'json'})['data']
 
-        entries = [
-            self.url_result(
-                'https://y.qq.com/n/yqq/song/' + song['songmid'] + '.html', 'QQMusic', song['songmid'],
-            ) for song in album['list']
-        ]
-        album_name = album.get('name')
-        album_detail = album.get('desc')
-        if album_detail is not None:
-            album_detail = album_detail.strip()
+        entries = self._extract_entries(album_json, ('list', ...))
 
-        return self.playlist_result(entries, mid, album_name, album_detail)
+        return self.playlist_result(entries, mid, **traverse_obj(album_json, {
+            'title': ('name', {str}),
+            'description': ('desc', {str.strip}),
+        }))
 
 
 class QQMusicToplistIE(QQPlaylistBaseIE):
     IE_NAME = 'qqmusic:toplist'
     IE_DESC = 'QQ音乐 - 排行榜'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/toplist/(?P<id>[0-9]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/toplist/(?P<id>[0-9]+)'
 
     _TESTS = [{
-        'url': 'https://y.qq.com/n/yqq/toplist/123.html',
+        'url': 'https://y.qq.com/n/ryqq/toplist/123',
         'info_dict': {
             'id': '123',
-            'title': '美国iTunes榜',
-            'description': 'md5:89db2335fdbb10678dee2d43fe9aba08',
+            'title': r're:美国热门音乐榜 \d{4}-\d{2}-\d{2}',
+            'description': '美国热门音乐榜，每周一更新。',
         },
-        'playlist_count': 100,
+        'playlist_count': 95,
     }, {
-        'url': 'https://y.qq.com/n/yqq/toplist/3.html',
+        'url': 'https://y.qq.com/n/ryqq/toplist/3',
         'info_dict': {
             'id': '3',
-            'title': '巅峰榜·欧美',
-            'description': 'md5:5a600d42c01696b26b71f8c4d43407da',
+            'title': r're:巅峰榜·欧美 \d{4}-\d{2}-\d{2}',
+            'description': 'md5:4def03b60d3644be4c9a36f21fd33857',
         },
         'playlist_count': 100,
     }, {
-        'url': 'https://y.qq.com/n/yqq/toplist/106.html',
+        'url': 'https://y.qq.com/n/ryqq/toplist/106',
         'info_dict': {
             'id': '106',
-            'title': '韩国Mnet榜',
+            'title': r're:韩国Mnet榜 \d{4}-\d{2}-\d{2}',
             'description': 'md5:cb84b325215e1d21708c615cac82a6e7',
         },
         'playlist_count': 50,
@@ -304,33 +385,20 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
             note='Download toplist page',
             query={'type': 'toplist', 'topid': list_id, 'format': 'json'})
 
-        entries = [self.url_result(
-            'https://y.qq.com/n/yqq/song/' + song['data']['songmid'] + '.html', 'QQMusic',
-            song['data']['songmid'])
-            for song in toplist_json['songlist']]
-
-        topinfo = toplist_json.get('topinfo', {})
-        list_name = topinfo.get('ListName')
-        list_description = topinfo.get('info')
-        return self.playlist_result(entries, list_id, list_name, list_description)
+        return self.playlist_result(
+            self._extract_entries(toplist_json, ('songlist', ..., 'data')), list_id,
+            playlist_title=join_nonempty(*traverse_obj(
+                toplist_json, ((('topinfo', 'ListName'), 'update_time'), None)), delim=' '),
+            playlist_description=traverse_obj(toplist_json, ('topinfo', 'info')))
 
 
 class QQMusicPlaylistIE(QQPlaylistBaseIE):
     IE_NAME = 'qqmusic:playlist'
     IE_DESC = 'QQ音乐 - 歌单'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/playlist/(?P<id>[0-9]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/playlist/(?P<id>[0-9]+)'
 
     _TESTS = [{
-        'url': 'http://y.qq.com/n/yqq/playlist/3462654915.html',
-        'info_dict': {
-            'id': '3462654915',
-            'title': '韩国5月新歌精选下旬',
-            'description': 'md5:d2c9d758a96b9888cf4fe82f603121d4',
-        },
-        'playlist_count': 40,
-        'skip': 'playlist gone',
-    }, {
-        'url': 'https://y.qq.com/n/yqq/playlist/1374105607.html',
+        'url': 'https://y.qq.com/n/ryqq/playlist/1374105607',
         'info_dict': {
             'id': '1374105607',
             'title': '易入人心的华语民谣',
@@ -346,19 +414,83 @@ class QQMusicPlaylistIE(QQPlaylistBaseIE):
             'http://i.y.qq.com/qzone-music/fcg-bin/fcg_ucc_getcdinfo_byids_cp.fcg',
             list_id, 'Download list page',
             query={'type': 1, 'json': 1, 'utf8': 1, 'onlysong': 0, 'disstid': list_id},
-            transform_source=strip_jsonp)
+            transform_source=strip_jsonp, headers={'Referer': url})
         if not len(list_json.get('cdlist', [])):
-            if list_json.get('code'):
-                raise ExtractorError(
-                    'QQ Music said: error %d in fetching playlist info' % list_json['code'],
-                    expected=True)
-            raise ExtractorError('Unable to get playlist info')
+            raise ExtractorError(join_nonempty(
+                'Unable to get playlist info',
+                join_nonempty('code', 'subcode', from_dict=list_json),
+                list_json.get('msg'), delim=': '))
 
-        cdlist = list_json['cdlist'][0]
-        entries = [self.url_result(
-            'https://y.qq.com/n/yqq/song/' + song['songmid'] + '.html', 'QQMusic', song['songmid'])
-            for song in cdlist['songlist']]
+        entries = self._extract_entries(list_json, ('cdlist', 0, 'songlist', ...))
 
-        list_name = cdlist.get('dissname')
-        list_description = clean_html(unescapeHTML(cdlist.get('desc')))
-        return self.playlist_result(entries, list_id, list_name, list_description)
+        return self.playlist_result(entries, list_id, **traverse_obj(list_json, ('cdlist', 0, {
+            'title': ('dissname', {str}),
+            'description': ('desc', {unescapeHTML}, {clean_html}),
+        })))
+
+
+class QQMusicVideoIE(QQMusicBaseIE):
+    IE_NAME = 'qqmusic:mv'
+    IE_DESC = 'QQ音乐 - MV'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/mv/(?P<id>[0-9A-Za-z]+)'
+
+    _TESTS = [{
+        'url': 'https://y.qq.com/n/ryqq/mv/002Vsarh3SVU8K',
+        'info_dict': {
+            'id': '002Vsarh3SVU8K',
+            'ext': 'mp4',
+            'title': 'The Chant (Extended Mix / Audio)',
+            'description': '',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+            'release_timestamp': 1688918400,
+            'release_date': '20230709',
+            'duration': 313,
+            'creators': ['Duke Dumont'],
+            'view_count': int,
+        },
+    }]
+
+    def _parse_url_formats(self, url_data):
+        return traverse_obj(url_data, ('mp4', lambda _, v: v['freeflow_url'], {
+            'url': ('freeflow_url', 0, {url_or_none}),
+            'filesize': ('fileSize', {int_or_none}),
+            'format_id': ('newFileType', {str_or_none}),
+        }))
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        video_info = self._make_fcu_req({
+            'mvInfo': {
+                'module': 'music.video.VideoData',
+                'method': 'get_video_info_batch',
+                'param': {
+                    'vidlist': [video_id],
+                    'required': [
+                        'vid', 'type', 'sid', 'cover_pic', 'duration', 'singers',
+                        'video_pay', 'hint', 'code', 'msg', 'name', 'desc',
+                        'playcnt', 'pubdate', 'play_forbid_reason'],
+                },
+            },
+            'mvUrl': {
+                'module': 'music.stream.MvUrlProxy',
+                'method': 'GetMvUrls',
+                'param': {'vids': [video_id]},
+            },
+        }, video_id, headers=self.geo_verification_headers())
+        if traverse_obj(video_info, ('mvInfo', 'data', video_id, 'play_forbid_reason')) == 3:
+            self.raise_geo_restricted()
+
+        return {
+            'id': video_id,
+            'formats': self._parse_url_formats(traverse_obj(video_info, ('mvUrl', 'data', video_id))),
+            **traverse_obj(video_info, ('mvInfo', 'data', video_id, {
+                'title': ('name', {str}),
+                'description': ('desc', {str}),
+                'thumbnail': ('cover_pic', {url_or_none}),
+                'release_timestamp': ('pubdate', {int_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'creators': ('singers', ..., 'name', {str}),
+                'view_count': ('playcnt', {int_or_none}),
+            })),
+        }
diff --git a/yt-dlp/yt_dlp/extractor/youtube.py b/yt-dlp/yt_dlp/extractor/youtube.py
index 7aa84aa8b5..094b1e9a36 100644
--- a/yt-dlp/yt_dlp/extractor/youtube.py
+++ b/yt-dlp/yt_dlp/extractor/youtube.py
@@ -468,7 +468,10 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
         'si', 'th', 'lo', 'my', 'ka', 'am', 'km', 'zh-CN', 'zh-TW', 'zh-HK', 'ja', 'ko',
     ]
 
-    _IGNORED_WARNINGS = {'Unavailable videos will be hidden during playback'}
+    _IGNORED_WARNINGS = {
+        'Unavailable videos will be hidden during playback',
+        'Unavailable videos are hidden',
+    }
 
     _YT_HANDLE_RE = r'@[\w.-]{3,30}'  # https://support.google.com/youtube/answer/11585688?hl=en
     _YT_CHANNEL_UCID_RE = r'UC[\w-]{22}'