Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a451bc27c9afd1be537bb04946fb4cb1b2cf6280

Authored by Adam Ford
Committed by Tom Rini
1 parent a5a37567c4
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 5 changed files with 8 additions and 10 deletions Side-by-side Diff

... ... @@ -679,6 +679,7 @@
679 679  
680 680 config RANDOM_UUID
681 681 bool "GPT Random UUID generation"
  682 + select LIB_UUID
682 683 help
683 684 Enable the generation of partitions with random UUIDs if none
684 685 are provided.
... ... @@ -1180,6 +1181,7 @@
1180 1181  
1181 1182 config CMD_UUID
1182 1183 bool "uuid, guid - generation of unique IDs"
  1184 + select LIB_UUID
1183 1185 help
1184 1186 This enables two commands:
1185 1187  
... ... @@ -72,6 +72,7 @@
72 72 depends on PARTITIONS
73 73 default y if DISTRO_DEFAULTS
74 74 default y if TEGRA
  75 + select LIB_UUID
75 76 help
76 77 Say Y here if you would like to use device under U-Boot which
77 78 were partitioned using EFI GPT.
... ... @@ -115,6 +116,7 @@
115 116 depends on PARTITIONS
116 117 default y if DISTRO_DEFAULTS
117 118 default y if EFI_PARTITION
  119 + select LIB_UUID
118 120 help
119 121 Activate the configuration of UUID for partition
120 122  
include/config_fallbacks.h
Diff comments   View file @ a451bc2
... ... @@ -44,16 +44,6 @@
44 44 #define HAVE_BLOCK_DEVICE
45 45 #endif
46 46  
47   -#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \
48   - CONFIG_IS_ENABLED(EFI_PARTITION) || \
49   - CONFIG_IS_ENABLED(EFI_LOADER) || \
50   - defined(CONFIG_RANDOM_UUID) || \
51   - defined(CONFIG_CMD_UUID) || \
52   - defined(CONFIG_BOOTP_PXE)) && \
53   - !defined(CONFIG_LIB_UUID)
54   -#define CONFIG_LIB_UUID
55   -#endif
56   -
57 47 /* Console I/O Buffer Size */
58 48 #ifndef CONFIG_SYS_CBSIZE
59 49 #if defined(CONFIG_CMD_KGDB)
... ... @@ -18,6 +18,9 @@
18 18 config HAVE_PRIVATE_LIBGCC
19 19 bool
20 20  
  21 +config LIB_UUID
  22 + bool
  23 +
21 24 config USE_PRIVATE_LIBGCC
22 25 bool "Use private libgcc"
23 26 depends on HAVE_PRIVATE_LIBGCC
lib/efi_loader/Kconfig
Diff comments   View file @ a451bc2
... ... @@ -6,6 +6,7 @@
6 6 # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB
7 7 depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT
8 8 default y
  9 + select LIB_UUID
9 10 help
10 11 Select this option if you want to run EFI applications (like grub2)
11 12 on top of U-Boot. If this option is enabled, U-Boot will expose EFI