diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-22 09:40:12 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-22 09:40:12 -0700 |
| commit | 230304f53c54520b3b28b9e420719fe328984c17 (patch) | |
| tree | 35a3396772baf5e0c0c28c43fa46bdd72c7192dd /linaro/configs/distribution.conf | |
| parent | 9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff) | |
| parent | a0b6bc035e9b20c56a270bb80b3237a4997182b3 (diff) | |
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18lsk-v3.18-15.06
* v3.18/topic/configs:
configs: linaro-base: enable ZRAM features
Revert "linaro/configs: remove options already present in base defconfig"
Revert "configs: linaro-base: enable ZRAM features"
Diffstat (limited to 'linaro/configs/distribution.conf')
| -rw-r--r-- | linaro/configs/distribution.conf | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf index 70ca74bd20f3..729b9b8979e4 100644 --- a/linaro/configs/distribution.conf +++ b/linaro/configs/distribution.conf @@ -1,45 +1,49 @@ -# CONFIG_COMPAT_BRK is not set -# CONFIG_DEVKMEM is not set # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_AUTOFS4_FS=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_BRIDGE=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_NETFILTER=y -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_CC_STACKPROTECTOR=y CONFIG_CGROUPS=y +# CONFIG_COMPAT_BRK is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_DEFAULT_SECURITY_APPARMOR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_INPUT_UINPUT=y -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MANGLE=m +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +CONFIG_SYN_COOKIES=y CONFIG_IPV6=y -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MANGLE=m -CONFIG_LSM_MMAP_MIN_ADDR=0 +CONFIG_NETLABEL=y +CONFIG_BRIDGE_NETFILTER=y +CONFIG_NF_CONNTRACK=m CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETLABEL=y -CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_MANGLE=m +CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_SECCOMP=y +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE=m +CONFIG_TUN=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y +# CONFIG_DEVKMEM is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_AUTOFS4_FS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_STRICT_DEVMEM=y CONFIG_SECURITY=y -CONFIG_SECURITY_APPARMOR=y +CONFIG_LSM_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SMACK=y -CONFIG_STRICT_DEVMEM=y -CONFIG_SYN_COOKIES=y -CONFIG_TMPFS_POSIX_ACL=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -CONFIG_TUN=y |