diff options
| author | Adam Ford <aford173@gmail.com> | 2018-02-06 12:14:28 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-08 19:08:39 -0500 |
| commit | a451bc27c9afd1be537bb04946fb4cb1b2cf6280 (patch) | |
| tree | b433baab4c6c9bd5e07622608cc6ce1121e1096d | |
| parent | a5a37567c4f7bd6faf85ef4b720f6efce3e8bbbf (diff) | |
Convert LIB_UUID to Kconfig
config_fallback.h has some logic that checks a variety of options
and selects LIB_UUID if it hasn't already been selected. This
will all LIB_UUID in Kconfig and select this option for the list
of options to allow us to remove the logic from fallbacks
Signed-off-by: Adam Ford <aford173@gmail.com>
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | disk/Kconfig | 2 | ||||
| -rw-r--r-- | include/config_fallbacks.h | 10 | ||||
| -rw-r--r-- | lib/Kconfig | 3 | ||||
| -rw-r--r-- | lib/efi_loader/Kconfig | 1 |
5 files changed, 8 insertions, 10 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 790c40456d..4d9ef87e94 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -679,6 +679,7 @@ config CMD_GPT config RANDOM_UUID bool "GPT Random UUID generation" + select LIB_UUID help Enable the generation of partitions with random UUIDs if none are provided. @@ -1180,6 +1181,7 @@ config CMD_TERMINAL config CMD_UUID bool "uuid, guid - generation of unique IDs" + select LIB_UUID help This enables two commands: diff --git a/disk/Kconfig b/disk/Kconfig index 0446bb63ca..f3050cfde1 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -72,6 +72,7 @@ config EFI_PARTITION depends on PARTITIONS default y if DISTRO_DEFAULTS default y if TEGRA + select LIB_UUID help Say Y here if you would like to use device under U-Boot which were partitioned using EFI GPT. @@ -115,6 +116,7 @@ config PARTITION_UUIDS depends on PARTITIONS default y if DISTRO_DEFAULTS default y if EFI_PARTITION + select LIB_UUID help Activate the configuration of UUID for partition diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index c11abe67e5..70013fe1d0 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -44,16 +44,6 @@ #define HAVE_BLOCK_DEVICE #endif -#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \ - CONFIG_IS_ENABLED(EFI_PARTITION) || \ - CONFIG_IS_ENABLED(EFI_LOADER) || \ - defined(CONFIG_RANDOM_UUID) || \ - defined(CONFIG_CMD_UUID) || \ - defined(CONFIG_BOOTP_PXE)) && \ - !defined(CONFIG_LIB_UUID) -#define CONFIG_LIB_UUID -#endif - /* Console I/O Buffer Size */ #ifndef CONFIG_SYS_CBSIZE #if defined(CONFIG_CMD_KGDB) diff --git a/lib/Kconfig b/lib/Kconfig index 87db2e396e..5178e8642e 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -18,6 +18,9 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED config HAVE_PRIVATE_LIBGCC bool +config LIB_UUID + bool + config USE_PRIVATE_LIBGCC bool "Use private libgcc" depends on HAVE_PRIVATE_LIBGCC diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 827c267b60..5461833aeb 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -6,6 +6,7 @@ config EFI_LOADER # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT default y + select LIB_UUID help Select this option if you want to run EFI applications (like grub2) on top of U-Boot. If this option is enabled, U-Boot will expose EFI |