diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-29 08:26:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-29 08:26:07 -0500 |
| commit | b06c46de632c55f4c39d404c6f0f65e414b31050 (patch) | |
| tree | dea1702529c8d33c5e70eb5eb6ecf7d08eed23b9 /arch/arm/Kconfig | |
| parent | fcc8250c2f7c982f3593a8eecf737f8e2c95f222 (diff) | |
| parent | a04a5daae25a74ad2ac90b66667dac126242baa0 (diff) | |
Merge tag 'xilinx-for-v2018.01' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2018.1
Zynq:
- Add support for Syzygy and cc108 boards
- Add support for mini u-boot configurations (cse)
- dts updates
- config/defconfig updates in connection to Kconfig changes
- Fix psu_init handling
ZynqMP:
- SPL fixes
- Remove slcr.c
- Fixing r5 startup sequence
- Add support for external pmufw
- Add support for new ZynqMP chips
- dts updates
- Add support for zcu102 rev1.0 board
Drivers:
- nand: Support external timing setting and board init
- ahci: Fix wording
- axi_emac: Wait for bit, non processor mode, readl/write conversion
- zynq_gem: Fix SGMII/PCS support
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ca386decfe..e50ba930a1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -738,7 +738,7 @@ config ARCH_VF610 imply NAND config ARCH_ZYNQ - bool "Xilinx Zynq Platform" + bool "Xilinx Zynq based platform" select BOARD_LATE_INIT select CPU_V7 select SUPPORT_SPL @@ -764,7 +764,7 @@ config ARCH_ZYNQ imply CMD_SPL config ARCH_ZYNQMP - bool "Support Xilinx ZynqMP Platform" + bool "Xilinx ZynqMP based platform" select ARM64 select BOARD_LATE_INIT select DM |