merge of 60b47beac72c6f1f23514b42a309716b470d471b

     and a6f1ef5bbb3cac8192d0a7bc6d5c64b301e70463

5 files changed, 31 insertions, 17 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 33e655dcb6..7535f63a01 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,18 +2,19 @@
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
+DISTRO_NAME = "OpenSlug"
+DISTRO_VERSION = "2.4-beta"
+DISTRO_TYPE ?= "beta"
+
 # Add to the user's feeds from local.conf (there may be none)
-# not all available yet
-#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross"
-#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native"
-FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe"
+FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}"
+FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}"
+
 #
-# if you are very very brave:
-#FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable"
+# Uncomment the following to get the unstable feeds
+#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable"
+#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable"
 
-DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "2.2-beta"
-DISTRO_TYPE ?= "beta"
 
 TARGET_FPU_local ?= "soft"
 TARGET_FPU := "${TARGET_FPU_local}"
@@ -32,6 +33,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE
 
 OPENSLUG_EXTRA_DEPENDS  ?= "e2fsprogs reiserfsprogs upslug-native lrzsz"
 
+# CMDLINE* macros define the kernel command line.  CMDLINE_DEBUG is provided
+# to enable/disable debugging in the distro.  Here noirqdebug is used to
+# remove the messages about unhandled interrupts - people debugging interrupt
+# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
+CMDLINE_DEBUG = "noirqdebug"
+
 # Filesystem support modules are listed in here for easy removal,
 # as is the lrzsz serial package and other kernel modules which are
 # not absolutely required for boot.
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index a922d5b4da..7a39104c63 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -6,7 +6,6 @@ IPKG_ARCHS = "all arm armv4 armv5te"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
-#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo"
 
 XSERVER = "xserver-kdrive-omap"
 
@@ -26,17 +25,18 @@ ROOT_FLASH_SIZE = "123"
 EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
 
 # serial console port on devboard rev. B3
-SERIAL_CONSOLE = "115200 tts/0"
+#SERIAL_CONSOLE = "115200 tts/0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 
 #build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils  nokia770-init \
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils  nokia770-init \
 pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils  nokia770-init \
-pcmcia-cs apm  ppp wireless-tools udev-utils console-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils  nokia770-init \
+pcmcia-cs apm  ppp wireless-tools console-tools"
 
 # NFS Modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 1484ac191c..2ce73ac836 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -19,6 +19,14 @@ IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 PACKAGE_ARCH = "armeb"
 
+# Optimization settings.  Os works fine and is significantly
+# better than O2.  The other settings are somewhat arbitrary.
+# The optimisations chosen here include the ones which 'break'
+# symbolic debugging (because the compiler does not include
+# enough information to allow the debugger to know where given
+# values are.)
+FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"
 USE_VT = "0"
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf
index e33de0582e..22ade477e2 100644
--- a/conf/machine/tosa-2.4.conf
+++ b/conf/machine/tosa-2.4.conf
@@ -1,6 +1,7 @@
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
+
+BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \
 			    orinoco-modules sharp-sdmmc-support usbutils"
 BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
 			     kernel-module-evdev kernel-module-net-fd \
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 3ce5924d04..7b6761b250 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -27,8 +27,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
 # Infrared Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
                              kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-# PPP Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
 
 #USB Gadget Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \