summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-02 17:13:33 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-02 17:13:33 +0000
commita11bbb4030c3f7034303a702b00895fc72d67b16 (patch)
tree6e914a7071b73439c73ef23319a336a554fbc6eb
parent65f6428521a6721b94a9c3f90a229ef06179ab51 (diff)
downloadpoky-a11bbb4030c3f7034303a702b00895fc72d67b16.tar.gz
hx2000.conf: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2657 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/machine/hx2000.conf43
1 files changed, 13 insertions, 30 deletions
diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf
index 5a896c8f31..c0d9016407 100644
--- a/meta/conf/machine/hx2000.conf
+++ b/meta/conf/machine/hx2000.conf
@@ -1,11 +1,10 @@
1#@TYPE: Machine 1#@TYPE: Machine
2#@NAME: iPAQ hx47xx hx2xxx 2#@NAME: iPAQ hx2xxx
3#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices 3#@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" 6PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
7 7
8#use this for a hx2xxx ipaq
9PREFERRED_PROVIDER_virtual/kernel = "linux-rp" 8PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
10 9
11PREFERRED_VERSION_orinoco-modules = "0.15rc1" 10PREFERRED_VERSION_orinoco-modules = "0.15rc1"
@@ -16,45 +15,29 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
16 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ 15 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
17 -e 256KiB -p" 16 -e 256KiB -p"
18 17
19IMAGE_FSTYPES ?= "tar.bz2" 18IMAGE_FSTYPES ?= "jffs2 tar.bz2"
20 19
21MODUTILS = "26" 20MODUTILS = "26"
22PCMCIA_MANAGER = "pcmciautils"
23BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
24BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}"
25BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
26 21
27PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ 22MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen"
28 snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ 23
29 nls_cp437 nls_iso8859-1 nls_utf8 af_key" 24PCMCIA_MANAGER = "pcmciautils"
30 25
31SERIAL_CONSOLE = "115200 ttyS0" 26SERIAL_CONSOLE = "115200 ttyS0"
32 27
33GUI_MACHINE_CLASS = "bigscreen" 28MACHINE_GUI_CLASS = "smallscreen"
29MACHINE_DISPLAY_WIDTH_PIXELS = "240"
30MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
34 31
35# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. 32# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
36include conf/machine/include/tune-xscale.inc 33require conf/machine/include/tune-xscale.inc
37 34
38# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first 35# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
39#include conf/machine/include/tune-iwmmxt.inc 36#require conf/machine/include/tune-iwmmxt.inc
40
41BOOTSTRAP_EXTRA_RRECOMMENDS += ""
42#${@linux_module_packages('${HX4700_MODULES}', d)}
43HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
44 hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
45
46MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost"
47 37
48module_autoload_evdev = "evdev" 38module_autoload_evdev = "evdev"
49module_autoload_hx4700_power = "hx4700_power"
50module_autoload_pcmcia = "pcmcia" 39module_autoload_pcmcia = "pcmcia"
51module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
52module_autoload_asic3_mmc = "asic3_mmc"
53module_autoload_mmc_block = "mmc_block" 40module_autoload_mmc_block = "mmc_block"
54module_autoload_hx4700_ts = "hx4700_ts"
55module_autoload_hx4700_navpt = "hx4700_navpt"
56module_autoload_hx4700_bt = "hx4700_bt"
57module_autoload_snd-hx4700_audio = "snd-hx4700_audio"
58module_autoload_snd-pcm-oss = "snd-pcm-oss" 41module_autoload_snd-pcm-oss = "snd-pcm-oss"
59module_autoload_snd-mixer-oss = "snd-mixer-oss" 42module_autoload_snd-mixer-oss = "snd-mixer-oss"
60module_autoload_pxa27x_udc = "pxa27x_udc" 43module_autoload_pxa27x_udc = "pxa27x_udc"
@@ -62,6 +45,6 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
62#FIXME: this should be controlled by a userspace utility later. 45#FIXME: this should be controlled by a userspace utility later.
63module_autoload_g_ether = "g_ether" 46module_autoload_g_ether = "g_ether"
64 47
65# Don't include kernels in standard images for Zaurus machines 48# Don't include kernels in standard images
66RDEPENDS_kernel-base = "" 49RDEPENDS_kernel-base = ""
67KERNEL_IMAGETYPE = "zImage" 50KERNEL_IMAGETYPE = "zImage"