Merge branch '2020-05-07-more-kconfig-migrations'

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

diff --git a/include/configs/warp.h b/include/configs/warp.h
index f9c095dad3cd640680fb34c8c4b430237526e466..654f8349f4df6df0683efd7d4a4d88ce834f273b 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -23,15 +23,8 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
-
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + SZ_256M)
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
@@ -45,8 +38,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_ENV_OFFSET              (6 * SZ_64K)
-#define CONFIG_ENV_SIZE                        SZ_8K
 #define CONFIG_SYS_MMC_ENV_DEV         0
 
 /* VDD voltage 1.65 - 1.95 */