diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-31 07:10:55 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-31 07:10:55 -0500 |
| commit | ab21ecef7a38dd211fe6db35c6e60800445eb6a2 (patch) | |
| tree | 88206942bc34bb97062d793e56db6f97cf74ea8f /include/configs/zynq-common.h | |
| parent | 11d2e98d7e75dfb40651eb95c32ca36778cd96d3 (diff) | |
| parent | e7563c204eb4f7a422121c342e4e9f34cd1986e9 (diff) | |
Merge tag 'xilinx-for-v2018.03' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.03
- Several Kconfig fixes (also moving configs to defconfigs)
- Some DTS updates
- ZynqMP psu rework based on Zynq concept
- Add low level initialization for zc770 and zcu102
- Add support for Zynq zc770 x16 nand configuration
- Add mini nand/emmc ZynqMP targets
- Some arasan nand changes
Diffstat (limited to 'include/configs/zynq-common.h')
| -rw-r--r-- | include/configs/zynq-common.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 28cee15b37..d341042073 100644 --- 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,9 +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 @@ -160,7 +157,6 @@ #define CONFIG_PREBOOT /* Boot configuration */ -#define CONFIG_BOOTCOMMAND "run $modeboot || run distro_bootcmd" #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ /* Distro boot enablement */ |