merge of '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'

     and '350557edbea2aa55107ce4c0e4dffc849b7e2307'

19 files changed, 97 insertions, 64 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9f94bae3f5..2e3cb0f980 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -239,6 +239,12 @@ export MAKE = "make"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 ##################################################################
+# Patch handling.
+##################################################################
+PATCHTOOL = 'quilt'
+PATCHRESOLVE = 'user'
+
+##################################################################
 # Build flags and options.
 ##################################################################
 
@@ -336,12 +342,6 @@ SRC_URI = "file://${FILE}"
 MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
 MKTEMPCMD = "mktemp -q ${TMPBASE}"
 
-# Program to be used to patch sources, use 'inherit patcher' to overwrite this:
-
-PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
-PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push"
-PATCH_DEPENDS = "quilt-native"
-
 # GNU patch tries to be intellgent about checking out read-only files from
 # a RCS, which freaks out those special folks with active Perforce clients
 # the following makes patch ignore RCS:
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 327d4123cc..876975b875 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -14,8 +14,6 @@ require conf/distro/include/sane-srcdates.inc
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
-#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
-
 
 FEED_URIS += " \
 		base##${ANGSTROM_URI}/unstable/feed/base \
@@ -29,6 +27,9 @@ FEED_URIS += " \
 
 #SRCDATE = "20060630"
 #SRCDATE_handhelds-pxa-2.6 = "20060622"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5"
+
+
 SRCDATE_gconf-dbus = "20060719"
 SRCDATE_gnome-vfs-dbus = "20060803"
 
@@ -52,6 +53,8 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 
 PREFERRED_VERSION_fontconfig = "2.3.95"
 PREFERRED_VERSION_freetype = "2.2.1"
+#fix screen corruption issues
+PREFERRED_VERSION_cairo = "1.2.2"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -59,7 +62,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
-PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
@@ -90,9 +93,10 @@ PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
 
 # Others:
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf ?= gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs
-PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
 PREFERRED_PROVIDER_ntp = "ntp"
 PREFERRED_PROVIDER_hotplug = "udev"
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 6ae4e9ddc3..8041ca8fb6 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -55,6 +55,12 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 require conf/distro/include/sane-srcdates.inc
+PREFERRED_VERSION_busybox ?= "1.00"
+
+#
+# GlibC
+#
+PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 
 #
 # Opie
@@ -72,6 +78,7 @@ require conf/distro/include/preferred-opie-versions.inc
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 5ff9e1c942..7d125ae25b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -9,7 +9,7 @@ DISTRO_NAME = "Angstrom"
 ANGSTROM_URI = "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
-MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>"
+MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 
 #use ipkg package format with debian style naming
 #use multimachine buildrules 
@@ -35,10 +35,8 @@ BUILD_OPTIMIZATION = "-Os"
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
 #ARM EABI is softfloat by default, but let's make sure :)
-TARGET_FPU_arm = "soft"
-
-#Always ship these packages
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
+#make it overridable for platforms with FPU, like ep93xx or i.mx31
+TARGET_FPU_arm ?= "soft"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
@@ -48,4 +46,4 @@ DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
 
 # We want images supporting the following features (for task-base)
-DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc
index c7f2a05177..ea360f5dc5 100644
--- a/conf/distro/include/familiar.inc
+++ b/conf/distro/include/familiar.inc
@@ -17,4 +17,4 @@ UDEV_DEVFS_RULES = "1"
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
 
 # We want images supporting the following features (for task-base)
-DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/maemo-preferred.inc b/conf/distro/include/maemo-preferred.inc
index 943f244326..3b31837911 100644
--- a/conf/distro/include/maemo-preferred.inc
+++ b/conf/distro/include/maemo-preferred.inc
@@ -5,6 +5,6 @@ PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
 PREFERRED_PROVIDER_esd = "osso-esd"
 PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
 PREFERRED_VERSION_glib-2.0 = "2.6.4"
-PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_pango = "1.8.2"
 PREFERRED_VERSION_atk = "1.9.0"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
\ No newline at end of file
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
index 01877956ed..ea408ff221 100644
--- a/conf/distro/include/openzaurus.inc
+++ b/conf/distro/include/openzaurus.inc
@@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4"
 INHERIT += "sanity"
 
 # We want images supporting the following features (for task-base)
-DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
index 3bbc6be01a..256bc0103f 100644
--- a/conf/distro/include/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
@@ -19,6 +19,7 @@ PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
 PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.3"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.97"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 36702025c1..56d9c5b059 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -20,9 +20,9 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.109"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 180ca47b17..e78888a02c 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -17,6 +17,7 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 #PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 #PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 #PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_pango ?= "1.8.2"
 #PREFERRED_VERSION_gtk+ ?= "2.6.3"
 #PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 #PREFERRED_VERSION_libgpewidget ?= "0.97"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index e668c3ce38..76e68fcc08 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -53,19 +53,13 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
 PREFERRED_VERSION_glibc = "2.4"
 PREFERRED_VERSION_glibc-intermediate = "2.4"
 
-
-#<>------------------------------------------------------------------>
-#<>Setting Preferred glib, dbus, db-native
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_glib-2.0-native = "2.6.5"
-PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.12.0"
-PREFERRED_VERSION_glib-1.2 = "1.2.10"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_dbus = "0.61"
-PREFERRED_VERSION_dbus-native = "0.61"
-PREFERRED_PROVIDER_dbus-glib = "dbus"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
+#<>----------------------------------------------------------------->
+#<>Patch for bitbake bug:
+#<>Due to bitbake not grabbing glibc 2.4  properly 
+#<>we need to override it to be sure. Do it for both supported archs
+#<>-----------------------------------------------------------------<
+PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
 
 #<>------------------------------------------------------------------>
@@ -110,17 +104,6 @@ require conf/distro/include/preferred-opie-versions.inc
 
 
 #<>------------------------------------------------------------------>
-#<> Lets decide on a GPE versipns
-#<> And lets override GTK to something that builds
-#<>------------------------------------------------------------------<
-require conf/distro/include/preferred-gpe-versions-2.7.inc
-PREFERRED_VERSION_gtk+ = "2.8.16"
-PREFERRED_VERSION_pango = "1.12.0"
-PREFERRED_VERSION_cairo = "1.2.2"
-PREFERRED_VERSION_gtk-engines = "2.7.4"
-
-
-#<>------------------------------------------------------------------>
 #<> We want pcmciautils, not pcmcia-cs
 #<>------------------------------------------------------------------<
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index fb06ca7f47..71690ac62f 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -8,10 +8,11 @@ TARGET_FPU ?= "soft"
 
 # 2.4 vs 2.6 is a distro decision.
 MODUTILS = "26"
-BOOTSTRAP_EXTRA_RDEPENDS += "udev"
 
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
+PREFERRED_PROVIDER_hotplug = "udev"
+
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
new file mode 100644
index 0000000000..68b754f2d3
--- /dev/null
+++ b/conf/machine/dht-walnut.conf
@@ -0,0 +1,20 @@
+TARGET_ARCH = "powerpc"
+IPKG_ARCHS = "all powerpc ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-dht-walnut"
+
+#TARGET_FPU = "soft"
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.9"
+
+# TARGET_VENDOR = "-oe"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev"
+
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.5"
+# GLIBC_ADDONS = "nptl"
+# GLIBC_EXTRA_OECONF = "--with-tls"
+
+
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 0261a84d64..5c7440403b 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -6,6 +6,7 @@ TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "ipaqsa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
+PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42"
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
 BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
 
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 32e9304cdb..008bfb252f 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -2,8 +2,8 @@
 #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
+#KERNEL ?= "kernel24"
+KERNEL ?= "kernel26"
 
 OVERRIDES =. "${KERNEL}:"
 
@@ -12,12 +12,14 @@ INHERIT += "linux_modules"
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
 ROOT_FLASH_SIZE = "32"
 
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
+
 BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
index ce1d4f7203..31fe8868ca 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.conf
@@ -1,5 +1,5 @@
 # For gcc 3.x you need:
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:
-#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
 PACKAGE_ARCH = "armv5te"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index d6281e3016..84380a49d0 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -21,6 +21,9 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 IMAGE_FSTYPES ?= "jffs2"
 
 MODUTILS = "26"	
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda wifi usbgadget"
+
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
@@ -39,10 +42,10 @@ include conf/machine/include/handheld-common.conf
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-#include conf/machine/include/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-include conf/machine/include/tune-iwmmxt.conf
+#include conf/machine/include/tune-iwmmxt.conf
 
 
 # These modules are now compiled into the kernel:
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index a2c01add5d..fc17985233 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -5,22 +5,26 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv5te"
 
+HOTPLUG = "udev"
+
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020"
-#PREFERRED_VERSION_linux-omap1 = "2.6.17-omap1"
-PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
+
+# Use current git until I can find a git tag that builds for omap5912osk
+PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
+#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 # PCMCIA Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
 # IDE modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
@@ -29,9 +33,9 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
 # Video er LCD Driver
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
 # DSP Interface
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
 
 include conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf
new file mode 100644
index 0000000000..aec2a8f726
--- /dev/null
+++ b/conf/machine/rb500.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Mikrotik RB500
+#@DESCRIPTION: Machine configuration for the MIPS based Routerboard
+
+TARGET_ARCH = "mipsel"
+TARGET_CC_ARCH = "-Os -mips2"
+IPKG_ARCHS = "all mipsel ${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"