ubispl: migrate configuration to Kconfig

Move the ubispl configuration to KConfig and drop them from the
whitelist.

Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Kyungmin Park <kmpark@infradead.org>
Cc: Javier Martínez Canillas <javier@dowhile0.org>
Cc: Enric Balletbo i Serra <eballetbo@gmail.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 142753f9e7aa5a2725c6025ab91d4e22b7f9bb3d..31eac5af8ddd44278024a58ca28367fe688e48a0 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -613,6 +613,85 @@ config SPL_NAND_SUPPORT
          This enables the drivers in drivers/mtd/nand/raw as part of an SPL
          build.
 
+config SPL_UBI
+       bool "Support UBI"
+       help
+         Enable support for loading payloads from UBI. See
+         README.ubispl for more info.
+
+if SPL_UBI
+config SPL_UBI_MAX_VOL_LEBS
+       int "Maximum number of LEBs per volume"
+       depends on SPL_UBI
+       help
+         The maximum number of logical eraseblocks which a static volume
+         to load can contain. Used for sizing the scan data structure.
+
+config SPL_UBI_MAX_PEB_SIZE
+       int "Maximum PEB size"
+       depends on SPL_UBI
+       help
+         The maximum physical erase block size.
+
+config SPL_UBI_MAX_PEBS
+       int "Maximum number of PEBs"
+       depends on SPL_UBI
+       help
+         The maximum physical erase block size. If not overridden by
+         board code, this value will be used as the actual number of PEBs.
+
+config SPL_UBI_PEB_OFFSET
+       int "Offset to first UBI PEB"
+       depends on SPL_UBI
+       help
+         The offset in number of PEBs from the start of flash to the first
+         PEB part of the UBI image.
+
+config SPL_UBI_VID_OFFSET
+       int "Offset to VID header"
+       depends on SPL_UBI
+
+config SPL_UBI_LEB_START
+       int "Offset to LEB in PEB"
+       depends on SPL_UBI
+       help
+         The offset in bytes to the LEB within a PEB.
+
+config SPL_UBI_INFO_ADDR
+       hex "Address to place UBI scan info"
+       depends on SPL_UBI
+       help
+         Address for ubispl to place the scan info. Read README.ubispl to
+         determine the required size
+
+config SPL_UBI_VOL_IDS
+       int "Maximum volume id"
+       depends on SPL_UBI
+       help
+         The maximum volume id which can be loaded. Used for sizing the
+         scan data structure.
+
+config SPL_UBI_LOAD_MONITOR_ID
+       int "id of U-Boot volume"
+       depends on SPL_UBI
+       help
+         The UBI volume id from which to load U-Boot
+
+config SPL_UBI_LOAD_KERNEL_ID
+       int "id of kernel volume"
+       depends on SPL_OS_BOOT && SPL_UBI
+       help
+         The UBI volume id from which to load the kernel
+
+config SPL_UBI_LOAD_ARGS_ID
+       int "id of kernel args volume"
+       depends on SPL_OS_BOOT && SPL_UBI
+       help
+         The UBI volume id from which to load the device tree
+
+
+endif   # if SPL_UBI
+
 config SPL_NET_SUPPORT
        bool "Support networking"
        help

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7bb9545d4bc581951b0e1c83baeed5b35413089a..2fc77b77c21e541b394a1dd914fff05279c6a28b 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1794,18 +1794,6 @@ CONFIG_SPL_STACK_ADDR
 CONFIG_SPL_STACK_SIZE
 CONFIG_SPL_START_S_PATH
 CONFIG_SPL_TARGET
-CONFIG_SPL_UBI
-CONFIG_SPL_UBI_INFO_ADDR
-CONFIG_SPL_UBI_LEB_START
-CONFIG_SPL_UBI_LOAD_ARGS_ID
-CONFIG_SPL_UBI_LOAD_KERNEL_ID
-CONFIG_SPL_UBI_LOAD_MONITOR_ID
-CONFIG_SPL_UBI_MAX_PEBS
-CONFIG_SPL_UBI_MAX_PEB_SIZE
-CONFIG_SPL_UBI_MAX_VOL_LEBS
-CONFIG_SPL_UBI_PEB_OFFSET
-CONFIG_SPL_UBI_VID_OFFSET
-CONFIG_SPL_UBI_VOL_IDS
 CONFIG_SPL_UBOOT_KEY_HASH
 CONFIG_SRAM_BASE
 CONFIG_SRAM_SIZE