From 2afb0db9c2907b45b7d60c87aa751b21c0e20d33 Mon Sep 17 00:00:00 2001 From: cronyx Date: Mon, 16 May 2022 15:42:50 +0300 Subject: [PATCH] build TUN driver as external module in gk* same as in the hi* --- .../board/gk7205v200/kernel/gk7202v300.generic.config | 2 +- .../board/gk7205v200/kernel/gk7205v200.generic-fpv.config | 2 +- .../board/gk7205v200/kernel/gk7205v200.generic.config | 2 +- .../board/gk7205v200/kernel/gk7205v300.generic-fpv.config | 2 +- .../board/gk7205v200/kernel/gk7205v300.generic.config | 2 +- .../board/gk7205v200/kernel/gk7605v100.generic.config | 2 +- .../configs/unknown_unknown_hi3516ev200_ultimate_defconfig | 3 +++ .../configs/unknown_unknown_hi3516ev300_ultimate_defconfig | 3 +++ 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config index cd2a7615..792a3812 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7202v300.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config index 23f69608..45e26a3c 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic-fpv.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config index 937c5010..deca3dbc 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v200.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config index d0d06e47..bbdd4290 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic-fpv.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config index 7e457eed..526eb65e 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7205v300.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config b/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config index da857074..f8e85749 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/kernel/gk7605v100.generic.config @@ -1042,7 +1042,7 @@ CONFIG_NET_CORE=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_VETH is not set # CONFIG_NLMON is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig index f01b1f2b..ee5c776f 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig @@ -103,3 +103,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # WIREGUARD BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig index 8ca521c0..c59bb8d6 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig @@ -103,3 +103,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # WIREGUARD BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y + +# ZEROTIER +BR2_PACKAGE_ZEROTIER_ONE is not set