summaryrefslogtreecommitdiff
path: root/conf/machine/include/collie-2.6.conf
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-01-04 11:22:16 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-01-04 11:22:16 +0000
commit4b7e6a49215b00d0cfa9a0fde3808f032a9599e5 (patch)
treef2e294728789ab01a7a89fa06b6c67c5464ceab0 /conf/machine/include/collie-2.6.conf
parent4601ad28765bf7ef207974f9ad7fc209d3745088 (diff)
parent8f19556367701b3a3fa50802903d0d67997407b7 (diff)
merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
and '8091ca9b08503f4700e05ee8973cec755727ed4a'
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"