summaryrefslogtreecommitdiff
path: root/disk
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@st.com>2017-01-27 11:00:37 +0100
committerTom Rini <trini@konsulko.com>2017-01-28 08:47:34 -0500
commitb0cf733933c3bc1b4ab353e16affabc60f863db5 (patch)
treea887b94a494489f2c197c1062a6414cda2dae84a /disk
parentf18fa31cdcfeecaf56e61224eb18d2f2b6d39d85 (diff)
disk: convert CONFIG_DOS_PARTITION to Kconfig
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
Diffstat (limited to 'disk')
-rw-r--r--disk/Kconfig13
-rw-r--r--disk/Makefile2
-rw-r--r--disk/part.c2
3 files changed, 15 insertions, 2 deletions
diff --git a/disk/Kconfig b/disk/Kconfig
index bafd025004c..1bb5d849d9e 100644
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -32,4 +32,17 @@ config SPL_MAC_PARTITION
depends on SPL && PARTITIONS
default y if MAC_PARTITION
+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
+ help
+ traditional on the Intel architecture, USB sticks, etc.
+
+config SPL_DOS_PARTITION
+ bool "Enable MS Dos partition table for SPL"
+ depends on SPL && PARTITIONS
+ default y if DOS_PARTITION
+
endmenu
diff --git a/disk/Makefile b/disk/Makefile
index d68df9f1538..8b36b17b4f6 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -9,7 +9,7 @@
obj-$(CONFIG_PARTITIONS) += part.o
obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o
-obj-$(CONFIG_DOS_PARTITION) += part_dos.o
+obj-$(CONFIG_$(SPL_)DOS_PARTITION) += part_dos.o
obj-$(CONFIG_ISO_PARTITION) += part_iso.o
obj-$(CONFIG_AMIGA_PARTITION) += part_amiga.o
obj-$(CONFIG_EFI_PARTITION) += part_efi.o
diff --git a/disk/part.c b/disk/part.c
index cb9b86156d3..03da243a485 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -235,7 +235,7 @@ void part_init(struct blk_desc *dev_desc)
static void print_part_header(const char *type, struct blk_desc *dev_desc)
{
#if CONFIG_IS_ENABLED(MAC_PARTITION) || \
- defined(CONFIG_DOS_PARTITION) || \
+ CONFIG_IS_ENABLED(DOS_PARTITION) || \
defined(CONFIG_ISO_PARTITION) || \
defined(CONFIG_AMIGA_PARTITION) || \
defined(CONFIG_EFI_PARTITION)