diff options
| -rw-r--r-- | configs/sandbox_defconfig | 1 | ||||
| -rw-r--r-- | configs/sandbox_noblk_defconfig | 1 | ||||
| -rw-r--r-- | configs/sandbox_spl_defconfig | 1 | ||||
| -rw-r--r-- | disk/Kconfig | 12 | ||||
| -rw-r--r-- | disk/Makefile | 2 | ||||
| -rw-r--r-- | disk/part.c | 2 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
8 files changed, 17 insertions, 4 deletions
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index df1b7ab7a28..ce70951abf5 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 c5c84fb4c07..809da3b8595 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 5d7bf109509..e2cb6d16253 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 1400b26ae24..8adf59e821c 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 95d286bbda9..aa6ee4591c3 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 4731ae9ac6a..ad381641ec1 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 2591887a2b2..1cb8292b4f6 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 c35588e266e..5d43d51bf2c 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 |