diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-12-30 09:42:37 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-12-30 09:42:37 +0000 |
| commit | 46c09a35eea203bc18b686ca3f61cb711e1bde1a (patch) | |
| tree | 5aa40a22c43f2f036da431c7db8ba0361d29b602 /conf | |
| parent | 0bb851d3c19543101d802f199a9e0b46c7063a2d (diff) | |
| parent | 577507b0f0a9bf5b1cfdd06fef73c54fe1be47e1 (diff) | |
merge of '3ca68baf5ab6cfd5309ee998ee3c5e6174ae8ae2'
and 'ded12fd53ea85e06a151ce07a43bccb8c8b1419f'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/htcblueangel.conf | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index dd079c244b..aefe06a0e8 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -2,23 +2,39 @@ #@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 + +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" -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 +# +# 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_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" +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.conf |