Merge tag 'xilinx-fixes-for-v2017.11' of git://www.denx.de/git/u-boot-microblaze

[people/ms/u-boot.git] / disk / Kconfig

diff --git a/disk/Kconfig b/disk/Kconfig
index 1400b26ae247f525896cc90551281aae813fa4d2..93965621206574056260c1f56870619372648ba9 100644 (file)
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -22,7 +22,6 @@ config PARTITIONS
 config MAC_PARTITION
        bool "Enable Apple's MacOS partition table"
        depends on PARTITIONS
-       default y if SPARC
        help
          Say Y here if you would like to use device under U-Boot which
          were partitioned on a Macintosh.
@@ -36,7 +35,7 @@ config DOS_PARTITION
        bool "Enable MS Dos partition table"
        depends on PARTITIONS
        default y if DISTRO_DEFAULTS
-       default y if x86 || SPARC || CMD_FAT || USB_STORAGE
+       default y if x86 || CMD_FAT || USB_STORAGE
        help
          traditional on the Intel architecture, USB sticks, etc.
 
@@ -49,11 +48,73 @@ config ISO_PARTITION
        bool "Enable ISO partition table"
        depends on PARTITIONS
        default y if DISTRO_DEFAULTS
-       default y if SPARC || MIPS || TEGRA
+       default y if MIPS || TEGRA
 
 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"
+       depends on PARTITIONS
+       help
+         Say Y here if you would like to use device under U-Boot which
+         were partitioned under AmigaOS.
+
+config SPL_AMIGA_PARTITION
+       bool "Enable AMIGA partition table for SPL"
+       depends on SPL && PARTITIONS
+       default y if AMIGA_PARTITION
+
+config EFI_PARTITION
+       bool "Enable EFI GPT partition table"
+       depends on PARTITIONS
+       default y if DISTRO_DEFAULTS
+       default y if TEGRA
+       help
+         Say Y here if you would like to use device under U-Boot which
+         were partitioned using EFI GPT.
+         common when EFI is the bootloader.  Note 2TB partition limit;
+         see disk/part_efi.c
+
+config EFI_PARTITION_ENTRIES_OFF
+        int "Offset (in bytes) of the EFI partition entries"
+       depends on EFI_PARTITION
+       default 0
+       help
+         Specify an earliest location (in bytes) where the partition
+         entries may be located. This is meant to allow "punching a
+         hole into a device" to create a gap for an SPL, its payload
+         and the U-Boot environment.
+
+         If unsure, leave at 0 (which will locate the partition
+         entries at the first possible LBA following the GPT header).
+
+config SPL_EFI_PARTITION
+       bool "Enable EFI GPT partition table for SPL"
+       depends on  SPL && PARTITIONS
+       default y if EFI_PARTITION
+
+config PARTITION_UUIDS
+       bool "Enable support of UUID for partition"
+       depends on PARTITIONS
+       default y if DISTRO_DEFAULTS
+       default y if EFI_PARTITION
+       help
+         Activate the configuration of UUID for partition
+
+config SPL_PARTITION_UUIDS
+       bool "Enable support of UUID for partition in SPL"
+       depends on SPL && PARTITIONS
+       default y if SPL_EFI_PARTITION
+
+config PARTITION_TYPE_GUID
+       bool "Enable support of GUID for partition type"
+       depends on PARTITIONS
+       depends on EFI_PARTITION
+       help
+         Activate the configuration of GUID type
+         for EFI partition
+
 endmenu