From 5ff3e46de7ea08446d63669f80044b369c75be5e Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 5 Jun 2009 23:46:30 +0200 Subject: zaurus-2.6.inc: [tosa] wlan-ng is now inside the kernel for tosa --- conf/machine/include/zaurus-2.6.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 69589a0d60..ba923f9515 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -40,9 +40,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 = "" -- cgit v1.2.3 From d8eaa05dad4e1f331c3d01ab8706a060153f442b Mon Sep 17 00:00:00 2001 From: Lynn Lin Date: Sat, 6 Jun 2009 07:12:11 +0800 Subject: delete .swp dirty file --- recipes/mini-httpd/.mini-httpd_1.19.bb.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 recipes/mini-httpd/.mini-httpd_1.19.bb.swp diff --git a/recipes/mini-httpd/.mini-httpd_1.19.bb.swp b/recipes/mini-httpd/.mini-httpd_1.19.bb.swp deleted file mode 100644 index d384577124..0000000000 Binary files a/recipes/mini-httpd/.mini-httpd_1.19.bb.swp and /dev/null differ -- cgit v1.2.3 From d4dae3f91c9e0e5391ea5e83751ae0d56cbaabe6 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sat, 6 Jun 2009 01:55:27 +0200 Subject: zaurus-2.6.inc: FIX - collie doesn't need zaurus-updater in EXTRA_IMAGEDEPENDS --- conf/machine/include/zaurus-2.6.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index ba923f9515..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" -- cgit v1.2.3 From 1c4705fe4cb9d094d52ef20317bbf229951ee79b Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 6 Jun 2009 09:06:36 +0900 Subject: zaurusd: fix spelling mistake in DESCRIPTION --- recipes/zaurusd/zaurusd_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb index 6240492a61..574e642b23 100644 --- a/recipes/zaurusd/zaurusd_svn.bb +++ b/recipes/zaurusd/zaurusd_svn.bb @@ -1,10 +1,10 @@ -DESCRIPTION = "Daemon to handle device specifc features." +DESCRIPTION = "Daemon to handle device specific features." SECTION = "base" LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r20" +PR = "r21" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ -- cgit v1.2.3