aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-11-07 15:37:28 +0000
committerMark Brown <broonie@linaro.org>2014-05-22 11:01:48 +0100
commitbadd1c2dfd7122be1d5b9f0cb0f6898c290c4ba4 (patch)
treec303985d1a6d320d51a862bfa58789398a1bd89d
parent46569984a65de91d9b2e570fea54d4c8a443a4c7 (diff)
configs: linaro-base: set CONFIG_AEABI=y
We already have CONFIG_THUMB2_KERNEL=y which also selects CONFIG_AEABI however if someone wanted to disable Thumb2 for debugging or other reasons then they may try simply removing the Thumb2 config entry. This however would then default to the old ABI and it seems there are some obscure bugs in this little tested kernel variant. So, to save wasting people's time let's make sure CONFIG_AEABI is explicitly selected. As we are adding this to linaro-base.conf we can remove it from android.conf (which probably had it as a leftover from when we had Thumb2 disabled). Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--linaro/configs/android.conf1
-rw-r--r--linaro/configs/linaro-base.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 1518036668c8..4bc2150be179 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -6,7 +6,6 @@ CONFIG_WAKELOCK=y
CONFIG_USER_WAKELOCK=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_DM_CRYPT=y
-CONFIG_AEABI=y
CONFIG_POWER_SUPPLY=y
CONFIG_ANDROID_PARANOID_NETWORK=y
CONFIG_NET_ACTIVITY_STATS=y
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index a0fa9d59c20b..9269c8e66564 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -19,6 +19,8 @@ CONFIG_SMP=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_SMT=y
CONFIG_THUMB2_KERNEL=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_IDLE=y