LINARO: Enable CONFIG_THUMB2_KERNEL for OMAP[34]

Signed-off-by: John Rigby <john.rigby@linaro.org>

7 files changed, 10 insertions, 16 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 12d0480000b9..38765dc2d174 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -8,6 +8,7 @@ linux-linaro (2.6.38-1000.2) UNRELEASED; urgency=low
     Linux v2.6.38-rc6 -- same
     linaro-linux-2.6.38-upstream-1Mar2011 -- new
     Ubuntu-2.6.38-5.32 -- same
+  * Enable CONFIG_THUMB2_KERNEL for OMAP[34]
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 01 Mar 2011 14:11:33 -0700
 
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 2500394bc5ae..290bab806337 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -223,7 +223,6 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEYS=y
 # CONFIG_KGDB is not set
-# CONFIG_KPROBES is not set
 # CONFIG_KS8851_MLL is not set
 # CONFIG_L2TP is not set
 # CONFIG_LAPB is not set
@@ -448,6 +447,7 @@ CONFIG_STE10XP=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
+# CONFIG_THUMB2_KERNEL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 CONFIG_TPS65010=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 51859a5eea2b..f9ac9b1232d7 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -154,7 +154,6 @@ CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
 # CONFIG_FIXED_PHY is not set
 CONFIG_FONTS=y
-CONFIG_FPE_NWFPE=y
 CONFIG_FREEZER=y
 CONFIG_FSCACHE=m
 CONFIG_FTL=m
@@ -242,7 +241,6 @@ CONFIG_KEYBOARD_SUNKBD=m
 CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KEYS=y
 CONFIG_KGDB=y
-CONFIG_KPROBES=y
 CONFIG_KS8851_MLL=m
 CONFIG_L2TP=m
 CONFIG_LAPB=m
@@ -377,7 +375,6 @@ CONFIG_NOP_USB_XCEIV=y
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=4
 CONFIG_NTFS_FS=m
-CONFIG_OABI_COMPAT=y
 CONFIG_OCFS2_FS=m
 CONFIG_OC_ETM=y
 CONFIG_OMFS_FS=m
@@ -510,6 +507,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_THERMAL=m
+CONFIG_THUMB2_KERNEL=y
 CONFIG_TIMER_STATS=y
 CONFIG_TIPC=m
 CONFIG_TOUCHSCREEN_88PM860X=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index ee868ab08755..547683574396 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -228,7 +228,6 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEYS=y
 # CONFIG_KGDB is not set
-# CONFIG_KPROBES is not set
 # CONFIG_KS8851_MLL is not set
 # CONFIG_L2TP is not set
 # CONFIG_LAPB is not set
@@ -474,6 +473,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
+# CONFIG_THUMB2_KERNEL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 # CONFIG_TOUCHSCREEN_88PM860X is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 0a7a9af0a195..d5aabe03d196 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -233,7 +233,6 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KEYS=y
 # CONFIG_KGDB is not set
-# CONFIG_KPROBES is not set
 # CONFIG_KS8851_MLL is not set
 # CONFIG_L2TP is not set
 # CONFIG_LAPB is not set
@@ -490,6 +489,7 @@ CONFIG_STE10XP=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
+# CONFIG_THUMB2_KERNEL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 # CONFIG_TOUCHSCREEN_88PM860X is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 0bfd2a68eba1..cdaf6de33df9 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -146,7 +146,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_FONTS is not set
-# CONFIG_FPE_NWFPE is not set
 CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
@@ -231,7 +230,6 @@ CONFIG_JFFS2_FS=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYS is not set
 # CONFIG_KGDB is not set
-# CONFIG_KPROBES is not set
 # CONFIG_KS8851_MLL is not set
 # CONFIG_L2TP is not set
 # CONFIG_LAPB is not set
@@ -466,6 +464,7 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
+# CONFIG_THUMB2_KERNEL is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 # CONFIG_TUN is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 3adfe9da8fb1..b27d3775da8f 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -166,6 +166,7 @@ CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
+CONFIG_ARM_ASM_UNIFIED=y
 # CONFIG_ARM_CHARLCD is not set
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 # CONFIG_ARM_ERRATA_458693 is not set
@@ -801,7 +802,7 @@ CONFIG_FONT_ACORN_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_NWFPE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
@@ -1351,9 +1352,7 @@ CONFIG_KGDB_KDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS is not set
 CONFIG_KINGSUN_DONGLE=m
-# CONFIG_KPROBES_SANITY_TEST is not set
-CONFIG_KPROBE_EVENT=y
-CONFIG_KRETPROBES=y
+# CONFIG_KPROBES is not set
 CONFIG_KS8842=m
 CONFIG_KS8851=m
 CONFIG_KS959_DONGLE=m
@@ -1776,7 +1775,6 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_TCINDEX=m
 # CONFIG_NET_CLS_U32 is not set
-# CONFIG_NET_DCCPPROBE is not set
 CONFIG_NET_DMA=y
 # CONFIG_NET_DROP_MONITOR is not set
 CONFIG_NET_DSA_MV88E6060=y
@@ -1814,8 +1812,6 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCTPPROBE=m
-# CONFIG_NET_TCPPROBE is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NFC_DEVICES is not set
 CONFIG_NFSD_DEPRECATED=y
@@ -2599,7 +2595,7 @@ CONFIG_TEXTSEARCH_FSM=m
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_THERMAL_HWMON=y
 CONFIG_THRUSTMASTER_FF=y
-# CONFIG_THUMB2_KERNEL is not set
+CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIDSPBRIDGE is not set
 CONFIG_TIMB_DMA=m