6 files changed, 29 insertions, 11 deletions
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 189021747a..86e9429506 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -1,13 +1,12 @@
 TARGET_ARCH = "i586"
-TARGET_VENDOR = "-oe"
+PACKAGE_EXTRA_ARCHS = "i386 i486"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPES = "ext2.gz"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
-udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-PACKAGE_EXTRA_ARCHS = "i386"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
 
 require conf/machine/include/tune-c3.conf
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 72c2d33713..e81dbdeaa9 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -19,6 +19,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index e92aee9972..77bb0b5639 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -19,6 +19,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 843e26bed0..485d90df7f 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -31,17 +31,24 @@ MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
                                 kernel-module-af-key \
 				kernel-module-bsd-comp \
 				kernel-module-i2c-pxa \
-				kernel-module-htcuniversal-power \
 				kernel-module-snd-htcuniversal-audio \
 				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 \
 				"
 
 #
 # 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"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 4e6c9a625a..3d1b602def 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget"
 
 #
 # Software/packages selection
@@ -34,7 +34,11 @@ MACHINE_EXTRA_RRECOMMENDS = " \
 	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-snd-soc-magician"
 
 #
 # Modules autoload and other boot properties
@@ -44,6 +48,11 @@ module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 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_snd-soc-magician = "snd-soc-magician"
+module_autoload_hci_usb = "hci_usb"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index 40b13667b6..e39844d943 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -20,6 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"