summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@st.com>2017-01-27 11:00:39 +0100
committerTom Rini <trini@konsulko.com>2017-01-28 08:47:36 -0500
commit863c5b6cdd49f0f0ce5ca0ae3bd0ed09b766121b (patch)
treea690c629474d2abfc4e9b85b59a1d7f8c515893f
parent1acc0087876229d7ade1b23aaecbccf63de8a615 (diff)
disk: convert CONFIG_AMIGA_PARTITION to Kconfig
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
-rw-r--r--configs/sandbox_defconfig1
-rw-r--r--configs/sandbox_noblk_defconfig1
-rw-r--r--configs/sandbox_spl_defconfig1
-rw-r--r--disk/Kconfig12
-rw-r--r--disk/Makefile2
-rw-r--r--disk/part.c2
-rw-r--r--include/configs/sandbox.h1
-rw-r--r--scripts/config_whitelist.txt1
8 files changed, 17 insertions, 4 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index df1b7ab7a2..ce70951abf 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -51,6 +51,7 @@ CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_MAC_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_OF_HOSTFILE=y
CONFIG_NETCONSOLE=y
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index c5c84fb4c0..809da3b859 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -58,6 +58,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_MAC_PARTITION=y
CONFIG_ISO_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_OF_HOSTFILE=y
CONFIG_NETCONSOLE=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index 5d7bf10950..e2cb6d1625 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -58,6 +58,7 @@ CONFIG_CMD_TPM=y
CONFIG_CMD_TPM_TEST=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_MAC_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_HOSTFILE=y
diff --git a/disk/Kconfig b/disk/Kconfig
index 1400b26ae2..8adf59e821 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 95d286bbda..aa6ee4591c 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 4731ae9ac6..ad381641ec 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 2591887a2b..1cb8292b4f 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 c35588e266..5d43d51bf2 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