increase dvbapp PR.

[vuplus_openembedded] / conf / machine / htcblueangel.conf

diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index dd079c2..a5178d8 100644 (file)
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -2,23 +2,42 @@
 #@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.inc
 
-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 = "128"
+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 phone"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \
+                            kernel-module-blueangel_audio \
+                            kernel-module-blueangel_rom \
+                            kernel-module-blueangel_kp \
+                            kernel-module-blueangel_battery \
+                            kernel-module-blueangel_leds \
+                            kernel-module-himalaya_tsc2200 \
+                            kernel-module-himalaya_ts3 \
+                            kernel-module-asic3-mmc"
+#
+# 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 +49,9 @@ module_autoload_blueangel_audio   = "blueangel_audio"
 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"
+module_conf_acx = "blacklist acx"
 
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-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
+require conf/machine/include/LAB-settings.inc