summaryrefslogtreecommitdiff
path: root/include/configs/zynq-common.h
diff options
context:
space:
mode:
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>2014-03-12 14:52:56 +0530
committerMichal Simek <michal.simek@xilinx.com>2014-05-14 07:43:35 +0200
commit47b35a516b60de6c1055fab3a866a1e70bf12f6b (patch)
tree609474e324323de9cf5636d5a248c6f152b0da84 /include/configs/zynq-common.h
parent00cf6b4e229f8537ea2543ccc01e08a310414d09 (diff)
downloadu-boot-imx-47b35a516b60de6c1055fab3a866a1e70bf12f6b.zip
u-boot-imx-47b35a516b60de6c1055fab3a866a1e70bf12f6b.tar.gz
u-boot-imx-47b35a516b60de6c1055fab3a866a1e70bf12f6b.tar.bz2
ARM: 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 <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include/configs/zynq-common.h')
-rw-r--r--include/configs/zynq-common.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1cfc963..0a7d104 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -83,18 +83,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_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
@@ -102,6 +96,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
+
#define CONFIG_SYS_I2C_ZYNQ
/* I2C */
#if defined(CONFIG_SYS_I2C_ZYNQ)