cmd: Move CONFIG_RANDOM_UUID to Kconfig

CONFIG_RANDOM_UUID is used by the GPT command to generate random UUID when
none are provided.

Move that option to Kconfig.

Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 07ec03b507b12623aa39ebbee306840b7745d23d..28c91ca181f47c0341b4dffd72c94ed391a80371 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -665,10 +665,17 @@ config CMD_GPT
        bool "GPT (GUID Partition Table) command"
        select PARTITION_UUIDS
        select EFI_PARTITION
+       imply RANDOM_UUID
        help
          Enable the 'gpt' command to ready and write GPT style partition
          tables.
 
+config RANDOM_UUID
+       bool "GPT Random UUID generation"
+       help
+         Enable the generation of partitions with random UUIDs if none
+         are provided.
+
 config CMD_GPT_RENAME
        bool "GPT partition renaming commands"
        depends on CMD_GPT

diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig
index 2dcb85dfd56f9b3f4acb3a50b7e9bd34e215e525..f035066dcd4fa69fb15d7b536d2da55c21b5aa51 100644 (file)
--- a/configs/evb-rv1108_defconfig
+++ b/configs/evb-rv1108_defconfig
@@ -13,6 +13,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x08000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 # CONFIG_CMD_IMLS is not set
+CONFIG_RANDOM_UUID=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set

diff --git a/configs/rock_defconfig b/configs/rock_defconfig
index aaf27751d4ecb5a99aa93985ad01740ea0aa6105..599760da3efda4202cd4d7ec9aec6a80f4b0e2f0 100644 (file)
--- a/configs/rock_defconfig
+++ b/configs/rock_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 # CONFIG_CMD_IMLS is not set
+CONFIG_RANDOM_UUID=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index bf555ccdc2ed4c430f3aaca582dee15bf90b162d..5427974bd0f9dcaa3737dc7af225bbce03b8197f 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -73,7 +73,6 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_RANDOM_UUID
 #define CONFIG_HSMMC2_8BIT
 
 /* CPSW Ethernet */

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 1555fc1b5041e2f0b6606cb424cdba3a7af57981..717861faeef7f47cfda47227fe97fbbd9c88e885 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -92,7 +92,6 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_RANDOM_UUID
 #define CONFIG_HSMMC2_8BIT
 
 /* CPSW Ethernet */

diff --git a/include/configs/edison.h b/include/configs/edison.h
index d25b50c0768bfa0fec5a51fed69cc25fd6af7a4c..e26a4c7a39fb3e027ecbccac15ffbe45116ceaf4 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -13,7 +13,6 @@
 #define CONFIG_BOOTCOMMAND "run bootcmd"
 
 /* DISK Partition support */
-#define CONFIG_RANDOM_UUID
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 2afb19f84a7a9e7f70cc7be19cef212aa060493e..22e9c82497357c5b4226ede394998f2138bd08ec 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -174,7 +174,6 @@
        "fdtaddr=40800000\0"
 
 /* GPT */
-#define CONFIG_RANDOM_UUID
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index b3986c28af43886cc42271bd762f27b7f2735ed3..5e9b6deb48532e514a17890543464d04c509b99a 100644 (file)
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -27,8 +27,6 @@
        func(DHCP, dchp, na)
 #endif
 
-#define CONFIG_RANDOM_UUID
-
 #ifdef CONFIG_ARM64
 #define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
 #else

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 5d0a3240a66ae27d4d11a67d71fafc0d027fea8d..5b33a3b18e77a4348ab390e8ba92f35369aebf49 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -168,7 +168,6 @@
 #define CONFIG_SYS_SPL_ARGS_ADDR        CONFIG_SYS_SDRAM_BASE + 0x100
 
 /* GPT */
-#define CONFIG_RANDOM_UUID
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 7f6a61a1db63406a4e3ae627daaebf1f9896bc76..95c011f9a90558ce73b0ad0d945fe661fd278d11 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -150,7 +150,6 @@
        "fdtaddr=40800000\0" \
 
 /* GPT */
-#define CONFIG_RANDOM_UUID
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index b2225ab88052b2a1ee5eaae5b89bdef380c39126..0084051ba167d7079a1a9bae0cc98221c9b02088 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_MMC_CLK_OD          500000
 
 /* For generating MMC partitions */
-#define CONFIG_RANDOM_UUID
 
 #endif
 

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 6025706964a3a255b483200ef7689782f6365539..1399dfd436bc8697e7ab0a3c7f973beb8aa5dcec 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -103,7 +103,6 @@
                DFU_ALT_INFO_RAM
 
 #ifndef CONFIG_SPL_BUILD
-# define CONFIG_RANDOM_UUID
 # define PARTS_DEFAULT \
        "partitions=uuid_disk=${uuid_gpt_disk};" \
        "name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4ddb2ca97fa4512a05314ed7df5e63d9585686b9..78bcf06878b96ec49a4a5e9450efb85b8b1005a3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1847,7 +1847,6 @@ CONFIG_RAMDISK_ADDR
 CONFIG_RAMDISK_BOOT
 CONFIG_RAM_BOOT
 CONFIG_RAM_BOOT_PHYS
-CONFIG_RANDOM_UUID
 CONFIG_RCAR_BOARD_STRING
 CONFIG_RD_LVL
 CONFIG_REALMODE_DEBUG