zaurus machine configurations: fix ROOT_FLASH_SIZE on all models and set 2.6 as default kernel for akita, borzoi, and spitz.

7 files changed, 18 insertions, 13 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index cfcc411671..6cf622ae1c 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,9 +2,9 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
 
 include conf/machine/zaurus-clamshell.conf
 include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-ROOT_FLASH_SIZE = "64"
+ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
index b2d2eafc22..b7bb5a0afe 100644
--- a/conf/machine/borzoi.conf
+++ b/conf/machine/borzoi.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C3100
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device
 
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
 
 include conf/machine/zaurus-clamshell.conf
 include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
@@ -17,4 +17,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "100"
+# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
+# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
+
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index c5e42a2bed..6b8348e117 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -7,6 +7,5 @@ KERNEL_VERSION ?= "2.6"
 include conf/machine/zaurus-clamshell.conf
 include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-ROOT_FLASH_SIZE = "32"
-# yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
-
+ROOT_FLASH_SIZE = "25"
+# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 9384b0527b..4af42deb24 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -27,7 +27,8 @@ include conf/machine/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-ROOT_FLASH_SIZE = "16"
+ROOT_FLASH_SIZE = "14"
+# actually 14680064, see EXTRA_IMAGECMD above
 
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index e0cc83e6aa..8b33912835 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -16,8 +16,7 @@ BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 include conf/machine/handheld-common.conf
 
-# yes, it has 64MB...
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "22"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/tune-xscale.conf
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 9a53e8f1a9..2b22680554 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,7 +2,7 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
 
 include conf/machine/zaurus-clamshell.conf
 include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
@@ -13,8 +13,11 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
 BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 
 ROOT_FLASH_SIZE = "100"
+# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
+# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte
+
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ab5b169d4f..20cf6946ae 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -16,7 +16,7 @@ BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "28"
 
 include conf/machine/handheld-common.conf