ns16550: move CONFIG_SYS_NS16550 to Kconfig

[people/ms/u-boot.git] / include / configs / am43xx_evm.h

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index d868442acb5ae9d8ff3aa31a1f26b7a5a51b349b..fa01d1ec45e773c03db124c30b7eb5ec89df7657 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -22,10 +22,11 @@
 #include <asm/arch/omap.h>
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_CLK         48000000
+#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         48000000
+#endif
 
 /* I2C Configuration */
 #define CONFIG_CMD_EEPROM
@@ -136,6 +137,14 @@
 #define CONFIG_USB_GADGET_DUALSPEED
 #endif
 
+/*
+ * Disable MMC DM for SPL build and can be re-enabled after adding
+ * DM support in SPL
+ */
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_DM_MMC
+#endif
+
 #ifndef CONFIG_SPL_BUILD
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU
@@ -165,11 +174,22 @@
        "fdt ram 0x80f80000 0x80000;" \
        "ramdisk ram 0x81000000 0x4000000\0"
 
+#define CONFIG_DFU_SF
+#define DFU_ALT_INFO_QSPI \
+       "dfu_alt_info_qspi=" \
+       "u-boot.bin raw 0x0 0x080000;" \
+       "u-boot.backup raw 0x080000 0x080000;" \
+       "u-boot-spl-os raw 0x100000 0x010000;" \
+       "u-boot-env raw 0x110000 0x010000;" \
+       "u-boot-env.backup raw 0x120000 0x010000;" \
+       "kernel raw 0x130000 0x800000\0"
+
 #define DFUARGS \
        "dfu_bufsiz=0x10000\0" \
        DFU_ALT_INFO_MMC \
        DFU_ALT_INFO_EMMC \
-       DFU_ALT_INFO_RAM
+       DFU_ALT_INFO_RAM \
+       DFU_ALT_INFO_QSPI
 #else
 #define DFUARGS
 #endif
@@ -208,6 +228,8 @@
 #define CONFIG_QSPI_SEL_GPIO                   48
 #define CONFIG_SF_DEFAULT_SPEED                48000000
 #define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
+#define CONFIG_QSPI_QUAD_SUPPORT
+#define CONFIG_TI_EDMA3
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
@@ -329,6 +351,7 @@
 
 #define CONFIG_DRIVER_TI_CPSW
 #define CONFIG_PHYLIB
+#define PHY_ANEG_TIMEOUT       8000 /* PHY needs longer aneg time at 1G */
 
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING      "AM43xx U-Boot SPL"