[oe-commits] org.oe.dev h3900: 2.6 port reached usable state (suspend/resume, buttons, TS, SD/MMC),

[pfalcon commit]

h3900: 2.6 port reached usable state (suspend/resume, buttons, TS, SD/MMC),
switch to it.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 5ea326f3b26f2123d331eace3ce101ac2983534e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ea326f3b26f2123d331eace3ce101ac2983534e
Files:
1
conf/machine/h3900.conf
Diffs:

#
# mt diff -r2615762a802a943fb3b09e52d008cef73cf1c98c -r5ea326f3b26f2123d331eace3ce101ac2983534e
#
# 
# 
# patch "conf/machine/h3900.conf"
#  from [17393b23416d2028477ff178971611770585ee22]
#    to [2233ba49b38af6df92160eb56caf6b3c5c533aa5]
# 
============================================================
--- conf/machine/h3900.conf	17393b23416d2028477ff178971611770585ee22
+++ conf/machine/h3900.conf	2233ba49b38af6df92160eb56caf6b3c5c533aa5
@@ -1,37 +1,34 @@
 #@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx
+#@NAME: HP iPAQ h39xx
+#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx
 
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-INHERIT += "linux-kernel-base"
-
-OVERRIDES =. "${KERNEL}:"
-
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6"
-EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 
+require conf/machine/include/tune-xscale.conf
+
 ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+#
+# 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 nmc_asic3 mtdchar h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core"
-# pxa2xx_udc is built in to the kernel
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
-
-USE_DEVFS_kernel24 = "1"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
+require conf/machine/include/LAB-settings.conf
-
-GUI_MACHINE_CLASS = "smallscreen"
-
-# not using tune-xscale so as to retain backwards compatibility
-require conf/machine/include/tune-xscale.conf