Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / dra7xx_evm.h

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 7441f4a69dea100ace1f2f2cfaf3ae764cb7c33e..3487b8ac1b30f90bf8feb891ab2413b64e5d6546 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -21,16 +21,14 @@
 #ifndef CONFIG_QSPI_BOOT
 /* MMC ENV related defines */
 #define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-#define CONFIG_ENV_OFFSET              0x260000
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #endif
 
 #if (CONFIG_CONS_INDEX == 1)
-#define CONSOLEDEV                     "ttyO0"
+#define CONSOLEDEV                     "ttyS0"
 #elif (CONFIG_CONS_INDEX == 3)
-#define CONSOLEDEV                     "ttyO2"
+#define CONSOLEDEV                     "ttyS2"
 #endif
 #define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2                UART2_BASE      /* UART2 */
@@ -72,10 +70,6 @@
 #define CONFIG_NET_RETRY_COUNT         10
 #define CONFIG_PHY_TI
 
-/* SPI */
-#define CONFIG_TI_SPI_MMAP
-#define CONFIG_QSPI_QUAD_SUPPORT
-
 /*
  * Default to using SPI for environment, etc.
  * 0x000000 - 0x040000 : QSPI.SPL (256KiB)
@@ -98,10 +92,6 @@
 #endif
 
 /* SPI SPL */
-#define CONFIG_TI_EDMA3
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
-
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP