Zaurus machines: reorganize configuration files

 - uniform the MACHINE_DISPLAY
 - remove unneded IMAGE_FSTYPES because .jffs2 and tar.gz are default
 - add ext2 to MACHINE_FEATURES: already in kernel for boot from CF/SD
 - fix? width/height for spiz (set width 640 for clamshells)
 - add pixel-per-inch info

8 files changed, 53 insertions, 38 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 728ce4d9fe..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -8,10 +8,16 @@ require conf/machine/include/zaurus-clamshell.inc
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 MACHINE_FEATURES += "iwmmxt"
 
-IMAGE_FSTYPES ?= "jffs2"
-
 # NAND factory-default
 # mtdparts=sharpsl-nand:7168k@0k(smf),59392k@7168k(root),-(home) 
 ROOT_FLASH_SIZE = "58"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "216"
+
 UBOOT_MACHINE = "akita_config"
+UBOOT_ENTRYPOINT = "0xA1000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 6a6c1b81a6..16073fee82 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -5,18 +5,24 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
-IMAGE_FSTYPES += "jffs2"
-
 # NAND factory-default
 # SL-C700 (corgi) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
 # SL-C750 (Shepherd) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
 # SL-C760 (Husky) mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)
 # SL-C860 (Boxer) mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)
 
+# There isn't an unique size valid for all models,
+# please set the right value in your local.conf
 ROOT_FLASH_SIZE = "25"
-# yes, we are aware that the husky and boxer (c760,c860) have 53MB rootfs,
-# but we don't make a special image for them.
 
 XSERVER = "xserver-kdrive-imageon"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "216"
+
 UBOOT_MACHINE = "corgi_config"
+UBOOT_ENTRYPOINT = "0xA0008000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 6d09406375..96f430f377 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -25,7 +25,12 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "114"
+
 require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 71fea7a508..d3345b469b 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -22,20 +22,21 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
-MACHINE_FEATURES_append_spitz = " usbhost ext2 "
+MACHINE_FEATURES_append_spitz = " usbhost "
 
-MACHINE_EXTRA_RDEPENDS = "zaurusd"
+MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
+
+# Fixme ?
+#########
+# Here we just need snd modules
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
+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"
 
-GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_poodle = "smallscreen"
-
 KERNEL_IMAGE_MAXSIZE = "1294336"
 
 ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index c3bbca856a..34e803e418 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,11 +1,5 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT_c7x0 = "0xA0008000"
-UBOOT_ENTRYPOINT_akita = "0xA1000000"
-UBOOT_ENTRYPOINT_spitz = "0xA1000000"
-
-UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
 
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 4e8f011a1e..db7a7809a7 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,6 +5,10 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-IMAGE_FSTYPES ?= "jffs2"
-
 ROOT_FLASH_SIZE = "22"
+
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "114"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 306046cfe8..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -6,24 +6,24 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 MACHINE_FEATURES += "iwmmxt"
-
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
-IMAGE_FSTYPES += "tar.gz"
 
 # NAND factory-default
 # SL-C3000 (spitz) mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)
 # SL-C3100 (borzoi) mtdparts=sharpsl-nand:7168k@0k(smf),32768k@7168k(root),-(home)
 # SL-C3200 (terrier) mtdparts=sharpsl-nand:7168k@0k(smf),44032k@7168k(root),-(home)
 
-# Valid size for all models, rootfs is on disk for these machines
-ROOT_FLASH_SIZE = "100"
+# There isn't an unique size valid for all models,
+# please set the right value in your local.conf
+ROOT_FLASH_SIZE ?= "5"
 
-MACHINE_GUI_CLASS=bigscreen
-MACHINE_DISPLAY_WIDTH_PIXELS=480
-MACHINE_DISPLAY_HEIGHT_PIXELS=640
-MACHINE_DISPLAY_ORIENTATION=270
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "216"
 
 # spitz and akita share same u-boot machine
 UBOOT_MACHINE = "akita_config"
+UBOOT_ENTRYPOINT = "0xA1000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 593ceab33d..87cfe4781a 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,15 +5,14 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-IMAGE_FSTYPES += "jffs2 tar.gz"
-
 # wlan-ng Modules
 # OHCI suspend/resume fixup
 MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix"
 
 ROOT_FLASH_SIZE = "28"
 
-MACHINE_GUI_CLASS=bigscreen
-MACHINE_DISPLAY_WIDTH_PIXELS=480
-MACHINE_DISPLAY_HEIGHT_PIXELS=640
-MACHINE_DISPLAY_ORIENTATION=0
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "200"