Merge git://git.denx.de/u-boot-imx

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

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 28cee15..ac9663d 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2012 Michal Simek <monstr@monstr.eu>
- * (C) Copyright 2013 Xilinx, Inc.
+ * (C) Copyright 2013 - 2018 Xilinx, Inc.
  *
  * Common configuration options for all Zynq boards.
  *
@@ -38,12 +38,6 @@
 #if defined(CONFIG_ZYNQ_GEM)
 # define CONFIG_MII
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-# define CONFIG_PHY_MARVELL
-# define CONFIG_PHY_REALTEK
-# define CONFIG_PHY_XILINX
-# define CONFIG_BOOTP_BOOTPATH
-# define CONFIG_BOOTP_GATEWAY
-# define CONFIG_BOOTP_HOSTNAME
 # define CONFIG_BOOTP_MAY_FAIL
 #endif
 
@@ -91,7 +85,6 @@
 # define DFU_DEFAULT_POLL_TIMEOUT      300
 # define CONFIG_USB_CABLE_CHECK
 # define CONFIG_THOR_RESET_OFF
-# define CONFIG_USB_FUNCTION_THOR
 # define DFU_ALT_INFO_RAM \
        "dfu_ram_info=" \
        "set dfu_alt_info " \
@@ -160,7 +153,6 @@
 #define CONFIG_PREBOOT
 
 /* Boot configuration */
-#define CONFIG_BOOTCOMMAND             "run $modeboot || run distro_bootcmd"
 #define CONFIG_SYS_LOAD_ADDR           0 /* default? */
 
 /* Distro boot enablement */
@@ -168,7 +160,6 @@
 #ifdef CONFIG_SPL_BUILD
 #define BOOTENV
 #else
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_CMD_MMC
 #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
@@ -260,9 +251,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_CLOCKS
 #define CONFIG_SYS_MAXARGS             32 /* max number of command args */
 
@@ -298,7 +286,6 @@
 /* Commands */
 
 /* SPL part */
-#define CONFIG_SPL_FRAMEWORK
 
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ