diff options
-rw-r--r-- | conf/machine/h3900.conf | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index f00dc9eb96..323aa8f061 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -1,37 +1,34 @@ #@TYPE: Machine -#@NAME: Compaq iPAQ 39xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx - -KERNEL ?= "kernel24" -#KERNEL ?= "kernel26" - -INHERIT += "linux-kernel-base" - -OVERRIDES =. "${KERNEL}:" +#@NAME: HP iPAQ h39xx +#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx +# +# Hardware-based properties +# TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" -PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6" -EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" -ROOT_FLASH_SIZE = "32" +require conf/machine/include/tune-xscale.conf -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" -H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380" -H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core" -# 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" -SERIAL_CONSOLE = "115200 tts/0 vt100" +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_g_ether = "g_ether" -USE_DEVFS_kernel24 = "1" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" - -GUI_MACHINE_CLASS = "smallscreen" - -# not using tune-xscale so as to retain backwards compatibility -require conf/machine/include/tune-xscale.conf +require conf/machine/include/LAB-settings.conf |