rendered paste bodydiff --git a/conf/distro/include/sane-feed.inc b/conf/distro/include/sane-feed.inc
index 5bc19a1..5670808 100644
--- a/conf/distro/include/sane-feed.inc
+++ b/conf/distro/include/sane-feed.inc
@@ -159,12 +159,12 @@ FEED_ARCH_htcwallaby = "arm-oabi"
FEED_ARCH_jornada56x = "arm-oabi"
FEED_ARCH_jornada7xx = "arm-oabi"
FEED_ARCH_shark = "arm-oabi"
-FEED_ARCH_simpad = "arm-oabi"
+FEED_ARCH_simpad = "armv4"
# Tweak packaging for strongarm machines since they can't use EABI
PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+#PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index c98234f..ad015c4 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -157,7 +157,7 @@ def detect_arm_abi (d):
def compute_os_portion_of_target_triplet (d):
import bb
arm_eabi_supporting_arches = "armv6 armv6-novfp \
- armv5te iwmmxt armv7a armv7 armv5teb armv4t"
+ armv5te iwmmxt armv7a armv7 armv5teb armv4t armv4"
ppc_spe_supporting_arches = "ppce500v2 ppce500"
gnu_suffix = ""
if bb.data.getVar('LIBC', d, 1) == "uclibc":
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index 2a583fe..343dc5d 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -2,8 +2,8 @@
# gcc does not differentiate between the different Strongarm versions, so neither do we
# http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
-ARM_ABI = "oabi"
+#ARM_ABI = "oabi"
TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
-FEED_ARCH = "arm-oabi"
-PACKAGE_BASE_ARCH = "armv4"
-PACKAGE_EXTRA_ARCHS += "armv4 "
+FEED_ARCH = "armv4"
+BASE_PACKAGE_ARCH = "armv4"
+PACKAGE_EXTRA_ARCHS += "armv4"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 5e89292..98ea1a9 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -22,3 +22,6 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
USE_VT = "0"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+MKUBIFS_ARGS = "-m 1 -e 130944 -c 178"
+UBINIZE_ARGS = "-m 1 -p 128KiB"