summaryrefslogtreecommitdiff
path: root/conf/machine/include/zaurus-2.6.inc
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-06-07 10:17:43 +0200
committerKoen Kooi <koen@openembedded.org>2009-06-07 10:17:43 +0200
commit4e8dfb18de51e5c817c0bf5c45db00deabf18359 (patch)
tree423370f176fbbaab35dfabd068df094d7c16e199 /conf/machine/include/zaurus-2.6.inc
parent4e9f655e60a5190cce98981328b725965ba57ede (diff)
parentead01d1ba1b934b89179a9c95a7613e48207429f (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include/zaurus-2.6.inc')
-rw-r--r--conf/machine/include/zaurus-2.6.inc3
1 files changed, 0 insertions, 3 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cdad690545..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -14,9 +14,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
EXTRA_IMAGEDEPENDS += "zaurus-installer"
-# collie is flashed by pressing C+D on power-on
-EXTRA_IMAGEDEPENDS_collie += ""
-
SERIAL_CONSOLE = "115200 ttyS0"
SERIAL_CONSOLE_collie = "115200 ttySA0"