merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

and 'db976a98427dd6a195e2cf167e225de2d0206aea'
author: Marcin Juszkiewicz <hrw@openembedded.org> 2007-08-09 08:41:19 +0000
committer: Marcin Juszkiewicz <hrw@openembedded.org> 2007-08-09 08:41:19 +0000
commit: 9d829ed05c295df608b4fc108eb1c628fd06fd39 (patch)
tree: c1b27cfe4498f8abef1a61325922906f3e6a32ff /conf/machine
parent: 1434b204e16e87b7f59f074f3036d5dcbcf0116f (diff)
parent: 6ccac10beeaaa02a86081bd6179fd57c208ad6b1 (diff)
118 files changed, 1463 insertions, 286 deletions
diff --git a/conf/machine/a1200.conf b/conf/machine/a1200.conf
index 3914d0e8f4..f2ce2b6bf5 100644
--- a/conf/machine/a1200.conf
+++ b/conf/machine/a1200.conf
@@ -1,2 +1,5 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Motorola EZX A1200,\n*    because \
-of the similarities between A780 and A1200 series. Use MACHINE = \"a780\".\n*\n*\n')}"
+#@TYPE: Machine
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+
+require conf/machine/include/motorola-ezx-base.inc
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 1820569c2b..f2ce2b6bf5 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -2,36 +2,4 @@
 #@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
 #@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
 
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
-
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
-#cat /proc/mtd
-#dev:    size   erasesize  name
-#mtd0: 00020000 00008000 "Bootloader"
-#mtd1: 000e0000 00020000 "Kernel"
-#mtd2: 00580000 00020000 "VFM_Filesystem"
-#mtd3: 00020000 00020000 "Logo"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
-#the EZX phones need a userspace daemon to stop the BP from shutting down the phone 
-MACHINE_EXTRA_RDEPENDS += "opentapi"
-
-ROOT_FLASH_SIZE = "24"
-
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-
-# Opentapi needs to be started very early so we need the mux devices in static /dev
-IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
-                       files/device_table-ezx.txt"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
+require conf/machine/include/motorola-ezx-base.inc
diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf
index 4255769478..de450b14d1 100644
--- a/conf/machine/acern30.conf
+++ b/conf/machine/acern30.conf
@@ -13,7 +13,9 @@ require conf/machine/include/tune-arm920t.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
 
 #
diff --git a/conf/machine/adsp-bf537-stamp.conf b/conf/machine/adsp-bf537-stamp.conf
new file mode 100644
index 0000000000..2a8fd640e7
--- /dev/null
+++ b/conf/machine/adsp-bf537-stamp.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@Name: Analog Devices blackfin platfrom
+#@DESCRIPTION: ADSP-BF537 STAMP Board
+
+
+TARGET_ARCH = "bfin"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200"
+
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index fad73c53bf..de94f560f9 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
new file mode 100644
index 0000000000..adb8f23fa3
--- /dev/null
+++ b/conf/machine/alix.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Alix
+#@DESCRIPTION: Machine configuration for PC Engines Alix1c board
+#
+# http://pcengines.ch/alix1c.htm
+
+# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+TARGET_ARCH = "i686"
+
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+
+IMAGE_FSTYPES += "tar.gz"
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-modules \
+	"
diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
new file mode 100644
index 0000000000..6c159a5f0c
--- /dev/null
+++ b/conf/machine/asus620.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: Asus MyPal A620
+#@DESCRIPTION: Machine configuration for the Asus MyPal A620
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
index 85ca5d106a..7d8d8815f0 100644
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "64"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
new file mode 100644
index 0000000000..faa4785fb4
--- /dev/null
+++ b/conf/machine/at32stk1000.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@Name: Atmel STK1000 AVR32AP7000 Development Platform
+#@DESCRIPTION: Atmel STK1000 AVR32AP7000 Development Platform
+
+
+TARGET_ARCH = "avr32"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
new file mode 100644
index 0000000000..ad94420196
--- /dev/null
+++ b/conf/machine/at91sam9263ek.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9263EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
new file mode 100644
index 0000000000..b725831321
--- /dev/null
+++ b/conf/machine/atngw100.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Atmel ATNGW100 Network Gateway Kit 
+#@DESCRIPTION: Atmel ATNGW100 Network Gateway Kit
+
+TARGET_ARCH = "avr32"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
+
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 0d7e12e3cc..32d7a2cdca 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Axim x50/x50v/x51/x51v
-#@DESCRIPTION: Machine configuration for the Dell Axim x50/51(v) with a pxa27x CPU
+#@NAME: Axim x50/x51
+#@DESCRIPTION: Machine configuration for the Dell Axim x50/x51 with a pxa27x CPU
 
 #
 # Hardware-based properties
@@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "256"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen" # caveat: only "v" models are VGA
+MACHINE_GUI_CLASS ?= "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
diff --git a/conf/machine/aximx50v.conf b/conf/machine/aximx50v.conf
new file mode 100644
index 0000000000..2c84768498
--- /dev/null
+++ b/conf/machine/aximx50v.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: Axim x50v/x51v
+#@DESCRIPTION: Machine configuration for the Dell Axim x50v/x51v with a pxa27x CPU
+
+require conf/machine/aximx50.conf
+
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 098d0526f0..6862a8095f 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
 
 IMAGE_FSTYPES ?= "jffs2"
 
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index bfa8ace376..429463cc87 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -23,5 +23,4 @@ require conf/machine/include/tune-strongarm.conf
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index d8d9264699..063a68481a 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -17,8 +17,15 @@ SERIAL_CONSOLE ?= "38400 ttySA0"
 # used by opie-collections.inc
 ROOT_FLASH_SIZE ?= "32"
 
-EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
+# for NAND flash.
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
+	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+	-e 0x20000 -p; \
+	cd ${DEPLOY_DIR_IMAGE}; \
+	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
+	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
+	"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/db1200.conf b/conf/machine/db1200.conf
index efa45f6a2a..cbde602824 100644
--- a/conf/machine/db1200.conf
+++ b/conf/machine/db1200.conf
@@ -1,7 +1,6 @@
 # Alchemy db1200
 
 TARGET_ARCH = "mipsel"
-PACKAGE_ARCHS = "${TARGET_ARCH} ${MACHINE}"
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
@@ -13,3 +12,5 @@ TARGET_CC_ARCH="-march=mips32"
 FLASH_OFFSET="0xBC000000"
 #EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x10000 -q"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --pad=0x3C00000 -q"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost"
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index 468c2ebd7d..c7266fee00 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -21,5 +21,4 @@ SERIAL_CONSOLE = "115200 ttyS0"
 ROOT_FLASH_SIZE = "32"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 5acdb24ba6..0ca65b79a9 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -1,9 +1,11 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: DHT-Walnut Development Platform
 #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc405"
+PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
@@ -11,12 +13,14 @@ MACHINE_FEATURES = "kernel26 ext2"
 MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.12"
+OLDEST_KERNEL = "2.6.18"
 
-#tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+#don't try to access tty1
+USE_VT = "0"
 
+SERIAL_CONSOLE = "115200 ttyS0"
 
 
-SERIAL_CONSOLE = "115200 ttyS0"
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
 
diff --git a/conf/machine/e680.conf b/conf/machine/e680.conf
index c1cb10ca2a..f2ce2b6bf5 100644
--- a/conf/machine/e680.conf
+++ b/conf/machine/e680.conf
@@ -1,2 +1,5 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Motorola EZX E680,\n*    because \
-of the similarities between A780 and E680-clamshell series. Use MACHINE = \"a780\".\n*\n*\n')}"
+#@TYPE: Machine
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+
+require conf/machine/include/motorola-ezx-base.inc
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 2e3524c522..ca1a7be8ff 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -9,7 +9,6 @@ PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc603e"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #don't try to access tty1
 USE_VT = "0"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 912cbc5c77..32f59aabd1 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -6,7 +6,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 1497e303c4..5a3b5875a3 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -6,9 +6,14 @@ PACKAGE_EXTRA_ARCHS = "i386 i486"
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
 OLDEST_KERNEL = "2.6.5"
 
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_TASK_PROVIDER = "task-base"
+
 
 require conf/machine/include/tune-c3.conf
 
diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf
new file mode 100644
index 0000000000..7734461a03
--- /dev/null
+++ b/conf/machine/eteng500.conf
@@ -0,0 +1,37 @@
+#@TYPE: Machine
+#@NAME: Eten G500
+#@DESCRIPTION: Machine configuration for the Eten G500 PocketPC phone
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+# Samsung S3C2xxx CPU
+require conf/machine/include/tune-arm920t.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index f6b35d721b..4649fe130e 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
 #@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -9,30 +9,34 @@ PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
-MACHINE_EXTRA_RDEPENDS = ""
-
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
   kernel-module-gta01-pm-gsm \
-  kernel-module-gta01kbd "
-
-MACHINE_TASK_PROVIDER = "task-base"
-
-# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttySAC0"
+  kernel-module-gta01kbd \
+  kernel-module-s3cmci \
+  kernel-module-ext2 \
+  kernel-module-vfat \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-smdk2440 \
+  kernel-module-nls-iso8859-1 \
+  kernel-module-nls-cp437 \
+"
+
+# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
+#SERIAL_CONSOLE = "115200 ttySAC0"
 
 # used by some images
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
new file mode 100644
index 0000000000..c9e1e73814
--- /dev/null
+++ b/conf/machine/fic-gta02.conf
@@ -0,0 +1,41 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: FIC GTA02 (Neo1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
+
+# package machine specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+  kernel-module-gta01-pm-bt  \
+  kernel-module-gta01-pm-gps \
+  kernel-module-gta01-pm-gsm \
+  kernel-module-gta01kbd \
+  kernel-module-s3cmci \
+  kernel-module-ext2 \
+  kernel-module-vfat \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-smdk2440 \
+  kernel-module-nls-iso8859-1 \
+  kernel-module-nls-cp437 \
+"
+
+SERIAL_CONSOLE = "115200 ttySAC2"
+
+# used by some images
+ROOT_FLASH_SIZE = "256"
+
+# extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
+
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
+
+# tune for S3C24x0
+include conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf
new file mode 100644
index 0000000000..a909a0f43c
--- /dev/null
+++ b/conf/machine/fsg3be.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Freecom FSG-3 (big-endian)
+#@DESCRIPTION: Machine configuration for an FSG3 in big-endian mode
+
+TARGET_ARCH = "armeb"
+
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+
+MACHINE_ARCH = "ixp4xxbe"
+
+OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+# Match the vendor's latest kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "fsg3-kernel"
+PREFERRED_VERSION_fsg3-kernel = "2.6.18"
+KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
+PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
+
+require conf/machine/include/ixp4xx.conf
+
+# No room for jffs2 - the rootfs needs to be installed directly to disk
+IMAGE_FSTYPES = "tar.gz"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 11dbadacb8..1996a1603b 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -7,6 +7,7 @@ TARGET_ARCH = "i686"
 
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
 
 udevdir = "/dev"
 
diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf
index 36ed04e67b..510de49a3f 100644
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/gumstix.conf
@@ -1,24 +1,25 @@
+#@TYPE: Machine
+#@Name: Gumstix pxa2xx boards
+#@DESCRIPTION:  Gumstix pxa2xx boards
+
 TARGET_ARCH = "arm"
-TARGET_VENDOR = "-oe"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix"
-OLDEST_KERNEL = "2.6.15"
-MODUTILS = "26"
 
-require conf/machine/include/tune-xscale.conf
-TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale"
+OLDEST_KERNEL = "2.6.15"
 
-PACKAGE_ARCH = "arm"
+#Assume people have some gumstix extension boards 
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
 
-HOTPLUG = "udev"
-udevdir = "/dev"
-
 GUMSTIX_400MHZ = "y"
 
+# used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
+
+#don't try to access tty1
 USE_VT = "0"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-mmc kernel-module-usb kernel-module-fat kernel-module-bluetooth kernel-module-jfs udev lrzsz"
-PREFERRED_VERSION_task-bootstrap = "1.0unionroot"
+require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index e81dbdeaa9..131b6512e0 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -11,8 +11,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 require conf/machine/include/tune-xscale.conf
 
 VOLATILE_STORAGE_SIZE = "64"
-ROOT_FLASH_SIZE = "32"
-GUI_MACHINE_CLASS = "smallscreen"
+ROOT_FLASH_SIZE = "16"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 
 #
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 1a63643868..3afec8be27 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -10,13 +10,15 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
 
 # Set features for task-base
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen"
 
 
 # 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/h2200.conf b/conf/machine/h2200.conf
index 6c43e75625..ecaebb8535 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -14,9 +14,9 @@ require conf/machine/include/tune-xscale.conf
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "32"
-GUI_MACHINE_CLASS = "smallscreen"
-
-#Set features for task-base 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
 
 #
@@ -26,7 +26,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader"
+MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 #
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index a440078cb7..fe204f0be4 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -14,7 +14,9 @@ require conf/machine/include/tune-strongarm.conf
 ROOT_FLASH_SIZE = "16"
 # h3630 have 32Mb only
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget  screen"
 
 #
@@ -24,8 +26,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
                              kernel-module-micro"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 32b6a8ea8a..8612be2ddc 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
 
 #
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 9428b9ce11..c28e651b47 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -12,8 +12,10 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget  screen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
 # Software/packages selection
@@ -22,8 +24,12 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
-                             kernel-module-i2c-pxa"
+                             kernel-module-h4000-pcmcia \
+                             kernel-module-i2c-pxa \
+                             kernel-module-acx \
+                            "
 
 #
 # Modules autoload and other boot properties
@@ -32,6 +38,7 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_snd-h4000_audio = "snd-h4000_audio"
 module_autoload_g_ether = "g_ether"
+module_conf_acx = "blacklist acx"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 8645df3555..87cc4c6210 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen"
 
 #
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index ecc658982b..a44d2d328f 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -12,7 +12,9 @@ PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
 require conf/machine/include/tune-arm9tdmi.conf
 
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
new file mode 100644
index 0000000000..7cd36f16ae
--- /dev/null
+++ b/conf/machine/htcalpine.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: HTC Alpine
+#@DESCRIPTION: Machine configuration for the HTC Alpine
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
new file mode 100644
index 0000000000..b46ac688cc
--- /dev/null
+++ b/conf/machine/htcapache.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: HTC Apache
+#@DESCRIPTION: Machine configuration for the HTC Apache
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 77bb0b5639..5150b86b77 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "128"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
@@ -23,7 +25,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \
 			     kernel-module-blueangel_audio \
 			     kernel-module-blueangel_rom \
@@ -49,7 +51,7 @@ 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_conf_acx = "blacklist acx"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index d75a573f65..1edd224496 100644
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 
 #
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
new file mode 100644
index 0000000000..5fb2bb4cd4
--- /dev/null
+++ b/conf/machine/htcsable.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: HTC Sable
+#@DESCRIPTION: Machine configuration for the HTC Sable device
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
new file mode 100644
index 0000000000..ca77ec9c04
--- /dev/null
+++ b/conf/machine/htctornado.conf
@@ -0,0 +1,28 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: HTC Typhoon, HTC Tornado, HTC Hurricane
+#@DESCRIPTION: Machine configuration for the HTC Typhoon/Tornado/Hurricane GSM phones
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget"
+
+MACHINE_EXTRA_RDEPENDS = "alsa-state"
+
+# package gta01 specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+  kernel-module-ext2 \
+  alsa-state"
+
+# used by some images
+ROOT_FLASH_SIZE = "30"
+
+# extra jffs2 tweaks, not yet used
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+
+# cpu tuning
+include conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 485d90df7f..bd2e1439a5 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -14,8 +14,10 @@ require conf/machine/include/tune-xscale.conf
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #require conf/machine/include/tune-iwmmxt.conf
 
-GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone"
 
 #
 # Software/packages selection
@@ -35,20 +37,19 @@ MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
 				kernel-module-htcuniversal-acx \
 				kernel-module-acx \
                                 kernel-module-i2c-algo-bit \
-                                kernel-module-rtc-sa1100 \
-                                kernel-module-rtc-dev \
-                                kernel-module-rtc-proc \
-                                kernel-module-rtc-sysfs \
+                                kernel-module-htcuniversal-ts2 \
+                                kernel-module-ts-adc-debounce \
 				"
 
 #
 # Modules autoload and other boot properties
 #
-#module_autoload_acx = "acx"
+module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
+module_autoload_htcuniversal-ts2 = "htcuniversal-ts2"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
new file mode 100644
index 0000000000..f7b0a89ee1
--- /dev/null
+++ b/conf/machine/htcwallaby.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: HTC Wallaby
+#@DESCRIPTION: Machine configuration for the HTC Wallaby aka XDA aka many other names
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 "
+
+require conf/machine/include/tune-strongarm.conf
+
+ROOT_FLASH_SIZE = "16" 
+VOLATILE_STORAGE_SIZE = "32"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+
+
+#
+# Modules autoload and other boot properties
+#
+SERIAL_CONSOLE = "115200 ttySA0 vt100"
+USE_VT = "0"
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index ffffc3a569..279b273a70 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -25,7 +25,9 @@ PCMCIA_MANAGER = "pcmciautils"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 482c8c0d8a..d7f852079a 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
@@ -25,7 +27,9 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
+
 XSERVER = "xserver-kdrive-w100"
+PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
@@ -35,8 +39,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
 				kernel-module-nls-utf8 \
 				kernel-module-af-key \
 				kernel-module-i2c-pxa \
-				kernel-module-hx4700-voltage \
+				kernel-module-pxa27x-voltage \
+				kernel-module-pxa27x-voltage-max158xx \
+				kernel-module-acx \
 				kernel-module-hx4700-acx \
+				kernel-module-hx4700-bt \
 				kernel-module-snd-hx4700-audio"
 
 #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
new file mode 100644
index 0000000000..de620fcd61
--- /dev/null
+++ b/conf/machine/i586-generic.conf
@@ -0,0 +1,24 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: i586-generic
+#@DESCRIPTION: Machine configuration for a generic i586 machine
+
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486"
+
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.18"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
+
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
new file mode 100644
index 0000000000..5eba33fa97
--- /dev/null
+++ b/conf/machine/i686-generic.conf
@@ -0,0 +1,22 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: i686-generic
+#@DESCRIPTION: Machine configuration for a generic i686 machine
+
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.20"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf
index 576846fbdf..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.conf
@@ -5,4 +5,4 @@
 #
 
 # LAB can only resolve relative symlinks
-ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
+#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf
index eab879368c..f22ffce6c2 100644
--- a/conf/machine/include/collie-2.6.conf
+++ b/conf/machine/include/collie-2.6.conf
@@ -1,4 +1,6 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
+
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
new file mode 100644
index 0000000000..064db79b29
--- /dev/null
+++ b/conf/machine/include/lsppc.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine configuration
+#@Name: Buffalo PPC Linkstations
+#@DESCRIPTION: Generic Machine configuration for ppc based linkstations
+
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+TARGET_FPU = "hard"
+
+USE_DEVFS = "0"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc"
+
+#don't try to access tty1
+USE_VT = "0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
+
+#tune for the MPC5200B cpu
+require conf/machine/include/tune-ppc603e.conf
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
new file mode 100644
index 0000000000..c1eac82e3b
--- /dev/null
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -0,0 +1,33 @@
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+#cat /proc/mtd
+#dev:    size   erasesize  name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+
+#the EZX phones need a userspace daemon to stop the BP from shutting down the phone 
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
+ROOT_FLASH_SIZE = "24"
+
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
+
+# Opentapi needs to be started very early so we need the mux devices in static /dev
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table-ezx.txt"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
new file mode 100644
index 0000000000..821ebc4c03
--- /dev/null
+++ b/conf/machine/include/palm.conf
@@ -0,0 +1,86 @@
+#
+# Hardware-based properties
+#
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
+module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
+module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-module-ac97-bus \
+	kernel-module-apm-power \
+	kernel-module-backlight \
+	kernel-module-battery \
+	kernel-module-led-class \
+	kernel-module-lcd \
+	kernel-module-gpioed \
+	kernel-module-gpioed-ng \
+	kernel-module-external-power \
+	kernel-module-snd \
+	kernel-module-snd-ac97-codec \
+	kernel-module-snd-page-alloc \
+	kernel-module-snd-pcm \
+	kernel-module-snd-seq \
+	kernel-module-snd-seq-device \
+	kernel-module-snd-seq-midi-event \
+	kernel-module-snd-seq-oss \
+	kernel-module-snd-timer \
+	kernel-module-soundcore \
+	"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 01a06b7c27..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
index 06eb56d2b6..06f12f532f 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.conf
@@ -1,9 +1,14 @@
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
 
+MACHINE_FEATURES_append = "kernel24"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \
+	kernel-module-sa1100usb-core kernel-module-usb-eth \
+	kernel-module-pcnet-cs kernel-module-8390 "
+
+USE_DEVFS = "1"
+
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules  \
- pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
-
-USE_DEVFS = "1"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
index 69f04f0730..e485c7bf2a 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.conf
@@ -1,4 +1,5 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES_append = "kernel26"
diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.conf
new file mode 100644
index 0000000000..dff8dce684
--- /dev/null
+++ b/conf/machine/include/tune-ppc440.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440"
+PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf
new file mode 100644
index 0000000000..0cfa50c69e
--- /dev/null
+++ b/conf/machine/include/tune-ppc440e.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440fp"
+PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc
index 4e9e6a2ad9..a9702cfce2 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -11,7 +11,7 @@ ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
@@ -28,7 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
-MACHINE_FEATURES_append_tosa  = " usbhost usbwlanng "
+MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 
@@ -38,6 +38,32 @@ MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS = "bigscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/         
+    mkdir ${IMAGE_NAME}-installkit/
+
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+ 
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
+}
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
deleted file mode 100644
index 93325d253b..0000000000
--- a/conf/machine/include/zaurus-clamshell.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
-                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
-		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
new file mode 100644
index 0000000000..f66502eff1
--- /dev/null
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -0,0 +1,13 @@
+EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
+                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index a12328b993..40d3848df7 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -10,4 +10,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen"
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 74a94bdfcf..f08fb6f253 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -10,4 +10,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
new file mode 100644
index 0000000000..0e9c0d3b92
--- /dev/null
+++ b/conf/machine/kb9202.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: KwikByte KB9202 devboard
+#@DESCRIPTION: Machine configuration for KwikByte KB9202 devboard
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+require conf/machine/include/tune-arm920t.conf
+
+# used by sysvinit_2
+# Needs at91 serial port
+#SERIAL_CONSOLE = "57600 ttyAM0"
+ 
+# used by some images
+# 16MB nor + 32MB nand
+ROOT_FLASH_SIZE = "12"
+
+MACHINE_FEATURES = "kernel26 usbhost usbgadget irda"
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 435014ac5c..f4dd576653 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -25,5 +25,4 @@ ROOT_FLASH_SIZE = "32"
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf
new file mode 100644
index 0000000000..c191349498
--- /dev/null
+++ b/conf/machine/looxc550.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: Loox C550
+#@DESCRIPTION: Machine configuration for the Loox C550
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+require conf/machine/include/tune-xscale.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
new file mode 100644
index 0000000000..15477f59c6
--- /dev/null
+++ b/conf/machine/lsarm.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine
+#@NAME: ARM based Buffalo Linkstation
+#@DESCRIPTION: Machine configuration for various different ARM based linkstations
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+INHERIT += "lsarm-image"
+
+MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+
+TARGET_FPU = "soft"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+
+USE_DEVFS = "0"
+
+require conf/machine/include/tune-arm926ejs.conf
+
+IMAGE_FSTYPES = "tar.gz"
+
+# serial console port on devboard rev. B3
+SERIAL_CONSOLE = "115200 ttyS0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationarm"
+
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
new file mode 100644
index 0000000000..ac22703de9
--- /dev/null
+++ b/conf/machine/lsppchd.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: HD Linkstation
+#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
+UBOOT_MACHINE = "linkstation_HDLAN"
+IMAGE_FSTYPES = "tar.gz"
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchd-image"
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
new file mode 100644
index 0000000000..9f03febba6
--- /dev/null
+++ b/conf/machine/lsppchg.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: HG Linkstation
+#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
+UBOOT_MACHINE = "linkstation_HGLAN"
+IMAGE_FSTYPES = "tar.gz"
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchg-image"
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
new file mode 100644
index 0000000000..756e064c6a
--- /dev/null
+++ b/conf/machine/magicbox.conf
@@ -0,0 +1,31 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: Magicbox router board
+#@DESCRIPTION: Machine configuration for Magicbox router board http://wwww.magicbox.pl
+
+INHERIT += "magicbox-image"
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc405"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26"
+MACHINE_TASK_PROVIDER = "task-base"
+
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.18"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_VERSION_u-boot = "1.1.2"
+EXTRA_IMAGECMD_jffs2 = "-pad --big-endian --squash -e 0x10000"
+EXTRA_IMAGECMD_squashfs = " -be -all-root -nopad -noappend -root-owned"
+EXTRA_IMAGECMD_squashfs-lzma = " -be -all-root -nopad -noappend -root-owned"
+
+
+
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
+
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 3d1b602def..fab936707b 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -16,8 +16,15 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
+
+#
+# We don't support jffs2 installations (yet).
+#
+IMAGE_FSTYPES = "tar.bz2"
 
 #
 # Software/packages selection
@@ -29,17 +36,21 @@ XSERVER = "xserver-kdrive-fbdev"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RRECOMMENDS = " \
+	kernel-module-af-key \
+	kernel-module-i2c-pxa \
+	kernel-module-pxa27x-voltage \
+	kernel-module-pxa27x-voltage-max158xx \
 	kernel-module-leds-magician \
 	kernel-module-magician-ts \
-	kernel-module-pxaficp-ir \
-	kernel-module-uinput \
-	kernel-module-hci-usb \
 	kernel-module-magician-flash \
 	kernel-module-magician-ds1wm \
 	kernel-module-magician-battery \
 	kernel-module-magician-phone \
+	kernel-module-magician-pm \
+	kernel-module-n-tihtc \
 	kernel-module-snd-soc-magician"
 
+
 #
 # Modules autoload and other boot properties
 #
@@ -51,6 +62,8 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
 module_autoload_magician_ds1wm = "magician_ds1wm"
 module_autoload_magician-battery = "magician-battery"
 module_autoload_magician_phone = "magician_phone"
+module_autoload_magician_pm = "magician_pm"
+module_autoload_n_tihtc = "n_tihtc"
 module_autoload_snd-soc-magician = "snd-soc-magician"
 module_autoload_hci_usb = "hci_usb"
 
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index 6303a8e96a..291c68ebd2 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -18,5 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0"
 ROOT_FLASH_SIZE = "32"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf
new file mode 100644
index 0000000000..000b200840
--- /dev/null
+++ b/conf/machine/mtx-3a.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine - the orange marvell box
+#@NAME: 4G Systems mtx-3a
+#@DESCRIPTION: Machine configuration for the mtx-3a 
+
+TARGET_ARCH = "arm"
+PACKAGE_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
+TARGET_CC_ARCH = "-march=armv5te"
+USE_DEVFS = "1"
+USE_VT = "0"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+BOOTSTRAP_EXTRA_RDEPENDS += ""
diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf
index 07976f7dbd..55a29186e3 100644
--- a/conf/machine/mx31ads.conf
+++ b/conf/machine/mx31ads.conf
@@ -19,3 +19,6 @@ SERIAL_CONSOLE = "115200 ttymxc0"
 
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
+
+IMAGE_FSTYPES += "tar.gz"
+
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
new file mode 100644
index 0000000000..f275d617de
--- /dev/null
+++ b/conf/machine/n2100.conf
@@ -0,0 +1,27 @@
+TARGET_ARCH = "arm"
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+
+INHERIT += "n2100-image"
+
+SERIAL_CONSOLE="115200 console"
+USE_VT="0"
+
+MODUTILS=26
+MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.20"
+
+# We want udev support in the image
+udevdir = "/dev"
+
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD = "--little-endian"
+# Creating an image that works with the webinterface required encrypting it
+# So we'll need openssl
+EXTRA_IMAGEDEPENDS = "openssl-native"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+
+require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index f5787e6448..e7aeab7389 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -1,23 +1,23 @@
 #@TYPE: Machine
-#@NAME: IBM Netvista
-#@DESCRIPTION: Machine configuration for the IBM Netvista thin client
+#@NAME: X86
+#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
 
-TARGET_ARCH = "i386"
-PREFERRED_PROVIDER_xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils"
-#BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules"
-#IMAGE_FSTYPES = "cramfs"
-EXTRA_IMAGEDEPENDS = ""
-SERIAL_CONSOLE = "ttyS0 115200 vt100"
+# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+TARGET_ARCH = "i486"
+# TARGET_VENDOR = "-oe"
+PACKAGE_EXTRA_ARCHS = "netvista"
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+XSERVER = "xserver-kdrive-vesa"
 
-TARGET_VENDOR = "-oe"
-PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
-IMAGE_FSTYPES = "ext2"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
-
-#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
-#udevdir = "/dev"
+# todo: convert to task-base
+# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa"
+ROOT_FLASH_SIZE = "64"
+GUI_MACHINE_CLASS = "bigscreen"
 
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index f7e05e768b..070cdcdd05 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -33,4 +33,6 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
-MACHINE_TASK_PROVIDER = "task-base"
+# build tools
+EXTRA_IMAGEDEPENDS += "0xffff-native"
+
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
new file mode 100644
index 0000000000..e31438819e
--- /dev/null
+++ b/conf/machine/nokia800.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine
+#@NAME: Nokia 770 internet tablet
+#@DESCRIPTION: Machine configuration for the Nokia 800
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
+XSERVER = "xserver-kdrive-xomap"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+TARGET_FPU = "hard"
+include conf/machine/include/tune-arm1136jf-s.conf
+
+ROOT_FLASH_SIZE = "174"
+EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
+
+#use this if you are using the nokia initfs
+ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
+
+# build tools
+EXTRA_IMAGEDEPENDS += "0xffff-native"
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 87fab62b65..104bbdb397 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -16,3 +16,4 @@ require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
 
+INHERIT += "nslu2-image"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 16114a80fa..86c4ce7a31 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -15,3 +15,5 @@ ROOT_FLASH_SIZE ?= "6"
 require conf/machine/include/ixp4xx.conf
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
+
+INHERIT += "nslu2-image"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index ac73b90571..946a619d3f 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -20,8 +20,6 @@ ROOT_FLASH_SIZE = "29"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-ide-disk \
                           kernel-module-ide-core \
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index ba67f473b2..3d1d90fbd8 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -2,22 +2,35 @@
 #@NAME: Palm LifeDrive
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget screen"
+require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_FEATURES += "pcmcia wifi"
+
+
+MACHINE_EXTRA_RRECOMMENDS += "\
+	kernel-module-bcm2035-uart \
+	kernel-module-leds-palmld \
+	kernel-module-ledtrig-heartbeat \
+	kernel-module-ledtrig-hwtimer \
+	kernel-module-ledtrig-timer \
+	kernel-module-palmld-battery \
+	kernel-module-palmld-ide \
+	kernel-module-palmld-pcmcia \
+	kernel-module-pcmcia-core \
+	kernel-module-pda-power \
+	kernel-module-pxa2xx-core \
+	kernel-module-snd-pxa2xx-ac97 \
+	kernel-module-snd-pxa2xx-pcm \
+	"
+
+#
+# Modules autoload and other boot properties
+#
+
+module_conf_wm97xx-ts = "options wm97xx-ts pil=2"
 
-module_autoload_sa1100-rtc = "sa1100-rtc"
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
new file mode 100644
index 0000000000..4d1032dae8
--- /dev/null
+++ b/conf/machine/palmt650.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: Palm Treo 650
+#@DESCRIPTION: Machine configuration for the Palm Treo 650
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS1"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
+                           kernel-module-pxa27x-keyboard \
+                           kernel-module-wm97xx-ts"
+
+module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf
new file mode 100644
index 0000000000..1852455e2b
--- /dev/null
+++ b/conf/machine/palmt680.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Palm Treo 680
+#@DESCRIPTION: Machine configuration for the Palm Treo 680
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
+                           kernel-module-wm97xx-ts"
diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf
new file mode 100644
index 0000000000..24d13c1381
--- /dev/null
+++ b/conf/machine/palmtc.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Palm TC
+#@DESCRIPTION: Machine configuration for the Palm Tungsten C
+
+require conf/machine/include/palm.conf
+
+MACHINE_FEATURES += "wifi"
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf
new file mode 100644
index 0000000000..1f6d5c377d
--- /dev/null
+++ b/conf/machine/palmtt.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Palm Tungsten T
+#@DESCRIPTION: Machine configuration for Palm Tungsten T/T2
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv5te"
+
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/palmtt2.conf b/conf/machine/palmtt2.conf
new file mode 100644
index 0000000000..2c62a04903
--- /dev/null
+++ b/conf/machine/palmtt2.conf
@@ -0,0 +1,2 @@
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Palm Tungsten T2,\n*    because \
+its very similar to the Palm Tungsten T. Use MACHINE = \"palmtt\".\n*\n*\n')}"
diff --git a/conf/machine/palmtt3.conf b/conf/machine/palmtt3.conf
new file mode 100644
index 0000000000..b4d65284ae
--- /dev/null
+++ b/conf/machine/palmtt3.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: Palm Tungsten|T3
+#@DESCRIPTION: Machine configuration for the Palm Tungsten|T3
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS3"
diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf
new file mode 100644
index 0000000000..d2de3fa87b
--- /dev/null
+++ b/conf/machine/palmtt5.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Palm Tungsten T5
+#@DESCRIPTION: Machine configuration for the Palm Tungsten T5
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
+                           kernel-module-wm97xx-ts \
+			   kernel-module-palmt5-battery"
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index 0a58defa69..9f1f079cdc 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -2,22 +2,17 @@
 #@NAME: Palm TX
 #@DESCRIPTION: Machine configuration for the Palm TX
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+require conf/machine/include/palm.conf
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_FEATURES += "pcmcia wifi"
 
 ROOT_FLASH_SIZE = "100"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-module_autoload_sa1100-rtc = "sa1100-rtc"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
+                           kernel-module-wm97xx-ts \
+                           kernel-module-palmtx-battery"
diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf
new file mode 100644
index 0000000000..da074a80bf
--- /dev/null
+++ b/conf/machine/palmz31.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Palm Zire 31
+#@DESCRIPTION: Machine configuration for the Palm Zire 31
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "16"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "160"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "160"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-thumb.conf
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
+			     kernel-module-i2c-algo-pxa \
+			     kernel-module-i2c-dev \
+			     kernel-module-wm97xx-ts \		
+			     kernel-module-palmz31-battery"
+
+module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/palmz71.conf b/conf/machine/palmz71.conf
new file mode 100644
index 0000000000..4be181e961
--- /dev/null
+++ b/conf/machine/palmz71.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Palm Zire 71
+#@DESCRIPTION: Machine configuration for Palm Zire 71
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index ae3e74bee4..a654877d36 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -2,24 +2,23 @@
 #@NAME: Palm Zire 72
 #@DESCRIPTION: Machine configuration for the Palm Zire 72
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda ext2 usbgadget screen"
+require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
 require conf/machine/include/tune-thumb.conf
 
-module_autoload_sa1100-rtc = "sa1100-rtc"
-module_autoload_palmz72-battery = "palmz72-battery"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
+			     kernel-module-i2c-algo-pxa \
+			     kernel-module-i2c-dev \
+			     kernel-module-wm97xx-ts \		
+			     kernel-module-palmz72-battery"
+
+module_autoload_g_ether = "g_ether"
+
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index a548f513d3..eee1edd53e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -2,6 +2,6 @@
 #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
 
 ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 71eac0d6c5..7c293d9ebf 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -13,7 +13,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen"
 
 IMAGE_FSTYPES = "tar.gz"
 
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 2de34e42c9..0e8a081df5 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 require conf/machine/include/qemu.conf
 require conf/machine/include/tune-arm926ejs.conf
@@ -11,5 +11,3 @@ require conf/machine/include/tune-arm926ejs.conf
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index dfbd345ae8..60aa12ad7f 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -13,5 +13,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf
index 53be3506af..ccd496c03d 100644
--- a/conf/machine/rokr-e2.conf
+++ b/conf/machine/rokr-e2.conf
@@ -2,32 +2,8 @@
 #@NAME: Motorola EZX rokr e2 
 #@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2
 
+require conf/machine/include/motorola-ezx-base.inc
 
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
-
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
-#cat /proc/mtd
-#dev:    size   erasesize  name
-#mtd0: 00020000 00008000 "Bootloader"
-#mtd1: 000e0000 00020000 "Kernel"
-#mtd2: 00580000 00020000 "VFM_Filesystem"
-#mtd3: 00020000 00020000 "Logo"
-
+#no touchscreen
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
 
-#the a780 needs a userspace daemon to stop the BP from shutting down the phone 
-MACHINE_EXTRA_RDEPENDS += "opentapi"
-
-ROOT_FLASH_SIZE = "24"
-
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
new file mode 100644
index 0000000000..d49679e820
--- /dev/null
+++ b/conf/machine/rx1950.conf
@@ -0,0 +1,37 @@
+#@TYPE: Machine
+#@NAME: HP iPAQ rx1950
+#@DESCRIPTION: Machine configuration for the HP iPAQ rx1950
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+# Samsung S3C2xxx CPU
+require conf/machine/include/tune-arm920t.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index 190b5f54dd..f0bd1fefd2 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -13,17 +13,22 @@ require conf/machine/include/tune-arm920t.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.18-hh2"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-acx \
+                            "
+
 #
 # Modules autoload and other boot properties
 #
diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf
new file mode 100644
index 0000000000..6001e69cf7
--- /dev/null
+++ b/conf/machine/sarge-at91.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Sarge AT91RM9200 blackmesaeast dev boards
+#@DESCRIPTION: Machine configuration for sarge_at91 dev boards
+#
+#Homepage: http://blackmesaeast.com.pl/projects/electronics/sarge-single-board-computer/
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm920t.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# device has own patchset for u-boot 1.1.6
+PREFERRED_VERSION_u-boot = "1.1.6"
+PREFERRED_VERSION_linux  = "2.6.21"
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
new file mode 100644
index 0000000000..a6f31ab84a
--- /dev/null
+++ b/conf/machine/sequoia.conf
@@ -0,0 +1,28 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: AMCC Sequoia Development Platform
+#@DESCRIPTION: Machine configuration for the AMCC Sequoia development platform http://www.amcc.com/Embedded/Downloads/440EPx/
+
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc440e"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26 usbhost"
+MACHINE_TASK_PROVIDER = "task-base"
+
+#don't try to access tty1
+USE_VT = "0"
+
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_VERSION_u-boot = "git"
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x10000"
+IMAGE_FSTYPES = "jffs2"
+
+#tune for the AMCC440 cpu
+require conf/machine/include/tune-ppc440e.conf
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index 648d4eae9f..61bec7f6f2 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -20,5 +20,4 @@ require conf/machine/include/tune-strongarm.conf
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
 
-MACHINE_TASK_PROVIDER = "task-base"
 GUI_MACHINE_CLASS = "bigscreen"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 2478ce17c9..8e2cc276d8 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -3,27 +3,20 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
 
 MACHINE_KERNEL_VERSION ?= "2.4"
-require conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
 
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel"
 
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs  \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"
+MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
+
+include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/tune-strongarm.conf
 
-# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
+ROOT_FLASH_SIZE = "16"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
-EXTRA_IMAGEDEPENDS = ""
-SERIAL_CONSOLE = "ttySA0 115200 vt100"
 
 GUI_MACHINE_CLASS = "bigscreen"
-ROOT_FLASH_SIZE = "16"
+SERIAL_CONSOLE = "ttySA0 115200 vt100"
 USE_VT = "0"
-GPE_EXTRA_INSTALL += "suspend-desktop"
-
-require conf/machine/include/tune-strongarm.conf
 
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf
index f2064175fd..903685e8dd 100644
--- a/conf/machine/smdk2440.conf
+++ b/conf/machine/smdk2440.conf
@@ -13,7 +13,6 @@ SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "tar.gz"
 
-MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_FEATURES = "kernel26 apm screen"
 
 require conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf
new file mode 100644
index 0000000000..0f7419f80b
--- /dev/null
+++ b/conf/machine/smdk2443.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@Name: Samsung SMDK2440 Dev BOard
+#@DESCRIPTION: Machine configuration for Samsung SMDK2440 Dev Board
+
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_FEATURES = "kernel26 apm screen"
+
+require conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 6b08ec1aa9..3199065606 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
@@ -11,3 +11,8 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt"
 IMAGE_FSTYPES += "tar.gz"
 
 ROOT_FLASH_SIZE = "100"
+
+MACHINE_GUI_CLASS=bigscreen
+MACHINE_DISPLAY_WIDTH_PIXELS=480
+MACHINE_DISPLAY_HEIGHT_PIXELS=640
+MACHINE_DISPLAY_ORIENTATION=270
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 7463bc77d0..0898da1520 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -1,18 +1,23 @@
 TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 TARGET_FPU = "hard"
-# TARGET_VENDOR = "oe"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+
+INHERIT += "storcenter-image"
+
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_TASK_PROVIDER = "task-base"
-MACHINE_FEATURES= "kernel26 usbhost"
-# don't go udev until kernel >=2.6.13
-#BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
-BOOTSTRAP_EXTRA_RDEPENDS = "mdadm"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
 
+# We want udev support in the image
+udevdir = "/dev"
+
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x10000"
+IMAGE_FSTYPES = "jffs2"
+
 require conf/machine/include/tune-ppc603e.conf
diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf
index a7ce106356..bbf1e23b15 100644
--- a/conf/machine/titan.conf
+++ b/conf/machine/titan.conf
@@ -26,7 +26,6 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "63984"
 
 # Things to include in the fs image
 MACHINE_FEATURES = "kernel26 pci ext2 usbhost"
-MACHINE_TASK_PROVIDER = "task-base"
 # The kernel and lilo-sh need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel lilo-sh"
 
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ddaf6e03c9..83227ee0c4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-6000
 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
 
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
 
 # newer kernels does not build
 PREFERRED_VERSION_linux-rp = "2.6.17"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 7184958664..33e0427a8e 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -2,25 +2,27 @@ TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 TARGET_FPU = "hard"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_TASK_PROVIDER = "task-base"
+
+INHERIT += "turbostation-image"
 
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
+MACHINE_EXTRA_RDEPENDS = "u-boot"
+PREFERRED_VERSION_u-boot = "1.2.0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost"
-PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+UBOOT_MACHINE = "qnap_config"
+PREFERRED_VERSION_u-boot = "1.2.0"
 
-# Do we need any kernel modules?
-OPENPROTIUM_KERNEL = ""
+PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
 
 # We want udev support in the image
 udevdir = "/dev"
-OPENPROTIUM_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
 
-ROOT_FLASH_SIZE = 12
-# Hardware stuff
-ERASEBLOCK_SIZE = "0x20000"	
+IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+
 require conf/machine/include/tune-ppc603e.conf
diff --git a/conf/machine/wgt634u.conf b/conf/machine/wgt634u.conf
new file mode 100644
index 0000000000..1b4eeafbe3
--- /dev/null
+++ b/conf/machine/wgt634u.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: Netgear wgt634u wireless router  
+#@DESCRIPTION: Machine configuration for the MIPS based wgt634u devices
+
+TARGET_ARCH = "mipsel"
+MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
+
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-brcm"
+
+IMAGE_FSTYPES = "tar.gz squashfs-lzma jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash --eraseblock=0x10000 -n" 
+
+EXTRA_IMAGECMD_squashfs-lzma = "-nopad -root-owned -le"
+
+
diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf
index 516d709110..f2e4006a8f 100644
--- a/conf/machine/wl500g.conf
+++ b/conf/machine/wl500g.conf
@@ -3,4 +3,6 @@
 #@DESCRIPTION: Machine configuration for the MIPS based WL500g(x) devices
 
 TARGET_ARCH = "mipsel"
+MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
+
 TARGET_CC_ARCH = "-Os -mips2"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index e0c65475f6..34d6775932 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -23,7 +23,6 @@ IMAGE_FSTYPE ?= "tar.gz"
 
 # Things to include in the fs image
 MACHINE_FEATURES = "kernel26 pci ext2"
-MACHINE_TASK_PROVIDER = "task-base"
 # The kernel and grub need to installed to boot from flash
 MACHINE_EXTRA_RDEPENDS = "kernel grub"
 
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 5b22d01324..e0d4cc96a2 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -11,8 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen"
 
 udevdir = "/dev"
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
new file mode 100644
index 0000000000..a4979d4527
--- /dev/null
+++ b/conf/machine/xilinx-ml403.conf
@@ -0,0 +1,22 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: Xilinx ML403 FPGA Development Platform
+#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform \
+http://www.xilinx.com/ml403
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc405"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26 ext2"
+
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.12"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
+
diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf
new file mode 100644
index 0000000000..9adb26e43e
--- /dev/null
+++ b/conf/machine/xilinx-ml410.conf
@@ -0,0 +1,22 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: Xilinx ML410 FPGA Development Platform
+#@DESCRIPTION: Machine configuration for Xilinx ML410 Virtex-4 FX Embedded Development Platform  \ 
+(softcore ppc) development platform http://www.xilinx.com/ml410
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc405"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26 ext2"
+
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.12"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
+
author	Marcin Juszkiewicz <hrw@openembedded.org>	2007-08-09 08:41:19 +0000
committer	Marcin Juszkiewicz <hrw@openembedded.org>	2007-08-09 08:41:19 +0000
commit	9d829ed05c295df608b4fc108eb1c628fd06fd39 (patch)
tree	c1b27cfe4498f8abef1a61325922906f3e6a32ff /conf/machine
parent	1434b204e16e87b7f59f074f3036d5dcbcf0116f (diff)
parent	6ccac10beeaaa02a86081bd6179fd57c208ad6b1 (diff)