From a5de2d878f12e3ee03fa17e0bfb626b0c1fce13b Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Wed, 12 Mar 2014 14:52:56 +0530 Subject: [PATCH] zynq: Move USB/SD/MMC common FAT configs Moved the USB/SD/MMC common FAT configs separately to avoid redefinition warnings. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 3bc882dc8a9..c150e529923 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -84,18 +84,12 @@ # define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI # define CONFIG_CMD_MMC -# define CONFIG_CMD_FAT -# define CONFIG_SUPPORT_VFAT -# define CONFIG_CMD_EXT2 -# define CONFIG_DOS_PARTITION -# define CONFIG_FAT_WRITE #endif #ifdef CONFIG_ZYNQ_USB #define CONFIG_USB_EHCI #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE -#define CONFIG_SUPPORT_VFAT #define CONFIG_USB_EHCI_ZYNQ #define CONFIG_USB_ULPI_VIEWPORT #define CONFIG_USB_ULPI @@ -103,6 +97,14 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif +#if defined (CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQ_USB) +#define CONFIG_SUPPORT_VFAT +#define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT2 +#define CONFIG_FAT_WRITE +#define CONFIG_DOS_PARTITION +#endif + /* QSPI */ #ifdef CONFIG_ZYNQ_QSPI # define CONFIG_SF_DEFAULT_SPEED 30000000 -- 2.47.3