diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-07-12 22:26:22 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-12 22:26:22 +0000 |
commit | b406d42a43853a43c9c3de592de7f3a152e6f235 (patch) | |
tree | 4d5865fd30711849aba9e3edf64e79b77f985ff0 /conf | |
parent | 738a9bde53edf9462237240a72fd8bfd867f8b2e (diff) | |
parent | 7fd2d7fc55069e967f0696e5dcd0ab8ad90fbf31 (diff) |
merge of cddb2bc75922196fed2e730ac6188b75cec87184
and d09f0621b4e183654539b5e69434b52a32e26b72
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/htcuniversal.conf | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index b8368f32c9..0e377a151f 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -6,18 +6,17 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal" #use this for a HTC Universal PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6" - +#PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-un-2.6" MODUTILS = "26" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" +#BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor" - -SERIAL_CONSOLE = "115200 tts/0" +PXA270_MODULES = "g_ether hidp i2c-core i2c-pxa i2c-sensor" include conf/machine/include/smartphone-common.conf @@ -30,21 +29,22 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" +UN_MODULES = " htcuniversal_acx acx" -module_autoload_htcuniversal_power = "htcuniversal_power" -module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_firmware-class = "firmware-class" +#module_autoload_htcuniversal_power = "htcuniversal_power" +#module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" +#module_autoload_snd-pcm-oss = "snd-pcm-oss" +#module_autoload_snd-mixer-oss = "snd-mixer-oss" +#module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" module_autoload_htcuniversal-acx = "htcuniversal_acx" -module_autoload_htcuniversal-bt = "htcuniversal_bt" +#module_autoload_htcuniversal-bt = "htcuniversal_bt" +#module_autoload_htcuniversal-power = "htcuniversal_power" #module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" -GPE_EXTRA_DEPENDS += " gomunicator" +#GPE_EXTRA_DEPENDS += " gomunicator" |