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 | |
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
-rw-r--r-- | linaro/configs/android.conf | 12 | ||||
-rw-r--r-- | linaro/configs/audit.conf | 9 | ||||
-rw-r--r-- | linaro/configs/debug.conf | 1 | ||||
-rw-r--r-- | linaro/configs/distribution.conf | 2 | ||||
-rw-r--r-- | linaro/configs/gcov.conf | 3 | ||||
-rw-r--r-- | linaro/configs/linaro-base-arm.conf | 3 | ||||
-rw-r--r-- | linaro/configs/linaro-base-arm64.conf | 3 | ||||
-rw-r--r-- | linaro/configs/linaro-base.conf | 20 | ||||
l--------- | linaro/configs/linaro-base64.conf | 1 | ||||
-rw-r--r-- | linaro/configs/netns.conf | 2 | ||||
-rw-r--r-- | linaro/configs/uprobes.conf | 7 | ||||
-rw-r--r-- | linaro/configs/xen.conf | 7 |
12 files changed, 68 insertions, 2 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf index e4fd1ad19028..54b3526e189a 100644 --- a/linaro/configs/android.conf +++ b/linaro/configs/android.conf @@ -29,12 +29,22 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_FUSE_FS=y CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y -CONFIG_ION=y CONFIG_SYNC=y CONFIG_SW_SYNC=y CONFIG_SW_SYNC_USER=y +CONFIG_ION=y CONFIG_ION_TEST=y CONFIG_ION_DUMMY=y +CONFIG_AUDIT=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_IP_NF_SECURITY=y +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +CONFIG_LSM_MMAP_MIN_ADDR=4096 +CONFIG_SECURITY_SELINUX=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_ADF=y CONFIG_ADF_FBDEV=y CONFIG_ADF_MEMBLOCK=y diff --git a/linaro/configs/audit.conf b/linaro/configs/audit.conf new file mode 100644 index 000000000000..19e21170b5db --- /dev/null +++ b/linaro/configs/audit.conf @@ -0,0 +1,9 @@ +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +CONFIG_INTEGRITY_AUDIT=y +CONFIG_IMA=y +CONFIG_EVM=y +CONFIG_AUDIT_GENERIC=y diff --git a/linaro/configs/debug.conf b/linaro/configs/debug.conf new file mode 100644 index 000000000000..36980566b2d8 --- /dev/null +++ b/linaro/configs/debug.conf @@ -0,0 +1 @@ +CONFIG_PROVE_LOCKING=y diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf index 00e59298e6a9..bd8e660c7f93 100644 --- a/linaro/configs/distribution.conf +++ b/linaro/configs/distribution.conf @@ -3,7 +3,7 @@ CONFIG_CGROUPS=y # CONFIG_COMPAT_BRK is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR_REGULAR=y CONFIG_SYN_COOKIES=y CONFIG_IPV6=y CONFIG_NETLABEL=y diff --git a/linaro/configs/gcov.conf b/linaro/configs/gcov.conf new file mode 100644 index 000000000000..2d1209d1cf55 --- /dev/null +++ b/linaro/configs/gcov.conf @@ -0,0 +1,3 @@ +CONFIG_GCOV_KERNEL=y +CONFIG_GCOV_PROFILE_ALL=y +CONFIG_GCOV_FORMAT_AUTODETECT=y diff --git a/linaro/configs/linaro-base-arm.conf b/linaro/configs/linaro-base-arm.conf new file mode 100644 index 000000000000..70f771bf2c47 --- /dev/null +++ b/linaro/configs/linaro-base-arm.conf @@ -0,0 +1,3 @@ +CONFIG_THUMB2_KERNEL=y +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set diff --git a/linaro/configs/linaro-base-arm64.conf b/linaro/configs/linaro-base-arm64.conf new file mode 100644 index 000000000000..4ce12fd20c03 --- /dev/null +++ b/linaro/configs/linaro-base-arm64.conf @@ -0,0 +1,3 @@ +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_HUGETLBFS=y 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 diff --git a/linaro/configs/linaro-base64.conf b/linaro/configs/linaro-base64.conf new file mode 120000 index 000000000000..a5af95de3e5a --- /dev/null +++ b/linaro/configs/linaro-base64.conf @@ -0,0 +1 @@ +linaro-base-arm64.conf
\ No newline at end of file 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 diff --git a/linaro/configs/uprobes.conf b/linaro/configs/uprobes.conf new file mode 100644 index 000000000000..a9617986284a --- /dev/null +++ b/linaro/configs/uprobes.conf @@ -0,0 +1,7 @@ +CONFIG_NAMESPACES=y +CONFIG_USER_NS=y +CONFIG_RELAY=y +CONFIG_KPROBES=y +CONFIG_UPROBE_EVENT=y +CONFIG_KPROBES_SANITY_TEST=y +CONFIG_ARM_KPROBES_TEST=m diff --git a/linaro/configs/xen.conf b/linaro/configs/xen.conf new file mode 100644 index 000000000000..d24fabbea076 --- /dev/null +++ b/linaro/configs/xen.conf @@ -0,0 +1,7 @@ +CONFIG_XEN=y +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y |