[oe-commits] org.oe.dev htcblueangel.conf: Update to standard template, use linux-handhelds-2.6.

[pfalcon commit]

htcblueangel.conf: Update to standard template, use linux-handhelds-2.6.

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

#
# mt diff -ra8755adacd1126221364b9f3fcb275ce034cf3d8 -rded12fd53ea85e06a151ce07a43bccb8c8b1419f
#
# 
# 
# patch "conf/machine/htcblueangel.conf"
#  from [5ef89f2f214602bbdfd9a57c907f7e8300570688]
#    to [e1315b500c02024d51e491c69c88a853078ba8d2]
# 
============================================================
--- conf/machine/htcblueangel.conf	5ef89f2f214602bbdfd9a57c907f7e8300570688
+++ conf/machine/htcblueangel.conf	e1315b500c02024d51e491c69c88a853078ba8d2
@@ -1,24 +1,40 @@
 #@TYPE: Machine
 #@NAME: HTC Blueangel
 #@DESCRIPTION: Machine configuration for the HTC Blueangel device
 
-KERNEL ?= "kernel26"
-
-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_kernel26 = "xanadux-ba-2.6"
-PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+require conf/machine/include/tune-xscale.conf
 
-BA_MODULES_kernel26 = " evdev tsdev himalaya_tsc2200 himalaya_ts3 asic3_mmc mmc_core g_ether blueangel_battery \
-                        pcmcia-core hci_uart blueangel_pcmcia snd-mixer-oss blueangel_audio blueangel_rom blueangel_kp"
-# pxa2xx_udc is built in to the kernel
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RRECOMMENDS = "blueangel_pcmcia \
+			     blueangel_audio \
+			     blueangel_rom \
+			     blueangel_kp
+			     blueangel_battery \
+			     blueangel_leds \
+                            "
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
 module_autoload_evdev             = "evdev"
 module_autoload_himalaya_tsc2200  = "himalaya_tsc2200"
 module_autoload_himalaya_ts3      = "himalaya_ts3"
@@ -30,14 +46,9 @@ module_autoload_snd-mixer-oss     = "snd
 module_autoload_bluenagel_leds    = "bleangel_leds"
 module_autoload_hci_uart          = "hci_uart"
 module_autoload_snd-mixer-oss     = "snd-mixer-oss"
-module_autoload_snd-pcm-oss       = "snd-pcm-oss"
 
-SERIAL_CONSOLE = "115200 tts/2 vt100"
 
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
+require conf/machine/include/LAB-settings.conf
-GUI_MACHINE_CLASS = "smallscreen"
-ROOT_FLASH_SIZE = "32"
-
-# optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility
-include conf/machine/include/tune-xscale.conf