Skip to content

Commit 2c23325

Browse files
committed
Move kernel config changes from board to kernel config
1 parent 1653fda commit 2c23325

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

config/boards/radxa-e54c.csc

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@ BOOT_SCENARIO="spl-blobs"
99
BOOT_SOC="rk3588"
1010
IMAGE_PARTITION_TABLE="gpt"
1111

12-
13-
# The kernel config hooks are always called twice, once without being in kernel directory and once with current directory being the kernel work directory.
14-
# Enable the distributed switch architecture to expose the individual LAN and WAN interfaces.
15-
function custom_kernel_config__radxa_e54c_enable_ethernet_switch_arch() {
16-
if [[ ! -f .config ]]; then
17-
# 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.
18-
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")
19-
else
20-
display_alert "$BOARD" "Enable Realtek Distributed Switch" "info"
21-
kernel_config_set_m NET_DSA
22-
kernel_config_set_m NET_DSA_REALTEK
23-
kernel_config_set_m NET_DSA_REALTEK_MDIO
24-
kernel_config_set_m NET_DSA_REALTEK_SMI
25-
kernel_config_set_m NET_DSA_REALTEK_RTL8365MB
26-
kernel_config_set_m NET_DSA_REALTEK_RTL8366RB
27-
fi
28-
}
29-
3012
# Enable system and network LEDs
3113
function post_family_tweaks_bsp__radxa_e54c_enable_leds() {
3214
display_alert "$BOARD" "Creating Board Support LED Config" "info"

config/kernel/linux-rk35xx-vendor.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ CONFIG_L2TP=m
424424
CONFIG_BRIDGE=m
425425
CONFIG_BRIDGE_VLAN_FILTERING=y
426426
CONFIG_BRIDGE_MRP=y
427+
CONFIG_NET_DSA=m
427428
CONFIG_VLAN_8021Q=m
428429
CONFIG_VLAN_8021Q_GVRP=y
429430
CONFIG_VLAN_8021Q_MVRP=y
@@ -501,7 +502,6 @@ CONFIG_OPENVSWITCH=m
501502
CONFIG_VSOCKETS=m
502503
CONFIG_VIRTIO_VSOCKETS=m
503504
CONFIG_HSR=m
504-
CONFIG_NET_SWITCHDEV=y
505505
CONFIG_QRTR_TUN=m
506506
CONFIG_NET_NCSI=y
507507
CONFIG_NCSI_OEM_CMD_GET_MAC=y
@@ -660,6 +660,9 @@ CONFIG_NET_VRF=m
660660
CONFIG_ARCNET=m
661661
CONFIG_CAIF_DRIVERS=y
662662
CONFIG_CAIF_VIRTIO=m
663+
CONFIG_NET_DSA_REALTEK=m
664+
CONFIG_NET_DSA_REALTEK_RTL8365MB=m
665+
CONFIG_NET_DSA_REALTEK_RTL8366RB=m
663666
# CONFIG_NET_VENDOR_3COM is not set
664667
# CONFIG_NET_VENDOR_ADAPTEC is not set
665668
# CONFIG_NET_VENDOR_AGERE is not set
@@ -2737,8 +2740,6 @@ CONFIG_DMA_CMA=y
27372740
CONFIG_PRINTK_TIME=y
27382741
CONFIG_PRINTK_TIME_FROM_ARM_ARCH_TIMER=y
27392742
CONFIG_DYNAMIC_DEBUG=y
2740-
CONFIG_DEBUG_INFO_DWARF5=y
2741-
CONFIG_DEBUG_INFO_BTF=y
27422743
CONFIG_MAGIC_SYSRQ=y
27432744
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
27442745
CONFIG_DEBUG_MEMORY_INIT=y

0 commit comments

Comments
 (0)