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

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

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index be2c5a2293f1c78e1323e5e547df20047b070f49..08d34db1061ec8c1b82e8668c67a566dad6829d2 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -13,10 +13,6 @@
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
-#undef CONFIG_BOOTM_NETBSD
-
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
@@ -28,9 +24,8 @@
 
 /* Networking */
 #define FEC_QUIRK_ENET_MAC
+#define FEC_ENET_ENABLE_TXC_DELAY
 
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          SZ_4K
 #define CONFIG_TFTP_TSIZE
 
 #define CONFIG_IPADDR                  192.168.10.2
@@ -88,13 +83,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-#define CONFIG_SYS_MEMTEST_START       0x88000000
-#define CONFIG_SYS_MEMTEST_END         0x89000000
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_ENV_SIZE                        SZ_8K
-#define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
-                                        CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
 #define CONFIG_SYS_MMC_ENV_PART                1