mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
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>
This commit is contained in:
parent
5ed8239383
commit
47738acced
13 changed files with 9 additions and 11 deletions
|
@ -665,10 +665,17 @@ config CMD_GPT
|
||||||
bool "GPT (GUID Partition Table) command"
|
bool "GPT (GUID Partition Table) command"
|
||||||
select PARTITION_UUIDS
|
select PARTITION_UUIDS
|
||||||
select EFI_PARTITION
|
select EFI_PARTITION
|
||||||
|
imply RANDOM_UUID
|
||||||
help
|
help
|
||||||
Enable the 'gpt' command to ready and write GPT style partition
|
Enable the 'gpt' command to ready and write GPT style partition
|
||||||
tables.
|
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
|
config CMD_GPT_RENAME
|
||||||
bool "GPT partition renaming commands"
|
bool "GPT partition renaming commands"
|
||||||
depends on CMD_GPT
|
depends on CMD_GPT
|
||||||
|
|
|
@ -13,6 +13,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x08000000
|
||||||
CONFIG_FASTBOOT_FLASH=y
|
CONFIG_FASTBOOT_FLASH=y
|
||||||
CONFIG_FASTBOOT_FLASH_MMC_DEV=1
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=1
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
CONFIG_RANDOM_UUID=y
|
||||||
CONFIG_CMD_SF=y
|
CONFIG_CMD_SF=y
|
||||||
CONFIG_CMD_USB=y
|
CONFIG_CMD_USB=y
|
||||||
# CONFIG_CMD_SETEXPR is not set
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
|
|
|
@ -14,6 +14,7 @@ CONFIG_DEBUG_UART=y
|
||||||
CONFIG_SPL_STACK_R=y
|
CONFIG_SPL_STACK_R=y
|
||||||
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
CONFIG_RANDOM_UUID=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_SF=y
|
CONFIG_CMD_SF=y
|
||||||
|
|
|
@ -73,7 +73,6 @@
|
||||||
#include <configs/ti_omap5_common.h>
|
#include <configs/ti_omap5_common.h>
|
||||||
|
|
||||||
/* Enhance our eMMC support / experience. */
|
/* Enhance our eMMC support / experience. */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
#define CONFIG_HSMMC2_8BIT
|
#define CONFIG_HSMMC2_8BIT
|
||||||
|
|
||||||
/* CPSW Ethernet */
|
/* CPSW Ethernet */
|
||||||
|
|
|
@ -92,7 +92,6 @@
|
||||||
#include <configs/ti_omap5_common.h>
|
#include <configs/ti_omap5_common.h>
|
||||||
|
|
||||||
/* Enhance our eMMC support / experience. */
|
/* Enhance our eMMC support / experience. */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
#define CONFIG_HSMMC2_8BIT
|
#define CONFIG_HSMMC2_8BIT
|
||||||
|
|
||||||
/* CPSW Ethernet */
|
/* CPSW Ethernet */
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#define CONFIG_BOOTCOMMAND "run bootcmd"
|
#define CONFIG_BOOTCOMMAND "run bootcmd"
|
||||||
|
|
||||||
/* DISK Partition support */
|
/* DISK Partition support */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
|
|
||||||
/* Miscellaneous configurable options */
|
/* Miscellaneous configurable options */
|
||||||
#define CONFIG_SYS_LONGHELP
|
#define CONFIG_SYS_LONGHELP
|
||||||
|
|
|
@ -174,7 +174,6 @@
|
||||||
"fdtaddr=40800000\0"
|
"fdtaddr=40800000\0"
|
||||||
|
|
||||||
/* GPT */
|
/* GPT */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
|
|
||||||
/* Security subsystem - enable hw_rand() */
|
/* Security subsystem - enable hw_rand() */
|
||||||
#define CONFIG_EXYNOS_ACE_SHA
|
#define CONFIG_EXYNOS_ACE_SHA
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
func(DHCP, dchp, na)
|
func(DHCP, dchp, na)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
|
|
||||||
#ifdef CONFIG_ARM64
|
#ifdef CONFIG_ARM64
|
||||||
#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
|
#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -168,7 +168,6 @@
|
||||||
#define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
|
#define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
|
||||||
|
|
||||||
/* GPT */
|
/* GPT */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
|
|
||||||
/* Security subsystem - enable hw_rand() */
|
/* Security subsystem - enable hw_rand() */
|
||||||
#define CONFIG_EXYNOS_ACE_SHA
|
#define CONFIG_EXYNOS_ACE_SHA
|
||||||
|
|
|
@ -150,7 +150,6 @@
|
||||||
"fdtaddr=40800000\0" \
|
"fdtaddr=40800000\0" \
|
||||||
|
|
||||||
/* GPT */
|
/* GPT */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
|
|
||||||
/* Security subsystem - enable hw_rand() */
|
/* Security subsystem - enable hw_rand() */
|
||||||
#define CONFIG_EXYNOS_ACE_SHA
|
#define CONFIG_EXYNOS_ACE_SHA
|
||||||
|
|
|
@ -62,7 +62,6 @@
|
||||||
#define CONFIG_SYS_MMC_CLK_OD 500000
|
#define CONFIG_SYS_MMC_CLK_OD 500000
|
||||||
|
|
||||||
/* For generating MMC partitions */
|
/* For generating MMC partitions */
|
||||||
#define CONFIG_RANDOM_UUID
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,6 @@
|
||||||
DFU_ALT_INFO_RAM
|
DFU_ALT_INFO_RAM
|
||||||
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
#ifndef CONFIG_SPL_BUILD
|
||||||
# define CONFIG_RANDOM_UUID
|
|
||||||
# define PARTS_DEFAULT \
|
# define PARTS_DEFAULT \
|
||||||
"partitions=uuid_disk=${uuid_gpt_disk};" \
|
"partitions=uuid_disk=${uuid_gpt_disk};" \
|
||||||
"name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \
|
"name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \
|
||||||
|
|
|
@ -1847,7 +1847,6 @@ CONFIG_RAMDISK_ADDR
|
||||||
CONFIG_RAMDISK_BOOT
|
CONFIG_RAMDISK_BOOT
|
||||||
CONFIG_RAM_BOOT
|
CONFIG_RAM_BOOT
|
||||||
CONFIG_RAM_BOOT_PHYS
|
CONFIG_RAM_BOOT_PHYS
|
||||||
CONFIG_RANDOM_UUID
|
|
||||||
CONFIG_RCAR_BOARD_STRING
|
CONFIG_RCAR_BOARD_STRING
|
||||||
CONFIG_RD_LVL
|
CONFIG_RD_LVL
|
||||||
CONFIG_REALMODE_DEBUG
|
CONFIG_REALMODE_DEBUG
|
||||||
|
|
Loading…
Reference in a new issue