[U-Boot] [PATCH v5 5/9] disk: convert CONFIG_AMIGA_PARTITION to Kconfig

Patrick Delaunay
2017-01-27T10:00:39Z

From: Patrick Delaunay <patrick.delaunay@st.com>

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

disk/Kconfig | 12 ++++++++++++
disk/Makefile | 2 +-
disk/part.c | 2 +-
include/configs/sandbox.h | 1 -
scripts/config_whitelist.txt | 1 -
5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/disk/Kconfig b/disk/Kconfig
index 1400b26..8adf59e 100644
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -56,4 +56,16 @@ config SPL_ISO_PARTITION
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
+
endmenu
diff --git a/disk/Makefile b/disk/Makefile
index 95d286b..aa6ee45 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -11,5 +11,5 @@ obj-$(CONFIG_PARTITIONS) += part.o
obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o
obj-$(CONFIG_$(SPL_)DOS_PARTITION) += part_dos.o
obj-$(CONFIG_$(SPL_)ISO_PARTITION) += part_iso.o
-obj-$(CONFIG_AMIGA_PARTITION) += part_amiga.o
+obj-$(CONFIG_$(SPL_)AMIGA_PARTITION) += part_amiga.o
obj-$(CONFIG_EFI_PARTITION) += part_efi.o
diff --git a/disk/part.c b/disk/part.c
index 4731ae9..ad38164 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -237,7 +237,7 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc)
#if CONFIG_IS_ENABLED(MAC_PARTITION) || \
CONFIG_IS_ENABLED(DOS_PARTITION) || \
CONFIG_IS_ENABLED(ISO_PARTITION) || \
- defined(CONFIG_AMIGA_PARTITION) || \
+ CONFIG_IS_ENABLED(AMIGA_PARTITION) || \
defined(CONFIG_EFI_PARTITION)
puts ("\nPartition Map for ");
switch (dev_desc->if_type) {
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 09502b2..30b2ff1 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -49,7 +49,6 @@

#define CONFIG_CMD_GPT
#define CONFIG_PARTITION_UUIDS
-#define CONFIG_AMIGA_PARTITION
#define CONFIG_EFI_PARTITION

/*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0fb83cc..59e055d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -93,7 +93,6 @@ CONFIG_AMCC_DEF_ENV_PPC
CONFIG_AMCC_DEF_ENV_PPC_OLD
CONFIG_AMCC_DEF_ENV_ROOTPATH
CONFIG_AMCORE
-CONFIG_AMIGA_PARTITION
CONFIG_ANDES_PCU
CONFIG_ANDES_PCU_BASE
CONFIG_AP325RXA
--
1.9.1