diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-27 08:29:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-27 08:29:10 -0400 |
| commit | bbef20d479441b01d62252cf127498c58078b2c3 (patch) | |
| tree | 7818d7df29c6147d5270c0ee0a6ff1645917d1b6 /include/configs | |
| parent | 0ae8dcfef7c890330c62bb34c724126ffc169bef (diff) | |
| parent | 3888c8d1979289efe685fe29276aed4d4b685975 (diff) | |
Merge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.11
- Handle BOARD_LATE_INIT via Kconfig
SPL:
- Enable GZIP for all partitions types(not only for kernel)
ZynqMP:
- Rearrange pmufw version handling
- Support newer PMUFW with improved fpga load sequence
Zynq:
- Cleanup config file
- Simplify zybo config by enabling option via Kconfig
net:
- Fix gems max-speed property reading
- Enable support for fixed-link phys
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/xilinx_zynqmp_mini.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 8 | ||||
| -rw-r--r-- | include/configs/zynq_cse.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq_zybo.h | 2 |
4 files changed, 0 insertions, 12 deletions
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 1387d39e79..00ca3d4be8 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -24,7 +24,6 @@ #undef CONFIG_BOOTM_NETBSD #undef CONFIG_BOOTM_VXWORKS #undef CONFIG_BOOTM_LINUX -#undef CONFIG_BOARD_LATE_INIT /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 526fe055a8..f99c2cbf0d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -127,8 +127,6 @@ /* Boot configuration */ #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ -/* Distro boot enablement */ - #ifdef CONFIG_SPL_BUILD #define BOOTENV #else @@ -244,10 +242,6 @@ #define CONFIG_SYS_LDSCRIPT "arch/arm/mach-zynq/u-boot.lds" -/* Commands */ - -/* SPL part */ - /* MMC support */ #ifdef CONFIG_MMC_SDHCI_ZYNQ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 @@ -279,8 +273,6 @@ CONFIG_SYS_SPI_ARGS_SIZE) #endif -/* for booting directly linux */ - /* SP location before relocation, must use scratch RAM */ #define CONFIG_SPL_TEXT_BASE 0x0 diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index c4587a1837..e7a4d4108a 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -17,7 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_BOARD_LATE_INIT #undef CONFIG_ZLIB #undef CONFIG_GZIP diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index 547ecb68fd..7d00b412a7 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -12,8 +12,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50 -#define CONFIG_DISPLAY -#define CONFIG_I2C_EDID #include <configs/zynq-common.h> |