Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert LIB_UUID to Kconfig

Browse source 
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>
This commit is contained in:
Adam Ford 2018-02-06 12:14:28 -06:00 committed by Tom Rini
parent a5a37567c4
commit a451bc27c9
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/Kconfig
View file

@ -679,6 +679,7 @@ config CMD_GPT
config RANDOM_UUID config RANDOM_UUID
bool "GPT Random UUID generation" bool "GPT Random UUID generation"
select LIB_UUID
help help
Enable the generation of partitions with random UUIDs if none Enable the generation of partitions with random UUIDs if none
are provided. are provided.
@ -1180,6 +1181,7 @@ config CMD_TERMINAL
config CMD_UUID config CMD_UUID
bool "uuid, guid - generation of unique IDs" bool "uuid, guid - generation of unique IDs"
select LIB_UUID
help help
This enables two commands: This enables two commands:

2
disk/Kconfig
View file

@ -72,6 +72,7 @@ config EFI_PARTITION
depends on PARTITIONS depends on PARTITIONS
default y if DISTRO_DEFAULTS default y if DISTRO_DEFAULTS
default y if TEGRA default y if TEGRA
select LIB_UUID
help help
Say Y here if you would like to use device under U-Boot which Say Y here if you would like to use device under U-Boot which
were partitioned using EFI GPT. were partitioned using EFI GPT.
@ -115,6 +116,7 @@ config PARTITION_UUIDS
depends on PARTITIONS depends on PARTITIONS
default y if DISTRO_DEFAULTS default y if DISTRO_DEFAULTS
default y if EFI_PARTITION default y if EFI_PARTITION
select LIB_UUID
help help
Activate the configuration of UUID for partition Activate the configuration of UUID for partition

10
include/config_fallbacks.h
View file

@ -44,16 +44,6 @@
#define HAVE_BLOCK_DEVICE #define HAVE_BLOCK_DEVICE
#endif #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 */ /* Console I/O Buffer Size */
#ifndef CONFIG_SYS_CBSIZE #ifndef CONFIG_SYS_CBSIZE
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)

3
lib/Kconfig
View file

@ -18,6 +18,9 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED
config HAVE_PRIVATE_LIBGCC config HAVE_PRIVATE_LIBGCC
bool bool
config LIB_UUID
bool
config USE_PRIVATE_LIBGCC config USE_PRIVATE_LIBGCC
bool "Use private libgcc" bool "Use private libgcc"
depends on HAVE_PRIVATE_LIBGCC depends on HAVE_PRIVATE_LIBGCC

1
lib/efi_loader/Kconfig
View file

@ -6,6 +6,7 @@ config EFI_LOADER
# We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB
depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT
default y default y
select LIB_UUID
help help
Select this option if you want to run EFI applications (like grub2) 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 on top of U-Boot. If this option is enabled, U-Boot will expose EFI