diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-29 21:36:32 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-12-29 21:36:32 +0000 |
| commit | dc08d40ce15f8cc52701ae4ea131d4aff8069522 (patch) | |
| tree | 0a6105efcb3c3c8c617cfb01c8c13ebd8b5e9581 /conf/machine/include | |
| parent | 23e1b626cf2f43fc28cbca114aeddef13697ce02 (diff) | |
| parent | 862b6764dadafbdc0f5720150c0120e03626e93c (diff) | |
merge of '5238e30c679ed4c9836291822577cc8cf6d35993'
and '562347f263f94adfc20ea37413a2b6b2a54028fb'
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/collie-2.4.conf | 17 | ||||
| -rw-r--r-- | conf/machine/include/collie-2.6.conf | 4 |
2 files changed, 21 insertions, 0 deletions
diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf new file mode 100644 index 0000000000..0412ea359a --- /dev/null +++ b/conf/machine/include/collie-2.4.conf @@ -0,0 +1,17 @@ +PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix" + +SERIAL_CONSOLE = "115200 ttyS0" +# +# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash +# no usbgadget feature because 2.4 kernel handle it in own way on each machine +# +MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ + kernel-module-usbdcore kernel-module-usbdmonitor \ + sharp-sdmmc-support" + +# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied + +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-modules = "0.13e" diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf new file mode 100644 index 0000000000..eab879368c --- /dev/null +++ b/conf/machine/include/collie-2.6.conf @@ -0,0 +1,4 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +SERIAL_CONSOLE = "115200 ttySA0" +MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen" |