Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[oweals/u-boot.git] / disk / Kconfig

diff --git a/disk/Kconfig b/disk/Kconfig
index 0446bb63ca7ee35bcb4cd3d698bfc10b35bddcbe..28fb81c2ee6d16d6a2e3d679740c8336aa17d13b 100644 (file)
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -4,6 +4,10 @@ menu "Partition Types"
 config PARTITIONS
        bool "Enable Partition Labels (disklabels) support"
        default y
+       select SPL_SPRINTF if SPL
+       select TPL_SPRINTF if TPL
+       select SPL_STRTO if SPL
+       select TPL_STRTO if TPL
        help
          Partition Labels (disklabels) Supported:
          Zero or more of the following:
@@ -53,7 +57,6 @@ config ISO_PARTITION
 config SPL_ISO_PARTITION
        bool "Enable ISO partition table for SPL"
        depends on SPL && PARTITIONS
-       default y if ISO_PARTITION
 
 config AMIGA_PARTITION
        bool "Enable AMIGA partition table"
@@ -72,6 +75,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 +119,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