From patchwork Thu Aug 24 09:56:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 805412 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xdKSn6dd6z9s78 for ; Thu, 24 Aug 2017 19:56:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E306EC21E99; Thu, 24 Aug 2017 09:56:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=WEIRD_QUOTING autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6AE44C21D7A; Thu, 24 Aug 2017 09:56:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AA645C21DB9; Thu, 24 Aug 2017 09:56:29 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id 45AF3C21C62 for ; Thu, 24 Aug 2017 09:56:29 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 5485320937; Thu, 24 Aug 2017 11:56:27 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 29DD0208CB; Thu, 24 Aug 2017 11:56:27 +0200 (CEST) From: Maxime Ripard To: Tom Rini Date: Thu, 24 Aug 2017 11:56:23 +0200 Message-Id: <20170824095624.16775-1-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.13.5 Cc: u-boot@lists.denx.de, Maxime Ripard , Jagan Teki Subject: [U-Boot] [PATCH 1/2] cmd: Move CONFIG_RANDOM_UUID to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" CONFIG_RANDOM_UUID is used by the GPT command to generate random UUID when none are provided. Move that option to Kconfig. Signed-off-by: Maxime Ripard Reviewed-by: Tom Rini Reviewed-by: Jagan Teki --- cmd/Kconfig | 7 +++++++ configs/evb-rv1108_defconfig | 1 + configs/rock_defconfig | 1 + include/configs/am57xx_evm.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/edison.h | 1 - include/configs/odroid.h | 1 - include/configs/rockchip-common.h | 2 -- include/configs/trats.h | 1 - include/configs/trats2.h | 1 - include/configs/vinco.h | 1 - include/configs/xilinx_zynqmp.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index cd72ea8e56a9..5e2885bbaa95 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -591,10 +591,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 3deea7c0dcb1..a43683041359 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -7,6 +7,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_IS_NOWHERE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_RANDOM_UUID=y CONFIG_CMD_SF=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y diff --git a/configs/rock_defconfig b/configs/rock_defconfig index 2ad6a6c521da..b03856889981 100644 --- a/configs/rock_defconfig +++ b/configs/rock_defconfig @@ -14,6 +14,7 @@ CONFIG_ENV_IS_IN_MMC=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_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 9f07bba0c898..4de59a644fb6 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -72,7 +72,6 @@ #include /* 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 1a58c6ef24f2..0d847808e021 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -100,7 +100,6 @@ #include /* 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 03aa70230619..bec79496441c 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -14,7 +14,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 563854d9bbbf..22686657b62a 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -175,7 +175,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 29a492dc5529..bd3364a81bd9 100644 --- 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 3059d89ac90f..08cd7cf266a8 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -170,7 +170,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 1f3ce9d94104..b523b6d1b8ae 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -151,7 +151,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 adff1b6d7f71..a0c522c86781 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -59,7 +59,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 77d7899deff4..3b1119f94e51 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -114,7 +114,6 @@ # define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 # endif -# 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 4689d6310f0c..50ac011a6bdd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1903,7 +1903,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