5 files changed, 32 insertions, 3 deletions
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index d2e7306c46..941d08c013 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -29,5 +29,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
 #
 # Modules autoload and other boot properties
 #
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index b0c962c1d0..da2e466425 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
 
-#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf
index c088485fcc..c3e56067cd 100644
--- a/conf/machine/ixp4xx.conf
+++ b/conf/machine/ixp4xx.conf
@@ -2,4 +2,8 @@
 #@NAME: Generic IXP4XX kernel
 #@DESCRIPTION: Machine configuration for a generic ixp4xx board
 
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
 include conf/machine/include/ixp4xx.conf
+
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf
index ad6de78f56..4b3fff7061 100644
--- a/conf/machine/mx31ads.conf
+++ b/conf/machine/mx31ads.conf
@@ -5,8 +5,10 @@
 TARGET_ARCH = "arm"
 TARGET_FPU_arm = "hard"
 
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
+
 GUI_MACHINE_CLASS = "smallscreen"
-IPKG_EXTRA_ARCHS = "armv6"
+IPKG_EXTRA_ARCHS = "arm armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
new file mode 100644
index 0000000000..35a31aa00b
--- /dev/null
+++ b/conf/machine/palmld.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Palm LifeDrive
+#@DESCRIPTION: Machine configuration for the Palm LifeDrive
+
+TARGET_ARCH = "arm"
+IPKG_EXTRA_ARCHS = "arm armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget"
+
+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.
+include conf/machine/tune-xscale.conf
+
+module_autoload_sa1100-rtc = "sa1100-rtc"