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

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

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 32623c2..6dad821 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -13,9 +13,6 @@
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
-#undef CONFIG_BOOTM_NETBSD
-
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
@@ -27,6 +24,7 @@
 
 /* Networking */
 #define FEC_QUIRK_ENET_MAC
+#define FEC_ENET_ENABLE_TXC_DELAY
 
 #define CONFIG_TFTP_TSIZE
 
@@ -85,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
 
@@ -111,9 +103,6 @@
 #define PHYS_SDRAM_1_SIZE              SZ_2G           /* 2 GB */
 #define PHYS_SDRAM_2_SIZE              SZ_2G           /* 2 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE                        115200
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_CBSIZE              SZ_2K