From 93f7e28ca57938defac4a1d140d3b7ee200d9160 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 31 May 2016 16:06:46 +0200 Subject: [PATCH] kernel: enable CONFIG_VLAN_8021Q --- Makefile | 2 +- kernel/arch/sh/configs/idl4k_defconfig | 14 +++++++++++--- patches/kernel.config | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 56997745..b7901fa2 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,7 @@ out/satip-axe-$(VERSION).fw: kernel/arch/sh/boot/uImage.gz # kernel # -kernel/.config: toolchain/4.5.3-99/opt/STM/STLinux-2.4/devkit/sh4/bin/sh4-linux-gcc-4.5.3 +kernel/.config: patches/kernel.config toolchain/4.5.3-99/opt/STM/STLinux-2.4/devkit/sh4/bin/sh4-linux-gcc-4.5.3 cp patches/kernel.config ./kernel/arch/sh/configs/idl4k_defconfig make -C kernel -j $(CPUS) ARCH=sh CROSS_COMPILE=$(TOOLCHAIN_KERNEL)/bin/sh4-linux- idl4k_defconfig diff --git a/kernel/arch/sh/configs/idl4k_defconfig b/kernel/arch/sh/configs/idl4k_defconfig index c085c755..f7a479b4 100644 --- a/kernel/arch/sh/configs/idl4k_defconfig +++ b/kernel/arch/sh/configs/idl4k_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.42 -# Wed Apr 8 14:52:06 2015 +# Thu Feb 11 20:59:25 2016 # CONFIG_SUPERH=y CONFIG_SUPERH32=y @@ -495,7 +495,7 @@ CONFIG_NETFILTER_ADVANCED=y # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=y # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set @@ -729,7 +729,7 @@ CONFIG_PHYLIB=y # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set +CONFIG_REALTEK_PHY=y # CONFIG_NATIONAL_PHY is not set # CONFIG_STE10XP is not set # CONFIG_LSI_ET1011C_PHY is not set @@ -740,8 +740,13 @@ CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_NETDEV_1000=y CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y +# CONFIG_STMMAC_PCI is not set +CONFIG_STMMAC_DEBUG_FS=y # CONFIG_STMMAC_DA is not set # CONFIG_STMMAC_TIMER is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set CONFIG_NETDEV_10000=y # CONFIG_WLAN is not set @@ -1333,8 +1338,11 @@ CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set diff --git a/patches/kernel.config b/patches/kernel.config index 037691c7..f7a479b4 100644 --- a/patches/kernel.config +++ b/patches/kernel.config @@ -495,7 +495,7 @@ CONFIG_NETFILTER_ADVANCED=y # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=y # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set