disk: convert CONFIG_PARTITIONS to Kconfig

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>

diff --git a/Kconfig b/Kconfig
index cb19ce6f8752876b8adae85cc8eeb489c873ea1f..ff34fa193caad5376740b02cd7a8b4a6f8618fa3 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -311,6 +311,8 @@ source "common/Kconfig"
 
 source "cmd/Kconfig"
 
+source "disk/Kconfig"
+
 source "dts/Kconfig"
 
 source "net/Kconfig"

diff --git a/disk/Kconfig b/disk/Kconfig
new file mode 100644 (file)
index 0000000..966553c
--- /dev/null
+++ b/disk/Kconfig
@@ -0,0 +1,22 @@
+
+menu "Partition Types"
+
+config PARTITIONS
+       bool "Enable Partition Labels (disklabels) support"
+       default y
+       help
+         Partition Labels (disklabels) Supported:
+         Zero or more of the following:
+         - CONFIG_MAC_PARTITION   Apple's MacOS partition table.
+         - CONFIG_DOS_PARTITION   MS Dos partition table, traditional on the
+                                  Intel architecture, USB sticks, etc.
+         - CONFIG_ISO_PARTITION   ISO partition table, used on CDROM etc.
+         - CONFIG_EFI_PARTITION   GPT partition table, common when EFI is the
+                                  bootloader.  Note 2TB partition limit; see
+                                  disk/part_efi.c
+         - CONFIG_MTD_PARTITIONS  Memory Technology Device partition table.
+         If IDE or SCSI support is enabled (CONFIG_CMD_IDE or CONFIG_SCSI)
+         you must configure support for at least one non-MTD partition type
+         as well.
+
+endmenu

diff --git a/include/config_defaults.h b/include/config_defaults.h
index ad08c1d335d3ba29fd75dcab99f948a5c6a7e278..7ef928bbe14ae07b8e474e317ae9aa4616bc0199 100644 (file)
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -18,6 +18,5 @@
 
 #define CONFIG_GZIP 1
 #define CONFIG_ZLIB 1
-#define CONFIG_PARTITIONS 1
 
 #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b32c260d321611367135acf5f229d725c09b35db..8e6d74c9e23a7d03a8cddc16dd47c5720c36b071 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2264,7 +2264,6 @@ CONFIG_PALMAS_SMPS7_FPWM
 CONFIG_PALMAS_USB_SS_PWR
 CONFIG_PANIC_HANG
 CONFIG_PARAVIRT
-CONFIG_PARTITIONS
 CONFIG_PARTITION_TYPE_GUID
 CONFIG_PARTITION_UUIDS
 CONFIG_PATA_BFIN