6 files changed, 69 insertions, 42 deletions
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index a369eab0a3..fe3cdbc481 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -2,12 +2,12 @@
 #@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
 #@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i
 
-require conf/machine/include/motorola-ezx.conf
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
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/h3900.conf b/conf/machine/h3900.conf
index f00dc9eb96..323aa8f061 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -1,37 +1,34 @@
 #@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx
-
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-INHERIT += "linux-kernel-base"
-
-OVERRIDES =. "${KERNEL}:"
+#@NAME: HP iPAQ h39xx
+#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6"
-EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 
-ROOT_FLASH_SIZE = "32"
+require conf/machine/include/tune-xscale.conf
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
 
-H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core"
-# 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"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
 
-USE_DEVFS_kernel24 = "1"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-
-GUI_MACHINE_CLASS = "smallscreen"
-
-# not using tune-xscale so as to retain backwards compatibility
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/blueangel.conf b/conf/machine/htcblueangel.conf
index dd079c244b..dd079c244b 100644
--- a/conf/machine/blueangel.conf
+++ b/conf/machine/htcblueangel.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
new file mode 100644
index 0000000000..48003571f1
--- /dev/null
+++ b/conf/machine/include/tune-thumb.conf
@@ -0,0 +1,32 @@
+#tune file for thumb instructions
+
+ARM_INSTRUCTION_SET ?= "arm"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK ?= "no"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+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 = "${@['', '-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}"
+TARGET_CC_KERNEL_ARCH  += "-mno-thumb"
+