From f624a2114bf6f065f6836aa6da1a14291af2445b Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 26 Jul 2014 02:21:10 +0200 Subject: apalis/colibri t20/t30: enable vlan functionality Enable VLAN networking functionality. While at it also enable some more kernel modules for Apalis T30 PCIe based devices like the Intel E1000E NICs, Intel IWLAGN Wi-Fi cards, PCIe serial cards and XHCI based USB 3.0 controllers. --- arch/arm/configs/apalis_t30_defconfig | 7 ++++++- arch/arm/configs/colibri_t20_defconfig | 2 ++ arch/arm/configs/colibri_t30_defconfig | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/apalis_t30_defconfig b/arch/arm/configs/apalis_t30_defconfig index d219240697be..3e22166f9230 100644 --- a/arch/arm/configs/apalis_t30_defconfig +++ b/arch/arm/configs/apalis_t30_defconfig @@ -130,6 +130,8 @@ CONFIG_IP_NF_ARPTABLES=y CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y CONFIG_IP6_NF_IPTABLES=y +CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q_GVRP=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y @@ -178,12 +180,14 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_TUN=y CONFIG_NETDEV_1000=y +CONFIG_E1000E=m CONFIG_IGB=y CONFIG_IGB_PTP=y # CONFIG_NETDEV_10000 is not set # Hack to force WIRELESS_EXT required to build Redpine Signals LiteFi driver CONFIG_USB_ZD1201=m CONFIG_B43=m +CONFIG_IWLAGN=m CONFIG_RT2X00=y CONFIG_RT2800USB=y CONFIG_USB_USBNET=y @@ -215,7 +219,7 @@ CONFIG_INPUT_GPIO=y # CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -# CONFIG_SERIAL_8250_PCI is not set +CONFIG_SERIAL_8250_PCI=m CONFIG_SERIAL_8250_NR_UARTS=9 CONFIG_SERIAL_8250_RUNTIME_UARTS=9 CONFIG_SERIAL_TEGRA=y @@ -327,6 +331,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_SUSPEND=y CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set +CONFIG_USB_XHCI_HCD=m CONFIG_USB_EHCI_HCD=y CONFIG_USB_ACM=y CONFIG_USB_WDM=y diff --git a/arch/arm/configs/colibri_t20_defconfig b/arch/arm/configs/colibri_t20_defconfig index a34a953620f2..87bfa8cfa9ec 100644 --- a/arch/arm/configs/colibri_t20_defconfig +++ b/arch/arm/configs/colibri_t20_defconfig @@ -125,6 +125,8 @@ CONFIG_IP_NF_ARPTABLES=y CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y CONFIG_IP6_NF_IPTABLES=y +CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q_GVRP=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y diff --git a/arch/arm/configs/colibri_t30_defconfig b/arch/arm/configs/colibri_t30_defconfig index 76784e46bdee..050351d93e23 100644 --- a/arch/arm/configs/colibri_t30_defconfig +++ b/arch/arm/configs/colibri_t30_defconfig @@ -128,6 +128,8 @@ CONFIG_IP_NF_ARPTABLES=y CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y CONFIG_IP6_NF_IPTABLES=y +CONFIG_VLAN_8021Q=y +CONFIG_VLAN_8021Q_GVRP=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y -- cgit v1.2.3