[meta-handheld][PATCH 0/6] minor fixes for Zaurus

[meta-handheld][PATCH 0/6] minor fixes for Zaurus

[Andrea Adami]

Spring-cleanings of obsolete variables and removal of machines
which can be built as spitz or c7x0

Andrea Adami (6):
  linux-yocto-3.8: remove cruft (to-do about regulators)
  zaurus: remove u-boot remnants from akita/spitz/c7x0 configs
  zaurus: remove obsolete ROOT_FLASH_SIZE
  zaurus: add note about mtdparts of tosa
  zaurus: remove configurations of models aliased by c7x0 and spitz
  zaurus: add README.zaurus, about flashing kernel, JFFS2 and UBIFS
    images

 README.zaurus              | 88 ++++++++++++++++++++++++++++++++++++++++++++++
 conf/machine/akita.conf    |  5 ---
 conf/machine/borzoi.conf   |  2 --
 conf/machine/boxer.conf    |  2 --
 conf/machine/c7x0.conf     |  8 -----
 conf/machine/collie.conf   |  2 --
 conf/machine/corgi.conf    |  3 --
 conf/machine/husky.conf    |  2 --
 conf/machine/poodle.conf   |  2 --
 conf/machine/shepherd.conf |  3 --
 conf/machine/spitz.conf    |  9 -----
 conf/machine/terrier.conf  |  2 --
 conf/machine/tosa.conf     |  3 +-
 13 files changed, 90 insertions(+), 41 deletions(-)
 create mode 100644 README.zaurus
 delete mode 100644 conf/machine/borzoi.conf
 delete mode 100644 conf/machine/boxer.conf
 delete mode 100644 conf/machine/corgi.conf
 delete mode 100644 conf/machine/husky.conf
 delete mode 100644 conf/machine/shepherd.conf
 delete mode 100644 conf/machine/terrier.conf
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.8/REGULATORS

-- 
1.7.12.4

[meta-handheld][PATCH 1/6] linux-yocto-3.8: remove cruft (to-do about regulators)

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 0 files changed
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.8/REGULATORS

diff --git a/recipes-kernel/linux/linux-yocto-3.8/REGULATORS b/recipes-kernel/linux/linux-yocto-3.8/REGULATORS
deleted file mode 100644
index e69de29..0000000
-- 
1.7.12.4

[meta-handheld][PATCH 2/6] zaurus: remove u-boot remnants from akita/spitz/c7x0 configs

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/akita.conf | 4 ----
 conf/machine/c7x0.conf  | 4 ----
 conf/machine/spitz.conf | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 0b31954..c881693 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -17,7 +17,3 @@ 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 f5ec132..c0f07e1 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -20,7 +20,3 @@ 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/spitz.conf b/conf/machine/spitz.conf
index f585197..b2283ec 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -22,8 +22,3 @@ 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}"
-- 
1.7.12.4

[meta-handheld][PATCH 3/6] zaurus: remove obsolete ROOT_FLASH_SIZE

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/akita.conf  | 1 -
 conf/machine/c7x0.conf   | 4 ----
 conf/machine/collie.conf | 2 --
 conf/machine/poodle.conf | 2 --
 conf/machine/spitz.conf  | 4 ----
 conf/machine/tosa.conf   | 2 --
 6 files changed, 15 deletions(-)

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index c881693..282bb76 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -10,7 +10,6 @@ MACHINE_FEATURES += "iwmmxt"
 
 # 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"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index c0f07e1..86b41f1 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -11,10 +11,6 @@ require conf/machine/include/tune-xscale.inc
 # 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"
-
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "640"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 2cd1499..2d191c7 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,8 +5,6 @@
 require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-strongarm1100.inc
 
-ROOT_FLASH_SIZE = "14"
-
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index d1bcb15..befd4a6 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,8 +5,6 @@
 require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
-ROOT_FLASH_SIZE = "22"
-
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index b2283ec..46ca3eb 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -13,10 +13,6 @@ PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt"
 # 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)
 
-# 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 = "640"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ab12b8b..961d674 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,8 +5,6 @@
 require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
-ROOT_FLASH_SIZE = "28"
-
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-- 
1.7.12.4

[meta-handheld][PATCH 4/6] zaurus: add note about mtdparts of tosa

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/tosa.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 961d674..280e81f 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,6 +5,9 @@
 require conf/machine/include/zaurus.inc
 require conf/machine/include/tune-xscale.inc
 
+# NAND factory-default
+# mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home)
+
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-- 
1.7.12.4

[meta-handheld][PATCH 5/6] zaurus: remove configurations of models aliased by c7x0 and spitz

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 conf/machine/borzoi.conf   | 2 --
 conf/machine/boxer.conf    | 2 --
 conf/machine/corgi.conf    | 3 ---
 conf/machine/husky.conf    | 2 --
 conf/machine/shepherd.conf | 3 ---
 conf/machine/terrier.conf  | 2 --
 6 files changed, 14 deletions(-)
 delete mode 100644 conf/machine/borzoi.conf
 delete mode 100644 conf/machine/boxer.conf
 delete mode 100644 conf/machine/corgi.conf
 delete mode 100644 conf/machine/husky.conf
 delete mode 100644 conf/machine/shepherd.conf
 delete mode 100644 conf/machine/terrier.conf

diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
deleted file mode 100644
index d037a1f..0000000
--- a/conf/machine/borzoi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C3100,\n*    because \
-its very similar to the SL-C3000. Use MACHINE = \"spitz\".\n*\n*\n')}"
diff --git a/conf/machine/boxer.conf b/conf/machine/boxer.conf
deleted file mode 100644
index f5afc14..0000000
--- a/conf/machine/boxer.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C860,\n*    because \
-it really is just a Sharp SL-C760 with a different case color. Use MACHINE = \"c7x0\".\n*\n*\n')}"
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf
deleted file mode 100644
index 8055af0..0000000
--- a/conf/machine/corgi.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C700,\n*    because \
-of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}"
-
diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf
deleted file mode 100644
index fae9540..0000000
--- a/conf/machine/husky.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C760,\n*    because \
-of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}"
diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf
deleted file mode 100644
index 1541712..0000000
--- a/conf/machine/shepherd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C750,\n*    because \
-of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}"
-
diff --git a/conf/machine/terrier.conf b/conf/machine/terrier.conf
deleted file mode 100644
index ca6a20d..0000000
--- a/conf/machine/terrier.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, There is no dedicated configuration for the Sharp SL-C3200,\n*    because \
-its very similar to the SL-C3000/SL-C3100. Use MACHINE = \"spitz\".\n*\n*\n')}"
-- 
1.7.12.4

[meta-handheld][PATCH 6/6] zaurus: add README.zaurus, about flashing kernel, JFFS2 and UBIFS images

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 README.zaurus | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 README.zaurus

diff --git a/README.zaurus b/README.zaurus
new file mode 100644
index 0000000..50539cf
--- /dev/null
+++ b/README.zaurus
@@ -0,0 +1,88 @@
+KEXECBOOT KERNEL
+================
+For the Zaurus a special kernel+initramfs has been developed.
+This special-purpose kernel is small enough to be flashed on NAND and features
+a framebuffer graphical menu for the selection of boot media containing the 
+kernel to be kexec'ed in the second phase.
+Multi-partition cards and lots of filesystems are supported.
+The kernels to be launched are searched for in /boot of each available partition.
+There is a also a configuration file (/boot/boot.cfg) which allows selection of
+other kernels, custom kernel command lines, and specifies the label and the icon
+for each instance.
+
+How to install:
+Just unpack zaurus-installer-YOURMACHINE.tar.gz on a free (FAT or EXT2/3
+formatted) partition: the package contains the kexecboot-kernel and the 
+updater.sh utility. Then proceed as usual for flashing (switch off, pull battery
+out, insert battery again, before inserting AC plug press OK+Power On.
+In the Japanese Menu select 4 and finally 3 for SD card or 4 for CF).
+
+For the SL-5500 (collie) and optionally for other Zaurus too, flashing is 
+possible just using the routines of the original firmware: reset the unit,
+Press C and D button during restart. Note the kernel must be renamed 'zImage'
+(not 'zImage.bin') and the CF card must be formatted FAT.
+
+
+ZAURUS FLASHING HOW-TO
+======================
+The typical flashing procedure mentioned above is easy, using updater.sh
+script which expects the following files:
+
+ zImage     for kernel
+ initrd.bin for rootfs in mtd2
+ home.bin   for second rootfs in mtd3 (optional)
+
+Alternatively all the flashing work can be done from command line,
+separately for each partition:
+
+ mtd1 kernel (using nandlogical)
+ mtd2 rootfs (using nandwrite)
+ mtd3 home   (using nandwrite)
+
+
+kernel
+======
+Typically you should rarely update linux-kexecboot on device,
+
+Besides the updater.sh method you could use the nandlogical tool.
+This utility allows flashing of the kernel directly from shell
+on all Zaurus except collie (collie has NOR flash and not NAND) 
+
+Example:
+
+ nandlogical /dev/mtd1 WRITE 0x0E0000 0x140000 zImage.bin
+
+
+JFFS2 images on the other partitions
+====================================
+Once built, the jffs2 and/or ubifs images need to be flashed on device.
+For JFFS2 the typical choice is the usual flashing procedure using updater.sh
+but you could do it from shell as well using nandwrite (from mtd-utils):
+
+Example: one image on mtd2 and another one on mtd3 (optional)
+
+1st rootfs: plain JFFS2 image
+ flash_eraseall -j /dev/mtd2
+ nandwrite /dev/mtd2 /path/to/core-image-base-<machine>-<date>.rootfs.jffs2
+
+2nd rootfs: JFFS2-summary image
+ flash_eraseall -j /dev/mtd3
+ nandwrite /dev/mtd3 /path/to/core-image-base-<machine>-<date>.rootfs.sum.jffs2
+
+Note: flash_eraseall is deprecated because the erase-counters are reset!
+
+
+UBIFS images
+============
+Recent kexecboot versions can boot the first ubi volume found on each device.
+
+Ubi volumes must be created with the proper ubi-tools (from mtd-utils).
+
+Example: one volume with max available size
+
+ ubiformat /dev/mtd2
+ ubiattach -p /dev/mtd2
+ ubimkvol /dev/ubi0 -N volume_name -m
+ ubiupdatevol /dev/ubi0_0 /path/to/core-image-base-<machine>-<date>.rootfs.ubifs
+
+Same operations can be done for mtd3.
-- 
1.7.12.4

Re: [meta-handheld][PATCH 0/6] minor fixes for Zaurus

[Paul Eggleton]

On Saturday 06 April 2013 00:00:30 Andrea Adami wrote:
> Spring-cleanings of obsolete variables and removal of machines
> which can be built as spitz or c7x0
> 
> Andrea Adami (6):
>   linux-yocto-3.8: remove cruft (to-do about regulators)
>   zaurus: remove u-boot remnants from akita/spitz/c7x0 configs
>   zaurus: remove obsolete ROOT_FLASH_SIZE
>   zaurus: add note about mtdparts of tosa
>   zaurus: remove configurations of models aliased by c7x0 and spitz
>   zaurus: add README.zaurus, about flashing kernel, JFFS2 and UBIFS
>     images
> 
>  README.zaurus              | 88
> ++++++++++++++++++++++++++++++++++++++++++++++ conf/machine/akita.conf    |
>  5 ---
>  conf/machine/borzoi.conf   |  2 --
>  conf/machine/boxer.conf    |  2 --
>  conf/machine/c7x0.conf     |  8 -----
>  conf/machine/collie.conf   |  2 --
>  conf/machine/corgi.conf    |  3 --
>  conf/machine/husky.conf    |  2 --
>  conf/machine/poodle.conf   |  2 --
>  conf/machine/shepherd.conf |  3 --
>  conf/machine/spitz.conf    |  9 -----
>  conf/machine/terrier.conf  |  2 --
>  conf/machine/tosa.conf     |  3 +-
>  13 files changed, 90 insertions(+), 41 deletions(-)
>  create mode 100644 README.zaurus
>  delete mode 100644 conf/machine/borzoi.conf
>  delete mode 100644 conf/machine/boxer.conf
>  delete mode 100644 conf/machine/corgi.conf
>  delete mode 100644 conf/machine/husky.conf
>  delete mode 100644 conf/machine/shepherd.conf
>  delete mode 100644 conf/machine/terrier.conf
>  delete mode 100644 recipes-kernel/linux/linux-yocto-3.8/REGULATORS

Merged these six and the mtd-rw patch, thanks!

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre