From b0cf733933c3bc1b4ab353e16affabc60f863db5 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 27 Jan 2017 11:00:37 +0100 Subject: disk: convert CONFIG_DOS_PARTITION to Kconfig Signed-off-by: Patrick Delaunay Signed-off-by: Patrick Delaunay --- disk/Kconfig | 13 +++++++++++++ disk/Makefile | 2 +- disk/part.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'disk') diff --git a/disk/Kconfig b/disk/Kconfig index bafd025004..1bb5d849d9 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 d68df9f153..8b36b17b4f 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 cb9b86156d..03da243a48 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) -- cgit v1.2.3