X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=conf%2Fmachine%2Fh4000.conf;h=f85b2a12eea44e4f582393aa402c4c35cea63eb3;hb=HEAD;hp=17bb47811a14270247421d03ca74e9709d2a1049;hpb=1ca416bbbd5d3fc18db8ffede91bef0db8138385;p=vuplus_openembedded

diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 17bb478..f85b2a1 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -2,26 +2,45 @@
 #@NAME: HP iPAQ h4xxx
 #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx
 
+#
 # Hardware-based properties
+#
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
-GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
+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 vfat"
 
-# Software/package selection
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
+                             kernel-module-i2c-pxa \
+			     kernel-module-h4000-bt \
+                             kernel-module-h4000-pcmcia \
+                             kernel-module-acx \
+                            "
+
+#
 # Modules autoload and other boot properties
+#
 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"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc