diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-24 10:47:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-24 10:47:05 -0500 |
| commit | ce0d1e48165fdd3bde4bb431f1d2e100b1617a6e (patch) | |
| tree | 8b30f2052d732ae7cfae221be6a9287f87e1de78 /include | |
| parent | aff66f22d6eeb27c6329c0a3c1ebc52914c8affa (diff) | |
| parent | 4efdbc88b79bd8bd3e285cd238e1942d669a7088 (diff) | |
Merge tag 'xilinx-for-v2019.04' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2019.04
tools:
- Fix zynqmpimage generation
zynq:
- Some configs/Kconfig/DT updates
- Enable REMAKE_ELF and OF_SEPARATE
- Topic boards update
- i2c cleanups and conversion to DM_I2C
zynqmp:
- Some configs/Kconfig/DT updates
- Board config cleanup
- Move arch folder to mach-zynqmp
versal:
- Enable DM_I2C, CMD_DM
zynq-gem:
- Fix driver cache handling
i2c:
- Live tree simple update
phy:
- Fixed phy cleanup
travis:
- Wire Versal SoC
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/zynq-common.h | 2 | ||||
| -rw-r--r-- | include/configs/zynq_zybo.h | 18 |
2 files changed, 2 insertions, 18 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 864f3220f3..1710feda91 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -14,6 +14,8 @@ # define CONFIG_CPU_FREQ_HZ 800000000 #endif +#define CONFIG_REMAKE_ELF + /* Cache options */ #define CONFIG_SYS_L2CACHE_OFF #ifndef CONFIG_SYS_L2CACHE_OFF diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h deleted file mode 100644 index 7d00b412a7..0000000000 --- a/include/configs/zynq_zybo.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2012 Xilinx - * (C) Copyright 2014 Digilent Inc. - * - * Configuration for Zynq Development Board - ZYBO - * See zynq-common.h for Zynq common configs - */ - -#ifndef __CONFIG_ZYNQ_ZYBO_H -#define __CONFIG_ZYNQ_ZYBO_H - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50 - -#include <configs/zynq-common.h> - -#endif /* __CONFIG_ZYNQ_ZYBO_H */ |