]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: zynq: Move USB/SD/MMC common FAT configs
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Wed, 12 Mar 2014 09:22:56 +0000 (14:52 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 14 May 2014 05:43:35 +0000 (07:43 +0200)
Moved the USB/SD/MMC common FAT configs separately
to avoid redefinition warnings.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
include/configs/zynq-common.h

index 1cfc9633e90a68d80a91c7ec981ff69e38516297..0a7d104bf804df40e113d359f28d822fce9e7466 100644 (file)
 # 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_FAT_WRITE
-# define CONFIG_DOS_PARTITION
 #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
 # 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
+
 #define CONFIG_SYS_I2C_ZYNQ
 /* I2C */
 #if defined(CONFIG_SYS_I2C_ZYNQ)