diff --git a/architecture/arm/config.in b/architecture/arm/config.in
index f44ea2f..a03fe60 100644
--- a/architecture/arm/config.in
+++ b/architecture/arm/config.in
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: architecture/arm/config.in
+# Copyright (C) 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -56,6 +57,74 @@ choice SDECFG_ARM_OPT generic   \
 	arm1020t       "arm1020t CPU" \
 	xscale         "xscale CPU"
 
+if [ $SDECFG_ARM_OPT == generic ] ; then
+	choice SDECFG_ARM_ABI aapcs-linux \
+		aapcs		"EABI with variable size enums" \
+		aapcs-linux	"EABI with standard Linux 32 bit (int) enums" \
+		apcs-gnu	"OABI (old ABI)" \
+		atpcs		"Thumb ABI" \
+		iwmmxt		"Intel XScale MMX extensions"
+
+	choice SDECFG_ARM_ENDIANESS little-endian \
+		little-endian	"little-endian" \
+		big-endian	"big-endian"
+
+	choice SDECFG_ARM_ARCH armv5 \
+		armv2		"ARMv2" \
+		armv2a		"ARMv2a" \
+		armv3		"ARMv3" \
+		armv3m		"ARMv3m" \
+		armv4		"ARMv4" \
+		armv4t		"ARMv4t" \
+		armv5		"ARMv5" \
+		armv5t		"ARMv5t" \
+		armv5e		"ARMv5e" \
+		armv5te		"ARMv5te" \
+		armv6		"ARMv6" \
+		armv6j		"ARMv6j" \
+		armv6t2		"ARMv6t2" \
+		armv6z		"ARMv6z" \
+		armv6zk		"ARMv6zk" \
+		armv6-m		"ARMv6-m" \
+		armv7		"ARMv7" \
+		armv7-a		"ARMv7-a" \
+		armv7-r		"ARMv7-r" \
+		armv7-m		"ARMv7-m" \
+		iwmmxt		"IWMMXT" \
+		iwmmxt2		"IWMMXT2" \
+		ep9312		"EP9312"
+
+	choice SDECFG_ARM_MODE arm \
+		arm		"ARM mode" \
+		thumb		"Thumb mode"
+
+	choice SDECFG_ARM_FLOAT_ABI soft \
+		soft		"soft-float calling conventions" \
+		softfp		"hardware floating-point instructions using soft-float calling conventions" \
+		hard		"hardware floating-point instructions using FPU-specific calling conventions"
+
+	if [ $SDECFG_ARM_FLOAT_ABI == hard ]; then
+		choice SDECFG_ARM_FPU neon \
+			fpa		"fpa" \
+			fpe2		"fpe2" \
+			fpe3		"fpe3" \
+			fpv4-sp-d16	"fpv4-sp-d16" \
+			neon		"neon" \
+			neon-fp16	"neon-fp16" \
+			neon-vfpv4	"neon-vfpv4" \
+			maverick	"maverick" \
+			vfp		"vfp" \
+			vfpv3		"vfpv3" \
+			vfpv3-fp16	"vfpv3-fp16" \
+			vfpv3-d16	"vfpv3-d16" \
+			vfpv3-d16-fp16	"vfpv3-d16-fp16" \
+			vfpv3xd		"vfpv3xd" \
+			vfpv3xd-fp16	"vfpv3xd-fp16" \
+			vfpv4		"vfpv4" \
+			vfpv4-d16	"vfpv4-d16"
+	fi
+fi
+
 bool 'Generate code using the 16bit thumb instruction set' SDECFG_ARM_THUMB 0
 
 if [ $SDECFG_ARM_OPT != generic ] ; then