LINARO: CONFIG: Enable CONFIG_THUMB2_KERNEL

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

6 files changed, 6 insertions, 16 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 7eaff8173c9..85a3883a463 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -126,7 +126,6 @@ CONFIG_ISO9660_FS=m
 # CONFIG_KEXEC is not set
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYS=y
-# CONFIG_KPROBES is not set
 # CONFIG_KS8851_MLL is not set
 # CONFIG_LBDAF is not set
 # CONFIG_LEDS_LP5521 is not set
@@ -172,7 +171,6 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_DEFAULT="cp437"
 CONFIG_NLS_UTF8=y
 CONFIG_NO_HZ=y
-# CONFIG_OABI_COMPAT is not set
 CONFIG_PACKET=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARTITION_ADVANCED is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index cff7484f1d3..e177fb3af50 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -81,7 +81,6 @@ CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FONTS=y
-CONFIG_FPE_NWFPE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FTRACE=y
 # CONFIG_FUSE_FS is not set
@@ -159,7 +158,6 @@ CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYS=y
-CONFIG_KPROBES=y
 CONFIG_KS8851_MLL=y
 CONFIG_LBDAF=y
 # CONFIG_LEGACY_PTYS is not set
@@ -213,7 +211,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=2
-CONFIG_OABI_COMPAT=y
 CONFIG_PACKET=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PARTITION_ADVANCED=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 0a501fa38e2..0cfa89bdbab 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -77,7 +77,6 @@ CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FONTS is not set
-# CONFIG_FPE_NWFPE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FTRACE=y
 # CONFIG_FUSE_FS is not set
@@ -122,7 +121,6 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KPROBES is not set
 CONFIG_LBDAF=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -155,7 +153,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=2
-CONFIG_OABI_COMPAT=y
 # CONFIG_PACKET is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PARTITION_ADVANCED=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index a20853aadd8..62bdf34a4cc 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -79,7 +79,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FONTS is not set
-# CONFIG_FPE_NWFPE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FTRACE is not set
 # CONFIG_FUSE_FS is not set
@@ -126,7 +125,6 @@ CONFIG_KALLSYMS_ALL=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYS is not set
-# CONFIG_KPROBES is not set
 # CONFIG_LBDAF is not set
 CONFIG_LEDS_LP5521=y
 # CONFIG_LEGACY_PTYS is not set
@@ -163,7 +161,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=2
-CONFIG_OABI_COMPAT=y
 # CONFIG_PACKET is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARTITION_ADVANCED is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 8c69b488ba2..5697b7ae9e1 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -79,7 +79,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FONTS is not set
-# CONFIG_FPE_NWFPE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FTRACE=y
 # CONFIG_FUSE_FS is not set
@@ -152,7 +151,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_KEXEC is not set
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYS is not set
-# CONFIG_KPROBES is not set
 # CONFIG_KS8851_MLL is not set
 # CONFIG_LBDAF is not set
 CONFIG_LEGACY_PTYS=y
@@ -204,7 +202,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_UTF8 is not set
 # CONFIG_NO_HZ is not set
 CONFIG_NR_CPUS=4
-CONFIG_OABI_COMPAT=y
 CONFIG_PACKET=y
 CONFIG_PAGE_OFFSET=0x80000000
 # CONFIG_PARTITION_ADVANCED is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 5f70117122f..e392402fea1 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -103,6 +103,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_411920=y
@@ -539,10 +540,10 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FPE_FASTFPE is not set
+CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
@@ -882,6 +883,7 @@ CONFIG_KEYBOARD_TWL4030=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_KGDB is not set
+CONFIG_KPROBES=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 CONFIG_KPROBE_EVENT=y
 CONFIG_KRETPROBES=y
@@ -1228,6 +1230,7 @@ CONFIG_NOP_TRACER=y
 CONFIG_NO_IOPORT=y
 # CONFIG_NTFS_FS is not set
 # CONFIG_N_GSM is not set
+CONFIG_OABI_COMPAT=y
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OC_ETM is not set
 CONFIG_OMAP2_DSS=m
@@ -1762,7 +1765,8 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TEST_POWER is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THRUSTMASTER_FF is not set
-# CONFIG_THUMB2_KERNEL is not set
+CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
+CONFIG_THUMB2_KERNEL=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIMB_DMA is not set
 CONFIG_TIMERFD=y