diff options
| -rw-r--r-- | meta/conf/machine/hx2000.conf | 43 |
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 @@ #@TYPE: Machine -#@NAME: iPAQ hx47xx hx2xxx -#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices +#@NAME: iPAQ hx2xxx +#@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " -#use this for a hx2xxx ipaq PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_VERSION_orinoco-modules = "0.15rc1" @@ -16,45 +15,29 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ -e 256KiB -p" -IMAGE_FSTYPES ?= "tar.bz2" +IMAGE_FSTYPES ?= "jffs2 tar.bz2" MODUTILS = "26" -PCMCIA_MANAGER = "pcmciautils" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ - snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ - nls_cp437 nls_iso8859-1 nls_utf8 af_key" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" + +PCMCIA_MANAGER = "pcmciautils" SERIAL_CONSOLE = "115200 ttyS0" -GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.inc +require conf/machine/include/tune-xscale.inc # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.inc - -BOOTSTRAP_EXTRA_RRECOMMENDS += "" -#${@linux_module_packages('${HX4700_MODULES}', d)} -HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" - -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost" +#require conf/machine/include/tune-iwmmxt.inc module_autoload_evdev = "evdev" -module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" -module_autoload_hx4700_pcmcia = "hx4700_pcmcia" -module_autoload_asic3_mmc = "asic3_mmc" module_autoload_mmc_block = "mmc_block" -module_autoload_hx4700_ts = "hx4700_ts" -module_autoload_hx4700_navpt = "hx4700_navpt" -module_autoload_hx4700_bt = "hx4700_bt" -module_autoload_snd-hx4700_audio = "snd-hx4700_audio" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" @@ -62,6 +45,6 @@ module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" -# Don't include kernels in standard images for Zaurus machines +# Don't include kernels in standard images RDEPENDS_kernel-base = "" KERNEL_IMAGETYPE = "zImage" |