summaryrefslogtreecommitdiff
path: root/conf/machine/include/collie-2.6.conf
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-12-29 21:36:32 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-12-29 21:36:32 +0000
commitdc08d40ce15f8cc52701ae4ea131d4aff8069522 (patch)
tree0a6105efcb3c3c8c617cfb01c8c13ebd8b5e9581 /conf/machine/include/collie-2.6.conf
parent23e1b626cf2f43fc28cbca114aeddef13697ce02 (diff)
parent862b6764dadafbdc0f5720150c0120e03626e93c (diff)
merge of '5238e30c679ed4c9836291822577cc8cf6d35993'
and '562347f263f94adfc20ea37413a2b6b2a54028fb'
Diffstat (limited to 'conf/machine/include/collie-2.6.conf')
-rw-r--r--conf/machine/include/collie-2.6.conf4
1 files changed, 4 insertions, 0 deletions
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"