diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-08 12:01:27 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-08 12:01:27 -0600 |
| commit | 5765ecb5ef2401f7bd0feaeeadbe6dbc558b9791 (patch) | |
| tree | d6e81f7e3954c2a3a5270fa5ef49e8b5f30d3bfd | |
| parent | 5caca6fd8ad5ad90307a1d3519b160a6eb347c4b (diff) | |
| parent | c40244a82c45d0e40f79b5aab1eebc120e666037 (diff) | |
Merge branch 'lng-core-configs' into linux-lnglinux-lng-v3.10.17-final
| -rw-r--r-- | linaro/configs/bigendian.conf | 5 | ||||
| -rw-r--r-- | linaro/configs/distribution.conf | 16 | ||||
| -rw-r--r-- | linaro/configs/kvm-guest.conf | 6 | ||||
| -rw-r--r-- | linaro/configs/linaro-base.conf | 3 | ||||
| -rw-r--r-- | linaro/configs/netns.conf | 2 |
5 files changed, 30 insertions, 2 deletions
diff --git a/linaro/configs/bigendian.conf b/linaro/configs/bigendian.conf new file mode 100644 index 000000000000..281fa55d91d0 --- /dev/null +++ b/linaro/configs/bigendian.conf @@ -0,0 +1,5 @@ +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_CPU_ENDIAN_BE8=y +CONFIG_CPU_BE8_BOOT_LE=y +# CONFIG_VIRTUALIZATION is not set +# CONFIG_MMC_DW_IDMAC is not set diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf index fbcfed1b6ce8..7eab0a631571 100644 --- a/linaro/configs/distribution.conf +++ b/linaro/configs/distribution.conf @@ -6,23 +6,31 @@ CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y CONFIG_SYN_COOKIES=y CONFIG_IPV6=y +CONFIG_IP_SCTP=m CONFIG_NETLABEL=y CONFIG_BRIDGE_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_NAT_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_NAT=m CONFIG_BRIDGE_EBT_MARK_T=m CONFIG_BRIDGE=m CONFIG_DEVTMPFS=y @@ -42,3 +50,11 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SMACK=y CONFIG_SECURITY_APPARMOR=y CONFIG_DEFAULT_SECURITY_APPARMOR=y +CONFIG_DUMMY=m +CONFIG_EXPORTFS=m +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_FAULT_INJECTION=y diff --git a/linaro/configs/kvm-guest.conf b/linaro/configs/kvm-guest.conf index 00e84a3ba1ec..cf174f89d043 100644 --- a/linaro/configs/kvm-guest.conf +++ b/linaro/configs/kvm-guest.conf @@ -1,3 +1,9 @@ +CONFIG_9P_FS=y +CONFIG_NET_9P_VIRTIO=y +CONFIG_NET_9P=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_BALLOON_COMPACTION=y CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_NET=y diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index 947ca1f50935..44438e22c466 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -6,7 +6,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y -CONFIG_HOTPLUG=y CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_PROFILING=y @@ -70,7 +69,7 @@ CONFIG_JFFS2_RUBIN=y CONFIG_CRAMFS=y CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y -# CONFIG_NFS_V2 is not set +CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/linaro/configs/netns.conf b/linaro/configs/netns.conf new file mode 100644 index 000000000000..7fadd7d67e36 --- /dev/null +++ b/linaro/configs/netns.conf @@ -0,0 +1,2 @@ +CONFIG_NAMESPACES=y +CONFIG_VETH=y |