From 5b782e3f4ca8784c6439d5ca5b620ad6ec073e51 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 18 Dec 2014 14:32:14 -0600 Subject: [PATCH] TI: armv7: enable UUID and PART Enable UUID and partition support for scripted handling platforms with MMC and eMMC and varied partitioning schemes And remove it from headers that end up redefining it. Signed-off-by: Nishanth Menon --- include/configs/am335x_evm.h | 2 -- include/configs/am43xx_evm.h | 2 -- include/configs/beagle_x15.h | 2 -- include/configs/dra7xx_evm.h | 2 -- include/configs/omap5_uevm.h | 2 -- include/configs/ti_armv7_common.h | 2 ++ 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 560e3bf775..0004750518 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -47,8 +47,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #ifdef CONFIG_NAND #define NANDARGS \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4472c3e555..b00585c47b 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -148,8 +148,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h index cc36330938..b2333013e1 100644 --- a/include/configs/beagle_x15.h +++ b/include/configs/beagle_x15.h @@ -42,8 +42,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART /* CPSW Ethernet */ #define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 174a711bb4..dee2b11056 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -48,8 +48,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index e07795f921..0ca4e82e0f 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -36,8 +36,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #define CONFIG_HSMMC2_8BIT #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index bc751722e8..2bd116477c 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -187,6 +187,8 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4 #define CONFIG_CMD_FS_GENERIC +#define CONFIG_PARTITION_UUIDS +#define CONFIG_CMD_PART #endif /*