increase dvbapp PR.

[vuplus_openembedded] / conf / machine / h6300.conf

diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 2335f5b..08f61b8 100644 (file)
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -1,27 +1,44 @@
 #@TYPE: Machine
-#@NAME: OMAP1510 cpu on iPaq h6315 and h6340
-#@DESCRIPTION: Machine configuration for the OMAP 1510 based iPaq h6300 series devices
+#@NAME: OMAP1510 cpu on iPAQ h6315, h6340 and h6365
+#@DESCRIPTION: Machine configuration for the OMAP1510 based HP iPAQ h6300 series devices.
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
-PACKAGE_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4"
+BASE_PACKAGE_ARCH = "arm"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
+require conf/machine/include/tune-arm9tdmi.inc
 
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb"
+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"
 
-H6300_MODULES = "fat vfat nfs \
-bluetooth rfcomm bnep l2cap hci_uart \
-irda irlan irtty ircomm ircomm-tty \
-omapts"
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${H6300_MODULES}', d)}"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-omapts \
+                             kernel-module-omap-keypad \
+                             kernel-module-h6300-bt"
 
-SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/include/tune-arm9tdmi.conf
+#
+# Modules autoload and other boot properties
+#
+module_autoload_omapts = "omapts"
+module_autoload_omap-keypad = "omap-keypad"
+module_autoload_hci_uart = "hci_uart"
+module_autoload_h6300_bt = "h6300_bt"
+module_autoload_l2cap = "l2cap"
+#common alsa sound modules
+module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+
+SERIAL_CONSOLE = "115200 ttyS0"