cmd, disk: convert CONFIG_PARTITION_UUIDS, CMD_PART and CMD_GPT

We convert CONFIG_PARTITION_UUIDS to Kconfig first.  But in order to cleanly
update all of the config files we must also update CMD_PART and CMD_GPT to also
be in Kconfig in order to avoid complex logic elsewhere to update all of the
config files.

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

3 files changed, 15 insertions, 8 deletions

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 91bd3fb..4a0d489 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -394,6 +394,14 @@ config CMD_FLASH
 	    erase - FLASH memory
 	    protect - enable or disable FLASH write protection
 
+config CMD_GPT
+	bool "GPT (GUID Partition Table) command"
+	select PARTITION_UUIDS
+	select EFI_PARTITION
+	help
+	  Enable the 'gpt' command to ready and write GPT style partition
+	  tables.
+
 config CMD_ARMFLASH
 	#depends on FLASH_CFI_DRIVER
 	bool "armflash"
@@ -410,6 +418,13 @@ config CMD_NAND
 	help
 	  NAND support.
 
+config CMD_PART
+	bool "part"
+	select PARTITION_UUIDS
+	help
+	  Read and display information about the partition table on
+	  various media.
+
 config CMD_SF
 	bool "sf"
 	help
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 897596a..196f506 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -20,10 +20,6 @@
 #include <div64.h>
 #include <memalign.h>
 
-#ifndef CONFIG_PARTITION_UUIDS
-#error CONFIG_PARTITION_UUIDS must be enabled for CONFIG_CMD_GPT to be enabled
-#endif
-
 /**
  * extract_env(): Expand env name from string format '&{env_name}'
  *                and return pointer to the env (if the env is set)
diff --git a/cmd/part.c b/cmd/part.c
index 414031e..8ba0598 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -22,10 +22,6 @@
 #include <part.h>
 #include <vsprintf.h>
 
-#ifndef CONFIG_PARTITION_UUIDS
-#error CONFIG_PARTITION_UUIDS must be enabled for CONFIG_CMD_PART to be enabled
-#endif
-
 static int do_part_uuid(int argc, char * const argv[])
 {
 	int part;