7 files changed, 32 insertions, 18 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 9bb24874a9..dcf3409723 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -32,7 +32,7 @@ MACHINE_TASK_PROVIDER = "task-base"
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
 
 # build tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 482c8c0d8a..52eb09b933 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -35,8 +35,10 @@ 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-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/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 93325d253b..f66502eff1 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -1,13 +1,13 @@
 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 \
+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; \
+                   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; \
+                   ${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/magician.conf b/conf/machine/magician.conf
index 3d1b602def..719c9a5b03 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -17,7 +17,12 @@ 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_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
@@ -31,13 +36,11 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 MACHINE_EXTRA_RRECOMMENDS = " \
 	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-n-tihtc \
 	kernel-module-snd-soc-magician"
 
 #
@@ -51,6 +54,7 @@ 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_n_tihtc = "n_tihtc"
 module_autoload_snd-soc-magician = "snd-soc-magician"
 module_autoload_hci_usb = "hci_usb"
 
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/storcenter.conf b/conf/machine/storcenter.conf
index 7463bc77d0..bb7c8f1bef 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"
+MACHINE_TASK_PROVIDER = "task-base"
+
 # 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"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
+MACHINE_TASK_PROVIDER = "task-base"
+
+# 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