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>

diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 12daf619254418e59ab1afe01818a744fbf1f11e..ed2a8d86ee566a8e8b69e620d143968b188f937f 100644 (file)
--- 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 80bdf69fc5ff57f766c7c83a3d1cce5a0c4f6a77..c2f23b19f3c5887399d884c162ef0a8cb40ebc15 100644 (file)
--- 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 b8c74b8c750e18a7e3c404aa8a045781d417f244..2c6a13eb46c9d5e05a5adc1b73df39b158cac21d 100644 (file)
--- 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