summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleyfoon.tan <leyfoon.tan@starfivetech.com>2023-09-26 06:53:05 +0300
committerleyfoon.tan <leyfoon.tan@starfivetech.com>2023-09-26 06:53:05 +0300
commit2c68598d62ba1af9e296bd9f5e8933bcf86c531c (patch)
treec24904ee029a91c465cf737bf25a749956883bcf
parent1e3b15b8f416e8d26af7bff467d8debc3f1f5fd9 (diff)
parent2ba29fa7a8d1a50297384df0f0a56ba02cfb4e22 (diff)
downloadlinux-2c68598d62ba1af9e296bd9f5e8933bcf86c531c.tar.xz
Merge branch 'starfive-6.1-dubhe-kvmtool-networking' into 'starfive-6.1-dubhe'
riscv: configs: dubhe: Enable bridge networking and TUN/TAP driver See merge request starfive-tech/linux!187
-rw-r--r--arch/riscv/configs/starfive_dubhe_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/riscv/configs/starfive_dubhe_defconfig b/arch/riscv/configs/starfive_dubhe_defconfig
index 15428a69e1cb..0f8749838cc9 100644
--- a/arch/riscv/configs/starfive_dubhe_defconfig
+++ b/arch/riscv/configs/starfive_dubhe_defconfig
@@ -65,6 +65,7 @@ CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_BRIDGE=y
CONFIG_NETLINK_DIAG=y
CONFIG_NET_9P=y
CONFIG_NET_9P_VIRTIO=y
@@ -87,6 +88,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_SCSI_VIRTIO=y
CONFIG_NETDEVICES=y
+CONFIG_TUN=y
CONFIG_VIRTIO_NET=y
CONFIG_MACB=y
CONFIG_STMMAC_ETH=y