merge of cd42ec314bd37793cf241d63236ff65f5851c99e

     and ec21bc325dc1d1e889b34a10304e189b8f8bc6fc

7 files changed, 27 insertions, 29 deletions

diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index 5098b6beea..705dcd1905 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -1,3 +1,6 @@
+# Zaurus Clamshell specific configuration for kernel 2.4
+# Don't forget to include zaurus-clamshell.conf as well
+
 PREFERRED_PROVIDERS_append_c7x0  = " virtual/kernel:c7x0-kernels-2.4-embedix"
 PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
 PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
@@ -5,22 +8,16 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
-hostap-utils prism3-firmware prism3-support"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apm apmd ppp wireless-tools irda-utils console-tools \
-hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
 
-# Spitz needs minimal bootstrap
-BOOTSTRAP_EXTRA_DEPENDS_spitz = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd wireless-tools irda-utils wpa-supplicant-nossl lrzsz hostap-utils prism3-firmware prism3-support"
-BOOTSTRAP_EXTRA_RDEPENDS_spitz = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
+pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 # Misc Modules
-BOOTSTRAP_EXTRA_RDEPENDS += kernel-module-net-fd kernel-module-registers
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers"
 
 # USB Client Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor"
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 7b6761b250..9b0ef708fa 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -1,14 +1,16 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules    orinoco-modules \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
-hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel        udev sysfsutils hostap-modules-cs orinoco-modules-cs \
-pcmcia-cs apm  ppp wireless-tools irda-utils udev-utils console-tools \
-hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \
+pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl"
 
 # Ethernet modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
@@ -28,7 +30,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
                              kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
 
-#USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
-							 kernel-module-g-ether"
+# USB Gadget Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+                             kernel-module-g-serial kernel-module-g-ether"
 
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
index a3363d824f..65e01a18f7 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
@@ -53,9 +53,8 @@ inherit kernel
 #
 # Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass.
 #
-CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)  EQUIPMENT=0"
-CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=4"
-
+CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)  EQUIPMENT=4 RTC_RESET=1"
+CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=0"
 CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
 # CMDLINE_INIT = "init=/bin/busybox ash"
 CMDLINE_INIT = " "
diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
 Decoration = libliquid.so
 Highlight = #52719c
 HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
 Text = #000000
 TabStyle = 1
 [InputMethod]
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
 Decoration = libliquid.so
 Highlight = #52719c
 HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
 Text = #000000
 TabStyle = 1
 [InputMethod]
diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
 Decoration = libliquid.so
 Highlight = #52719c
 HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
 Text = #000000
 TabStyle = 1
 [InputMethod]
diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf
index 3740bfc351..e9922e4d86 100644
--- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf
@@ -15,7 +15,7 @@ ButtonText = #000000
 Decoration = libliquid.so
 Highlight = #52719c
 HighlightedText = #ffffff
-Style = libphasestyle.so
+Style = Windows
 Text = #000000
 TabStyle = 1
 [InputMethod]