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 <[email protected]>
grygoriyS · Feb 9, 2018 · a451bc2 · a451bc2
1 parent a5a3756
commit a451bc2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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