diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-06-06 10:04:21 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-06-06 10:04:21 +0200 |
| commit | 5384ff2127f309a53e161f9fcec6e9f602490d75 (patch) | |
| tree | 0ea8209492d58094957c9adaad85961cca3f691b /conf | |
| parent | 75c6eb25b4bd16c0d81ee7af405c8f090db752e1 (diff) | |
| parent | 1c4705fe4cb9d094d52ef20317bbf229951ee79b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 69589a0d60..cdad690545 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -14,6 +14,9 @@ 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" @@ -40,9 +43,10 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-px MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup +# For tosa: OHCI suspend/resume fixup +# wlan-ng is now in kernel (2.6.29) # Fixme ? module-snd for tosa -MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix" +MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" # Fixme ? module-snd for collie MACHINE_EXTRA_RRECOMMENDS_collie = "" |