diff --git a/config/boards/radxa-e54c.csc b/config/boards/radxa-e54c.csc
index 957eb67428..8dfb86a2ff 100644
--- a/config/boards/radxa-e54c.csc
+++ b/config/boards/radxa-e54c.csc
@@ -9,24 +9,6 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SOC="rk3588"
 IMAGE_PARTITION_TABLE="gpt"
 
-
-# The kernel config hooks are always called twice, once without being in kernel directory and once with current directory being the kernel work directory.
-# Enable the distributed switch architecture to expose the individual LAN and WAN interfaces.
-function custom_kernel_config__radxa_e54c_enable_ethernet_switch_arch() {
-	if [[ ! -f .config ]]; then
-		# kernel_config_modifying_hashes is only needed during first call of this function to calculate kernel artifact version string. It serves no purpose whatsoever during second call.
-		kernel_config_modifying_hashes+=("CONFIG_NET_DSA=m" "CONFIG_NET_DSA_REALTEK=m" "CONFIG_NET_DSA_REALTEK_MDIO=m" "CONFIG_NET_DSA_REALTEK_SMI=m" "CONFIG_NET_DSA_REALTEK_RTL8365MB=m" "CONFIG_NET_DSA_REALTEK_RTL8366RB=m")
-	else
-		display_alert "$BOARD" "Enable Realtek Distributed Switch" "info"
-		kernel_config_set_m NET_DSA
-		kernel_config_set_m NET_DSA_REALTEK
-		kernel_config_set_m NET_DSA_REALTEK_MDIO
-        kernel_config_set_m NET_DSA_REALTEK_SMI
-        kernel_config_set_m NET_DSA_REALTEK_RTL8365MB
-        kernel_config_set_m NET_DSA_REALTEK_RTL8366RB
-	fi
-}
-
 # Enable system and network LEDs
 function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
 	display_alert "$BOARD" "Creating Board Support LED Config" "info"
diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config
index d7560f96b1..d5a33c57e9 100644
--- a/config/kernel/linux-rk35xx-vendor.config
+++ b/config/kernel/linux-rk35xx-vendor.config
@@ -424,6 +424,7 @@ CONFIG_L2TP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BRIDGE_MRP=y
+CONFIG_NET_DSA=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -501,7 +502,6 @@ CONFIG_OPENVSWITCH=m
 CONFIG_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_QRTR_TUN=m
 CONFIG_NET_NCSI=y
 CONFIG_NCSI_OEM_CMD_GET_MAC=y
@@ -660,6 +660,9 @@ CONFIG_NET_VRF=m
 CONFIG_ARCNET=m
 CONFIG_CAIF_DRIVERS=y
 CONFIG_CAIF_VIRTIO=m
+CONFIG_NET_DSA_REALTEK=m
+CONFIG_NET_DSA_REALTEK_RTL8365MB=m
+CONFIG_NET_DSA_REALTEK_RTL8366RB=m
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set
@@ -2737,8 +2740,6 @@ CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO_DWARF5=y
-CONFIG_DEBUG_INFO_BTF=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
 CONFIG_DEBUG_MEMORY_INIT=y