diff options
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/h5xxx.conf | 22 | ||||
| -rw-r--r-- | conf/machine/htcuniversal.conf | 25 |
2 files changed, 18 insertions, 29 deletions
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 2ab9775419..6e9e951132 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -2,17 +2,10 @@ #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices -#KERNEL ?= "kernel24" -KERNEL ?= "kernel26" - -OVERRIDES =. "${KERNEL}:" - -INHERIT += "linux_modules" TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" @@ -20,18 +13,17 @@ ROOT_FLASH_SIZE = "32" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" -BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" -H5XXX_MODULES_kernel24 = " g_ether pxa2xx_udc h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mtdchar h5400-audio" -H5XXX_MODULES_kernel26 = " h5400_lcd g_ether apm h5400_battery pcmcia-core" -# pxa2xx_udc is built in to the kernel +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" +MACHINE_EXTRA__RRECOMMENDS = " \ + kernel-module-h5400_lcd \ + kernel-module-h5400_battery \ + " + + SERIAL_CONSOLE = "115200 tts/0 vt100" -USE_DEVFS_kernel24 = "1" USE_VT = "0" GUI_MACHINE_CLASS = "smallscreen" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 8fae31d9f8..86b46dcbca 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -13,19 +13,18 @@ XSERVER = "xserver-kdrive-fbdev" MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen" MODUTILS = "26" -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" -BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" -BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \ - snd_pcm_oss snd_mixer_oss \ - hidp bluetooth bfusb hci_usb \ - irtty-sir pxaficp_ir sir-dev \ - " - -include conf/machine/include/smartphone-common.conf +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" +MACHINE_EXTRA__RRECOMMENDS = " kernel-module-nls_cp437 \ + kernel-module-nls_iso8859-1 \ + kernel-module-nls_utf8 \ + kernel-module-af_key \ + kernel-module-bsd_comp \ + kernel-module-i2c-pxa \ + kernel-module-htcuniversal_power \ + kernel-module-snd-htcuniversal_audio \ + kernel-module-htcuniversal_acx \ + " GUI_MACHINE_CLASS = "bigscreen" @@ -35,8 +34,6 @@ include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #include conf/machine/include/tune-iwmmxt.conf -UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio" - module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" |