summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/config/Config.in.fs3
-rw-r--r--target/linux/config/Config.in.kernel4
-rw-r--r--target/linux/kernel.config3
-rw-r--r--target/linux/patches/4.3/regmap-default-on.patch17
4 files changed, 5 insertions, 22 deletions
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 8bb630ee6..e148f75b2 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -8,7 +8,6 @@ config ADK_KERNEL_MISC_FILESYSTEMS
config ADK_KERNEL_FSNOTIFY
bool
- default y
config ADK_KERNEL_EXPORTFS
tristate
@@ -256,7 +255,7 @@ menu "Filesystem features"
config ADK_KERNEL_INOTIFY_USER
bool "Inotify support for userspace"
- default y
+ default n
help
Say Y here to enable inotify support for userspace, including the
associated system calls. Inotify allows monitoring of both files and
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 3f5768fbc..1310f0fd4 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -204,6 +204,10 @@ config ADK_KERNEL_UEVENT_HELPER_PATH
default "/sbin/mdev"
depends on ADK_RUNTIME_DEV_MDEV
+config ADK_KERNEL_BINFMT_ELF
+ bool
+ default y if ADK_TARGET_BINFMT_ELF
+
config ADK_KERNEL_BINFMT_ELF_FDPIC
bool
default y if ADK_TARGET_BINFMT_FDPIC
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index a291279c3..c32c4ce66 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -6,15 +6,12 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_PROC_FS=y
CONFIG_PROC_SYSCTL=y
-CONFIG_FILE_LOCKING=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_NLS=y
CONFIG_EMBEDDED=y
CONFIG_MODULES=y
-CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_SCRIPT=y
-CONFIG_STANDALONE=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
diff --git a/target/linux/patches/4.3/regmap-default-on.patch b/target/linux/patches/4.3/regmap-default-on.patch
deleted file mode 100644
index 8d72224bf..000000000
--- a/target/linux/patches/4.3/regmap-default-on.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur linux-4.1.6.orig/drivers/base/regmap/Kconfig linux-4.1.6/drivers/base/regmap/Kconfig
---- linux-4.1.6.orig/drivers/base/regmap/Kconfig 2015-08-17 05:52:51.000000000 +0200
-+++ linux-4.1.6/drivers/base/regmap/Kconfig 2015-08-29 22:18:50.329683337 +0200
-@@ -3,7 +3,7 @@
- # subsystems should select the appropriate symbols.
-
- config REGMAP
-- default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
-+ default y
- select LZO_COMPRESS
- select LZO_DECOMPRESS
- select IRQ_DOMAIN if REGMAP_IRQ
-@@ -29,3 +29,4 @@
-
- config REGMAP_IRQ
- bool
-+ default y