diff --git a/target/linux/iop32x/config-2.6.21 b/target/linux/iop32x/config-2.6.21
index 361c593f3a791d7ed08a865397454bad910afd9b..b98c804911622a3c973ce83505c5fc60430c88df 100644
--- a/target/linux/iop32x/config-2.6.21
+++ b/target/linux/iop32x/config-2.6.21
@@ -1,5 +1,5 @@
 # CONFIG_8139TOO is not set
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APM is not set
 # CONFIG_ARCH_AAEC2000 is not set
@@ -89,7 +89,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_FARSYNC is not set
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE is not set
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_HAMRADIO is not set
@@ -253,6 +253,7 @@ CONFIG_NETDEV_1000=y
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NVRAM is not set
+# CONFIG_OABI_COMPAT is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
 CONFIG_PATA_ARTOP=m
diff --git a/toolchain/Config.in b/toolchain/Config.in
index eae12d95b6231cd394e728dc494ac49808afcdfa..64e4372b111db7767829403f1c19d20e748de5e8 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -54,7 +54,7 @@ config TARGET_OPTIMIZATION
 	default "-O2 -pipe -march=i486 -funit-at-a-time" if TARGET_x86
 	default "-Os -pipe -march=i486 -funit-at-a-time" if TARGET_rdc
 	default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if mipsel || mips
-	default "-Os -pipe -mabi=aapcs-linux -march=armv5te -mtune=xscale -funit-at-a-time" if armeb
+	default "-Os -pipe -mabi=aapcs-linux -march=armv5te -mtune=xscale -funit-at-a-time" if armeb || arm
 	default "-Os -pipe -funit-at-a-time"
 	help
 	  Optimizations to use when building for the target host.