8 files changed, 96 insertions, 8 deletions
diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
new file mode 100644
index 0000000000..85ca5d106a
--- /dev/null
+++ b/conf/machine/asus730.conf
@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: Asus MyPal A730
+#@DESCRIPTION: Machine configuration for the asus730 with a pxa27x CPU
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+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
+
+ROOT_FLASH_SIZE = "64"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+MODUTILS = "26"	
+XSERVER = "xserver-kdrive"
+
+PREFERRED_VERSION_orinoco-modules = "0.15rc1"
+
+
+#
+# Modules autoload and other boot properties
+#
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index 029246a8c2..468c2ebd7d 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -5,12 +5,12 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "bigscreen"
-PACKAGE_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}"
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_VERSION_u-boot = "1.1.6"
+UBOOT_MACHINE = "pxa255_idp_config"
 
 require conf/machine/include/tune-xscale.conf
 
@@ -20,4 +20,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
 
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 7c277d3d73..d564dc5654 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -6,7 +6,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa"
+MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index eb0b6d40e6..cd451d3dfe 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
 
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
 
+EXTRA_IMAGECMD_h3600_jffs2_append = "; echo "${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+
 
 
 # TODO: see if any of these modules have 2.6 counterparts
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index c0c9b2fefe..00e6495274 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -21,6 +21,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_h5000_jffs2_append = "; echo "${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
new file mode 100644
index 0000000000..0cb51ce383
--- /dev/null
+++ b/conf/machine/htchimalaya.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: HTC Himalaya
+#@DESCRIPTION: Machine configuration for the HTC Himalaya device
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+
+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 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/hx4700.conf b/conf/machine/hx4700.conf
index 53903f7982..19c3f37ead 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -44,6 +44,9 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 			  -e 256KiB -p"
 
+#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
+EXTRA_IMAGECMD_jffs2_append = "; echo "${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+
 #
 # Modules autoload and other boot properties
 #
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 0a9732b556..4cad129a9d 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -12,8 +12,14 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda acpi screen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen"
 
 IMAGE_FSTYPES = "tar.gz"
 
-MACHINE_EXTRA_RRECOMMENDS = "progear-ac progear-battery"
+MACHINE_EXTRA_RRECOMMENDS = "\
+	progear-ac progear-battery \
+	kernel-module-snd-ali5451 \
+	kernel-module-i2c-ali1535 \
+	kernel-module-i2c-ali15x3 \
+	kernel-module-yenta-socket \
+	"