[ptxdist] enhance ubi image creation

This one reworks the UBI image relevant stuffs. Creating a root volume is a
selectable option, though mandatory, now. Split out the volume specific
options from UBI generic options, so that we could add options for further
volumes later. Also updated the help text and Add some enhancement to the
makefile in printing and macro usage.

Signed-off-by: Luotao Fu <l.fu@pengutronix.de>

2 files changed, 78 insertions, 26 deletions

diff --git a/platforms/image_ubi.in b/platforms/image_ubi.in
index f67923503..601051e0a 100644
--- a/platforms/image_ubi.in
+++ b/platforms/image_ubi.in
@@ -3,21 +3,17 @@
 menuconfig IMAGE_UBI
 	bool
 	select IMAGE_UBIFS
-	prompt "Generate images/root.ubi      "
+	select IMAGE_UBI_ROOT_VOL
+	prompt "Generate UBI Image            "
 	help
-	  Build an ubi image of the root filesystem. This image is suitable for
-	  writing to raw flash devices.
+	  Build ubi formated image(s) for the root file system and an
+	  optional data partition. UBI is faster and robuster than JFFS2,
+	  we recommend strongly the usage of UBI if you want a file
+	  system for raw flash devices. The image(s) can be directly
+	  written to e.g. an mtd partition on a raw flash devices.
 
 if IMAGE_UBI
 
-config IMAGE_UBI_VOLUME_SIZE
-	string
-	prompt "ubi volume size"
-	default "<invalid>"
-	help
-	  ptxdist currently creates ubi images with only one volume in it. Specify
-	  its size here.
-
 config IMAGE_UBI_SUB_PAGE_SIZE
 	string
 	prompt "Sub page size"
@@ -42,5 +38,53 @@ config IMAGE_UBI_PEB_SIZE
 	  This option is passed to the -p option of ubinize. Gain the
 	  correct value from 'mtdinfo -u' on your target.
 
-endif
+menuconfig IMAGE_UBI_ROOT_VOL
+	bool
+	select IMAGE_UBIFS_ROOT
+	default y
+	prompt "Create root volume      "
+	help
+	  Create a root volume with the content of root.ubifs. You will
+	  most probably want to activate this option is essential since
+	  otherwise the final ubi image  will not contain a root file
+	  system.
+
+if IMAGE_UBI_ROOT_VOL
 
+config IMAGE_UBI_ROOT_VOL_SIZE
+	string
+	prompt "root volume size"
+	default "<invalid>"
+	help
+	  Give the root volume size here. You can use size unit like
+	  "KiB" or "MiB".
+
+	  The volume size must be greater than than the actual ubifs
+	  file. Further the sum of all volumes in an UBI image should
+	  be slightly smaller than the mtd device, to wich the image
+	  will be flashed. The spare place is supposed to be used for
+	  Jounal and other UBI header informations. We recommend a
+	  ratio between spare place and the actual size of the mtd
+	  partion at about 10% or higher. It is OK to define a big
+	  amount of spare place. The UBI System will scan for available
+	  space during first boot and expand the volume to the maximal
+	  usable size after reserving internally used blocks.
+
+	  An example: Our UBI image is supposed to contain a single "root"
+	  volume. The mtd partition, onto which we will flash the UBI
+	  image has a size of 32MiB. Our actual rootfs.ubifs has a size
+	  of 16MiB. Than we should define our root volume size between
+	  16MiB and 29MiB. We decide for 25MiB. During the boot process
+	  the UBI system detects a mtd partiton of 32MiB. After reserving
+	  2MiB for internal use it will expand our volume automatically to
+	  30MiB.
+
+config IMAGE_UBI_ROOT_VOL_NAME
+	string
+	prompt "root volume name"
+	default "root"
+	help
+	  Give the root volume name here. Default is "root".
+
+endif
+endif
diff --git a/platforms/image_ubifs.in b/platforms/image_ubifs.in
index c569cd808..f28e906d0 100644
--- a/platforms/image_ubifs.in
+++ b/platforms/image_ubifs.in
@@ -3,12 +3,12 @@
 menuconfig IMAGE_UBIFS
 	bool
 	select HOST_MTD_UTILS
-	prompt "Generate images/root.ubifs    "
+	prompt "Generate UBIFS Images         "
 	help
-	  Build an ubifs image of the root filesystem. Note that this image
-	  is not suitable for raw flash but for usage with the ubiupdatevol
-	  utility. If you are looking for a image for raw flash look at the
-	  root.ubi option below
+	  Build ubifs images of the root filesystem or an optional data
+	  partition. Note that this image is not suitable for raw flash
+	  but for usage with the ubiupdatevol utility. If you are looking
+	  for a image for raw flash look at the "UBI Image" option below
 
 if IMAGE_UBIFS
 
@@ -28,15 +28,6 @@ config IMAGE_UBIFS_LEB_SIZE
 	  This option is passed to the -e option of mkfs.ubifs. Gain the
 	  correct value from 'mtdinfo -u' on your target.
 
-config IMAGE_UBIFS_MAX_LEB_COUNT
-	string
-	default "<invalid>"
-	prompt "maximum logical erase block count"
-	help
-	  This option is passed to the -c option of mkfs.ubifs. This specifies
-	  the maximum size of your ubi filesystem in units of logical erase
-	  blocks
-
 config IMAGE_UBIFS_EXTRA_ARGS
 	string
 	default ""
@@ -45,4 +36,21 @@ config IMAGE_UBIFS_EXTRA_ARGS
 	  If needed you can add extra arguments for mkfs.ubifs here
 	  (e.g. --devtable=${PTXDIST_WORKSPACE}/device_table.txt)
 
+menuconfig IMAGE_UBIFS_ROOT
+	bool
+	default y
+	prompt "Generate images/root.ubifs      "
+	help
+	  Build an ubifs image of the root filesystem.
+
+if IMAGE_UBIFS_ROOT
+config IMAGE_UBIFS_ROOT_MAX_LEB_COUNT
+	string
+	default "<invalid>"
+	prompt "maximum logical erase block count"
+	help
+	  This option is passed to the -c option of mkfs.ubifs. This specifies
+	  the maximum size of your ubi filesystem in units of logical erase
+	  blocks
+endif
 endif