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

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

diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
index 28b9c6b4c7f01fa60323cb4b9107af5207ea0ef3..e4fe7a462d237ca16f388721d95d3ec4a43b4abb 100644 (file)
--- a/include/configs/zc5601.h
+++ b/include/configs/zc5601.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) Stefano Babic <sbabic@denx.de>
  *
  * Configuration settings for the E+L i.MX6Q DO82 board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __EL_ZC5601_H
@@ -11,23 +10,17 @@
 
 
 #define CONFIG_MXC_UART_BASE   UART2_BASE
-#define CONFIG_CONSOLE_DEV             "ttymxc1"
+#define CONSOLE_DEV            "ttymxc1"
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p1"
 
-#define CONFIG_DEFAULT_FDT_FILE        "imx6q-zc5601.dtb"
-
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 #define IMX_FEC_BASE                           ENET_BASE_ADDR
 #define CONFIG_FEC_XCV_TYPE                    RGMII
 #define CONFIG_ETHPRIME                                "FEC"
 #define CONFIG_FEC_MXC_PHYADDR                 0x10
-#define CONFIG_PHYLIB
 #define CONFIG_FEC_FIXED_SPEED                 1000 /* No autoneg, fix Gb */
 
 #endif                         /*__EL6Q_CONFIG_H */