From f18fa31cdcfeecaf56e61224eb18d2f2b6d39d85 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 27 Jan 2017 11:00:36 +0100 Subject: disk: convert CONFIG_MAC_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 966553c36b..bafd025004 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -19,4 +19,17 @@ config PARTITIONS you must configure support for at least one non-MTD partition type as well. +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. + +config SPL_MAC_PARTITION + bool "Enable Apple's MacOS partition table for SPL" + depends on SPL && PARTITIONS + default y if MAC_PARTITION + endmenu diff --git a/disk/Makefile b/disk/Makefile index 6970cecc71..d68df9f153 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -8,7 +8,7 @@ #ccflags-y += -DET_DEBUG -DDEBUG obj-$(CONFIG_PARTITIONS) += part.o -obj-$(CONFIG_MAC_PARTITION) += part_mac.o +obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o obj-$(CONFIG_DOS_PARTITION) += part_dos.o obj-$(CONFIG_ISO_PARTITION) += part_iso.o obj-$(CONFIG_AMIGA_PARTITION) += part_amiga.o diff --git a/disk/part.c b/disk/part.c index 4e37735162..cb9b86156d 100644 --- a/disk/part.c +++ b/disk/part.c @@ -234,7 +234,7 @@ void part_init(struct blk_desc *dev_desc) static void print_part_header(const char *type, struct blk_desc *dev_desc) { -#if defined(CONFIG_MAC_PARTITION) || \ +#if CONFIG_IS_ENABLED(MAC_PARTITION) || \ defined(CONFIG_DOS_PARTITION) || \ defined(CONFIG_ISO_PARTITION) || \ defined(CONFIG_AMIGA_PARTITION) || \ -- cgit