Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / include / configs / omap5_uevm.h

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 23dc089..53589c0 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -30,17 +30,11 @@
 
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE
 
-#define CONFIG_MISC_INIT_R
 /* 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
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
@@ -57,7 +51,7 @@
 
 /* USB Networking options */
 
-#define CONSOLEDEV             "ttyO2"
+#define CONSOLEDEV             "ttyS2"
 
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    1