aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-06-06 14:24:53 +0100
committerKevin Hilman <khilman@linaro.org>2015-05-12 16:02:10 -0700
commit6fe56a47f6cd9cec3e8797517ae57a72776f8d33 (patch)
treef14d6cabc1dbef44f5c62f556ef375348a14fd9c /linaro
parente6409e1aa07bc835b3b986c2aa71b83df50bdf22 (diff)
downloadlinux-linaro-stable-6fe56a47f6cd9cec3e8797517ae57a72776f8d33.tar.gz
configs: Make CONFIG_MODULES part of linaro-base
CONFIG_MODULE was in both Ubuntu and Android configs so it would be best if it is in the base config instead. Also, having CONFIG_MODULE_UNLOAD in will enable the Gator module to be upgraded to a later version via DKSM without rebooting, and allows for easier testing. Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'linaro')
-rw-r--r--linaro/configs/android.conf2
-rw-r--r--linaro/configs/linaro-base.conf2
-rw-r--r--linaro/configs/ubuntu.conf1
3 files changed, 2 insertions, 3 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 12daf6192544..ed2a8d86ee56 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -1,5 +1,3 @@
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
# CONFIG_THUMB2_KERNEL is not set
CONFIG_IPV6=y
# CONFIG_IPV6_SIT is not set
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 80bdf69fc5ff..c2f23b19f3c5 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -11,6 +11,8 @@ CONFIG_PERF_COUNTERS=y
CONFIG_SLAB=y
CONFIG_PROFILING=y
CONFIG_OPROFILE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
diff --git a/linaro/configs/ubuntu.conf b/linaro/configs/ubuntu.conf
index b8c74b8c750e..2c6a13eb46c9 100644
--- a/linaro/configs/ubuntu.conf
+++ b/linaro/configs/ubuntu.conf
@@ -1,6 +1,5 @@
# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y