diff options
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/htcuniversal.conf | 6 | ||||
| -rw-r--r-- | conf/machine/include/smartphone-common.conf | 1 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 11 |
3 files changed, 13 insertions, 5 deletions
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 800cd77540..288f3ebaa9 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d) BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether snd_pcm_oss snd_mixer_oss hidp" +PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor" SERIAL_CONSOLE = "115200 tts/0" @@ -30,14 +30,16 @@ 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_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds" +UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds 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-power = "htcuniversal_power" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf index 2ff8d4bc47..bd5983cdc0 100644 --- a/conf/machine/include/smartphone-common.conf +++ b/conf/machine/include/smartphone-common.conf @@ -3,6 +3,7 @@ ipsec \ nvrd \ mip6-mn \ tun \ +nls-base nls-cp437 nls-iso8859-1 \ fat vfat \ loop \ rfcomm bnep l2cap sco hci_uart hidp \ diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f5cc893c9c..9ed313334b 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,7 +22,8 @@ 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" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" +BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ @@ -41,8 +42,12 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf 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" + +# These modules are now compiled into the kernel: +#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ +# hx4700_pcmcia hx4700_ts hx4700_power" + +HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio" module_autoload_evdev = "evdev" |