merge of '2f655855e9cd21f0db11577a04d65162273a4b1c'

     and '7754c88af17176a35aedbbe47eeab2d9d5d7774b'

8 files changed, 53 insertions, 39 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index dcdc18c322..36e1287d03 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -422,7 +422,7 @@ require conf/sanity.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
-MACHINE_TASK_PROVIDER ?= "task-bootstrap"
+MACHINE_TASK_PROVIDER ?= "task-base"
 IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 59ef9d3f4e..11c4ce7dca 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "26"
+DISTRO_REVISION = "28"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -70,6 +70,7 @@ FEED_URIS += " \
 #SRCDATE = "20061029"
 
 PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8"
+PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
 
 
@@ -94,6 +95,10 @@ PREFERRED_VERSION_freetype = "2.2.1"
 #fix screen corruption issues
 PREFERRED_VERSION_cairo = "1.3.10"
 
+#work around a segfault in gcc for armv4t
+PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
+PREFERRED_VERSION_glib-2.0_h6300  = "2.12.3"
+
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 0bcdac1db5..2904db1108 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug"
 SLUGOS_IMAGESEX  = "little-endian"
 
 # debianslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "nslu2"
+SLUGOS_FLASH_IMAGE = "1"
 
 # NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see debianslug-packages.conf in this
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index dec16d8cd7..8634d091f0 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug"
 SLUGOS_IMAGESEX  = "big-endian"
 
 # openslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "nslu2"
+SLUGOS_FLASH_IMAGE = "1"
 
 # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see ucslugc-packages.conf in this
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 08104624ca..37f61433c7 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -4,17 +4,21 @@
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
 
-HANDHELD_MODULES = ""
+# Set preferred providers
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
 
-BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+# Set features for task-base
+MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen"
 
-INHERIT += "linux-kernel-base"
+# Empty modules list for now
+HANDHELD_MODULES = ""
 
+# Some extra configuration
+VOLATILE_STORAGE_SIZE = "64"
+ROOT_FLASH_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
+SERIAL_CONSOLE = "115200 ttySAC2 vt100"
+USE_VT = "0"
 
diff --git a/conf/machine/blueangel.conf b/conf/machine/htcblueangel.conf
index dd079c244b..a61656ab5c 100644
--- a/conf/machine/blueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -2,23 +2,39 @@
 #@NAME: HTC Blueangel
 #@DESCRIPTION: Machine configuration for the HTC Blueangel device
 
-KERNEL ?= "kernel26"
-
-OVERRIDES =. "${KERNEL}:"
-
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6"
-PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "128"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
-BA_MODULES_kernel26 = " evdev tsdev himalaya_tsc2200 himalaya_ts3 asic3_mmc mmc_core g_ether blueangel_battery \
-                        pcmcia-core hci_uart blueangel_pcmcia snd-mixer-oss blueangel_audio blueangel_rom blueangel_kp"
-# pxa2xx_udc is built in to the kernel
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RRECOMMENDS = "blueangel_pcmcia \
+			     blueangel_audio \
+			     blueangel_rom \
+			     blueangel_kp
+			     blueangel_battery \
+			     blueangel_leds \
+                            "
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
 module_autoload_evdev             = "evdev"
 module_autoload_himalaya_tsc2200  = "himalaya_tsc2200"
 module_autoload_himalaya_ts3      = "himalaya_ts3"
@@ -30,14 +46,9 @@ module_autoload_blueangel_audio   = "blueangel_audio"
 module_autoload_bluenagel_leds    = "bleangel_leds"
 module_autoload_hci_uart          = "hci_uart"
 module_autoload_snd-mixer-oss     = "snd-mixer-oss"
-module_autoload_snd-pcm-oss       = "snd-pcm-oss"
 
-SERIAL_CONSOLE = "115200 tts/2 vt100"
 
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-GUI_MACHINE_CLASS = "smallscreen"
-ROOT_FLASH_SIZE = "32"
-
-# optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
deleted file mode 100644
index f3591b4b75..0000000000
--- a/conf/machine/include/tosa-2.6.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-include conf/machine/include/zaurus-2.6.conf
-# wlan-ng Modules
-MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
-
-# WM97xx Modules
-#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf
index 2a12443b3d..48003571f1 100644
--- a/conf/machine/include/tune-thumb.conf
+++ b/conf/machine/include/tune-thumb.conf
@@ -23,8 +23,8 @@ OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
 #    Compiler and linker options for application code and kernel code.  These
 #    options ensure that the compiler has the correct settings for the selected
 #    instruction set and interworking.
-ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+ARM_INTERWORK_M_OPT = "${@['', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+ARM_THUMB_M_OPT = "${@['', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
 
 #
 TARGET_CC_ARCH +=  "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"