diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 13:33:22 -0500 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 13:33:22 -0500 |
commit | 80736060bf19140222343536286a9200dcf4eb0c (patch) | |
tree | 2336b38059963ace25035a34bf890e2ce744cb0e /linaro/configs/linaro-base.conf | |
parent | 261995fa5e08c8275ef2513d49c34fe321087b96 (diff) | |
parent | e8b6ed55c3abec54c23fcccb34478b9f8e171fd2 (diff) |
Merge branch 'config-core-3.18' into linux-linaro-lng-v3.18-rt
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/android.conf
linaro/configs/big-LITTLE-IKS.conf
linaro/configs/distribution.conf
linaro/configs/linaro-base.conf
Diffstat (limited to 'linaro/configs/linaro-base.conf')
-rw-r--r-- | linaro/configs/linaro-base.conf | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index 1e568d9696e2..790dd7f64a3a 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -51,6 +51,7 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_NAND=y CONFIG_NETDEVICES=y +CONFIG_GPIO_SYSFS=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y @@ -82,6 +83,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y +CONFIG_DEBUG_INFO=y CONFIG_KEYS=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRC_CCITT=y @@ -108,11 +110,29 @@ CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y CONFIG_NETFILTER_XT_TARGET_SECMARK=y CONFIG_IP_NF_SECURITY=y +CONFIG_NET=y +CONFIG_INET=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_JFS_SECURITY=y +CONFIG_XFS_SECURITY=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_NETLABEL=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_CAPABILITIES=y +CONFIG_SECURITY_FILE_CAPABILITIES=y CONFIG_BLK_DEV_LOOP=y CONFIG_DEBUG_INFO=y CONFIG_FANOTIFY=y |