increase dvbapp PR.

[vuplus_openembedded] / conf / machine / h3900.conf

diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 3a8f9e0..a403008 100644 (file)
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -1,42 +1,37 @@
 #@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
-
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-OVERRIDES =. "${KERNEL}:"
+#@NAME: HP iPAQ h39xx
+#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
-EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
-
-ROOT_FLASH_SIZE = "32"
 
-BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
-BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules"
-BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools"
+require conf/machine/include/tune-xscale.inc
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+ROOT_FLASH_SIZE = "32"
+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 usbgadget screen vfat"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core"
-# pxa2xx_udc is built in to the kernel
+MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
 
-USE_DEVFS_kernel24 = "1"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
-
-GUI_MACHINE_CLASS = "smallscreen"
-
-# not using tune-xscale so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+require conf/machine/include/LAB-settings.inc