diff options
Diffstat (limited to 'include')
51 files changed, 2 insertions, 153 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 9ecaf38a330..0e01e8240dd 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -26,10 +26,6 @@ * message that includes some other pre-processor symbols in the text. */ -/* We need the part command */ -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - #define BOOTENV_SHARED_BLKDEV_BODY(devtypel) \ "if " #devtypel " dev ${devnum}; then " \ "setenv devtype " #devtypel "; " \ diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index e1e57814bb7..31691755eeb 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -55,7 +55,7 @@ #define HAVE_BLOCK_DEVICE #endif -#if (defined(CONFIG_PARTITION_UUIDS) || \ +#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \ CONFIG_IS_ENABLED(EFI_PARTITION) || \ defined(CONFIG_RANDOM_UUID) || \ defined(CONFIG_CMD_UUID) || \ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7f3a30a03d9..38e3b1557f1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -39,9 +39,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT - #ifdef CONFIG_NAND #define NANDARGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -299,7 +296,6 @@ #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS #endif /* USB Device Firmware Update support */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f05717a4451..ac83a2b610e 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -80,8 +80,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x9000 /* 36 kB */ #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT #ifndef CONFIG_SHC_ICT /* * In builds other than ICT, reset to retry after timeout diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index cf47ca4d48a..c277450fbcb 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -27,9 +27,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #ifndef CONFIG_SPL_BUILD @@ -97,7 +94,6 @@ /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS #endif #if defined(CONFIG_EMMC_BOOT) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c0db1215f0d..1b9d5ff8419 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -109,7 +109,6 @@ /* commands to include */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PART #define CONFIG_CMD_MTDPARTS /* I2C */ @@ -258,7 +257,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP -#define CONFIG_PARTITION_UUIDS /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index f0abd88e2a6..1d622eff2f8 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -164,9 +164,6 @@ #define CONFIG_QSPI_QUAD_SUPPORT #define CONFIG_TI_EDMA3 -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 9427f9346cf..3d8b996054d 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -68,7 +68,6 @@ #include <configs/ti_omap5_common.h> /* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT #define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 8dd0a580208..38c9480dbe1 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -32,11 +32,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - /* FIT support */ #define CONFIG_SYS_BOOTM_LEN SZ_64M @@ -308,7 +303,6 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS /* * Disable CPSW SPL support so we fit within the 101KiB limit. */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index b26d84b6e69..b6feb290ecc 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -42,9 +42,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT - #ifdef CONFIG_NAND #define NANDARGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -454,7 +451,6 @@ DEFAULT_LINUX_BOOT_ENV \ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS #endif /* USB Device Firmware Update support */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index ea583b4f56e..e1f724bf2ef 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -85,9 +85,6 @@ #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } -/* GPT */ -#define CONFIG_CMD_GPT - /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 8bba58e3601..4f44a6752e6 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -105,9 +105,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x81200000\0" \ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index b9ccbd6f3a1..bf8c041fb77 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -100,7 +100,6 @@ #include <configs/ti_omap5_common.h> /* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT #define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index e6bb9190c29..29aa5183062 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -54,19 +54,16 @@ /* Extra Commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_GPT #define CONFIG_CMD_MD5SUM /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ -#define CONFIG_CMD_PART #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_TFTP #define CONFIG_CMD_UNZIP /* Partition table support */ #define HAVE_BLOCK_DEVICE /* Needed for partition commands */ -#define CONFIG_PARTITION_UUIDS #include <config_distro_defaults.h> diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 978495527dd..7868c86e59b 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -46,9 +46,6 @@ /* Command definition*/ #define CONFIG_FAT_WRITE -#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index ec45640698b..787c6de3ae3 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -22,7 +22,6 @@ #undef CONFIG_CMD_ONENAND #undef CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_GPT /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD diff --git a/include/configs/kc1.h b/include/configs/kc1.h index c0562fd480d..8223f5a33b3 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -103,13 +103,6 @@ #define CONFIG_TWL6030_INPUT /* - * Partitions - */ - -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - -/* * SPL */ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 5c5626691d4..f6f88e84c73 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -42,9 +42,6 @@ #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #endif -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT - #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index cf42587cedb..578d32814d6 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -150,8 +150,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT #define CONFIG_PCIE1 /* PCIE controller 1 */ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index dc5684b41cb..09c8f79ff35 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -63,8 +63,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT #define CONFIG_PCIE1 /* PCIE controller 1 */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 5d7be2226c6..b42286306a8 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -175,8 +175,6 @@ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_CMD_FAT -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 03683bfe48b..3c255aad827 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -395,9 +395,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_ESDHC #define CONFIG_GENERIC_MMC -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT - /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) /* QSPI */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 52491150090..7100d96baae 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -296,9 +296,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_GENERIC_MMC -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT - /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) /* QSPI */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index f9a0b401bc6..98da408c992 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -98,9 +98,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT - /* EEPROM */ #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index f4fb2501ab2..8fa3bb3a648 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -298,9 +298,6 @@ #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT - #include <asm/fsl_secure_boot.h> #endif /* __LS1043ARDB_H__ */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 06ab0ca193c..efc0fd936e0 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -141,9 +141,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT - /* EEPROM */ #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index fafe3ce0303..0168f96462f 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -230,8 +230,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT #define CONFIG_BOOTCOMMAND "sf probe 0:0;sf read $kernel_load" \ "$kernel_start $kernel_size;" \ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 49b68c8a7f4..a8a51002827 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -59,8 +59,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 7acef9266a4..b607329cc1b 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -68,8 +68,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_GPT /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 6a157cc6675..75f166aaf37 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -119,11 +119,6 @@ #define CONFIG_SUPPORT_VFAT -/* DISK Partition support */ - -#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS - /* * PCI configuration */ diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index e0bac8a601f..b9954b8f4a0 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -131,9 +131,4 @@ #define CONFIG_SUPPORT_VFAT -/* DISK Partition support */ - -#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS - #endif /* _CONFIG_MVEBU_DB_88F3720_H */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 3ab96d7bb2f..df60b49c613 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT /* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT #define CONFIG_HSMMC2_8BIT #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 05d7d79c94a..f80f3af7770 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -102,11 +102,9 @@ * File System Configuration */ /* FAT FS */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_SUPPORT_VFAT #define CONFIG_FS_FAT #define CONFIG_FAT_WRITE -#define CONFIG_CMD_PART /* EXT4 FS */ #define CONFIG_FS_EXT4 diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 447c66f49f2..9e0b445c6f0 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -41,8 +41,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #define CONFIG_SYS_SDRAM_BASE 0x60000000 #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 37fcc2a67c6..e0d1d841c38 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -44,8 +44,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index db0657b19dd..bd84239b79f 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -35,7 +35,6 @@ #define CONFIG_FS_FAT #define CONFIG_FAT_WRITE #define CONFIG_FS_EXT4 -#define CONFIG_CMD_PART /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index be53e659ee8..9e71b3f78da 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -18,10 +18,7 @@ func(PXE, pxe, na) \ func(DHCP, dchp, na) - /* Enable gpt partition table */ -#define CONFIG_CMD_GPT #define CONFIG_RANDOM_UUID -#define CONFIG_PARTITION_UUIDS #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index ce539a008cc..c460207e64f 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -112,10 +112,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_COMMAND_HISTORY -/* Commands */ -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - /* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 69ed53f8da8..55aba11d594 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -57,7 +57,6 @@ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND -#define CONFIG_CMD_GPT /* USB Composite download gadget - g_dnl */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M @@ -219,7 +218,6 @@ #define CONFIG_EXT4_WRITE /* GPT */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index d4a903595ef..28228d1b1ba 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -43,13 +43,9 @@ #define CONFIG_EXT4_WRITE #define CONFIG_CMD_CBFS #define CONFIG_CMD_CRAMFS -#define CONFIG_CMD_PART #define CONFIG_HOST_MAX_DEVICES 4 #define CONFIG_CMD_MD5SUM -#define CONFIG_CMD_GPT -#define CONFIG_PARTITION_UUIDS - /* * Size of malloc() pool, before and after relocation */ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 8ba45805e88..da395d8fedc 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -65,7 +65,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 -#define CONFIG_PARTITION_UUIDS /* MMC */ #define CONFIG_GENERIC_MMC @@ -141,6 +140,5 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND #define CONFIG_CMD_CACHE -#define CONFIG_CMD_PART #endif /* __CONFIG_H */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 4d057861691..f41d6f6859c 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -110,13 +110,6 @@ #define CONFIG_TWL4030_INPUT /* - * Partitions - */ - -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - -/* * SPL */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 53c0b08756c..09a7942650f 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -48,10 +48,8 @@ /* *** Command definition *** */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_PART /* Filesystems / image support */ -#define CONFIG_PARTITION_UUIDS /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 1beaa56f05c..b0c1282405b 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -139,15 +139,6 @@ #ifdef CONFIG_CMD_USB #endif -/* remove part command support */ -#ifdef CONFIG_PARTITION_UUIDS -#undef CONFIG_PARTITION_UUIDS -#endif - -#ifdef CONFIG_CMD_PART -#undef CONFIG_CMD_PART -#endif - #endif /* CONFIG_SPL_BUILD */ #endif /* __TEGRA_COMMON_POST_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 8bdfade2e9d..11e4df35e9f 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -54,10 +54,6 @@ /* turn on command-line edit/hist/auto */ #define CONFIG_COMMAND_HISTORY -/* turn on commonly used storage-related commands */ -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - #define CONFIG_SYS_NO_FLASH /* diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 0ed2929c34e..c6a642fe633 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -222,8 +222,6 @@ */ #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #endif /* diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 7a0f5633a2f..7b10e440597 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -63,9 +63,7 @@ #define CONFIG_SYS_MMC_CLK_OD 500000 /* For generating MMC partitions */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_RANDOM_UUID -#define CONFIG_CMD_GPT #endif diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 4528f094ce3..a8a45208432 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b1e25e6d8dc..96659081cc9 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -67,15 +67,9 @@ #define CONFIG_SUPPORT_VFAT -/************************************************************ - * DISK Partition support - ************************************************************/ - -#define CONFIG_CMD_PART #ifdef CONFIG_SYS_COREBOOT #define CONFIG_CMD_CBFS #endif -#define CONFIG_PARTITION_UUIDS /* x86 GPIOs are accessed through a PCI device */ #define CONFIG_INTEL_ICH6_GPIO diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9a1ef9b9835..b4be217274e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -132,8 +132,6 @@ # ifdef CONFIG_ZYNQ_SDHCI # define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 # endif -# define CONFIG_PARTITION_UUIDS -# define CONFIG_CMD_GPT # define CONFIG_RANDOM_UUID # define PARTS_DEFAULT \ diff --git a/include/part.h b/include/part.h index 243bcfd7c1b..9d0e20d0416 100644 --- a/include/part.h +++ b/include/part.h @@ -53,7 +53,7 @@ typedef struct disk_partition { uchar name[32]; /* partition name */ uchar type[32]; /* string type description */ int bootable; /* Active/Bootable flag is set */ -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) char uuid[37]; /* filesystem UUID as string, if exists */ #endif #ifdef CONFIG_PARTITION_TYPE_GUID |