diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-07 08:13:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-07 08:13:02 -0500 |
| commit | dcf4cb068e19a7f39e4a295102b247376bd27c95 (patch) | |
| tree | 181457dc202707b9ee622d6dce5117aab8e102d5 /include/configs/xilinx_zynqmp.h | |
| parent | 25ef4bea59dadbd25dec1dbb376ed84dfc735f02 (diff) | |
| parent | 8bebf03c73cd0830cb2cd234021004cde67c6412 (diff) | |
| download | talos-obmc-uboot-dcf4cb068e19a7f39e4a295102b247376bd27c95.tar.gz talos-obmc-uboot-dcf4cb068e19a7f39e4a295102b247376bd27c95.zip | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include/configs/xilinx_zynqmp.h')
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 474bbaff05..50ac5f531c 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -184,10 +184,8 @@ #define CONFIG_SYS_MAXARGS 64 /* Ethernet driver */ -#if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1) || \ - defined(CONFIG_ZYNQ_GEM2) || defined(CONFIG_ZYNQ_GEM3) +#if defined(CONFIG_ZYNQ_GEM) # define CONFIG_NET_MULTI -# define CONFIG_ZYNQ_GEM # define CONFIG_MII # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define CONFIG_PHYLIB @@ -224,9 +222,6 @@ #define CONFIG_CMD_SCSI #endif -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ - #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) #define CONFIG_CMD_BOOTI |
