iPAQ h6300 conf: Fix the h6300 configuration.

1 files changed, 31 insertions, 12 deletions

diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 166701a46b..bd0a65a095 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -1,29 +1,48 @@
 #@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.
 
 TARGET_ARCH = "arm"
 PACKAGE_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4"
 
+PREFERRED_PROVIDER_libsdl = "libsdl-x11"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
-BOOTSTRAP_EXTRA_DEPENDS	= "udev virtual/kernel sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb"
+#Enable the pre-building of glibc locale config files. See glibc-package.bbclass 
+ENABLE_BINARY_LOCALE_GENERATION = "1"
+#Assume that qemu is already installed (that's because qemu install will fail with gcc)
+ASSUME_PROVIDED += "qemu-native"
 
-H6300_MODULES = "fat vfat nfs \
-bluetooth rfcomm bnep l2cap hci_uart \
-irda irlan irtty ircomm ircomm-tty \
-omapts"
+H6300_MODULES = "omapts i2c-omap pca9535 omap-keypad bluetooth rfcomm bnep l2cap hci_uart h6300_bt"
 
-BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts"
-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)}"
+module_autoload_omapts = "omapts"
+module_autoload_i2c-omap = "i2c-omap"
+module_autoload_pca9535 = "pca9535"
+module_autoload_omap-keypad = "omap-keypad"
+module_autoload_hci_uart = "hci_uart"
+module_autoload_h6300_bt = "h6300_bt"
+module_autoload_l2cap = "l2cap"
+
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils console-tools modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS += "apmd alsa-utils"
+BOOTSTRAP_EXTRA_DEPENDS  += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
+BOOTSTRAP_EXTRA_DEPENDS  += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
+BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-amixer alsa-utils-aplay"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
+
+GPE_EXTRA_DEPENDS += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator mplayer gpe-tetris gpe-othello gpe-go gstreamer"
+GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator mplayer gpe-tetris gpe-othello gpe-go gstreamer"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/tune-arm9tdmi.conf
+include conf/machine/include/tune-arm9tdmi.conf