diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-23 10:50:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-23 10:50:38 -0400 |
| commit | ff719a73d93196d6f1d9456bdc40f48be4f91484 (patch) | |
| tree | 70eaed09edece71194090bcbeb47e51f49512fd1 /arch/arm | |
| parent | f6549c85410668e73503221ce6147d049cc6251d (diff) | |
| parent | ebc675b98d92f7b8264ca84e65cc896d95f9868b (diff) | |
Merge tag 'xilinx-for-v2018.05-rc3' of git://git.denx.de/u-boot-microblaze
Xilinx fixes for v2018.05-rc3
- Fix nand initialization
- Runtime ddr detection for static DDR setting
- Enable rewriting env locations
- Sync defconfig for zc770 xm011
- Remove useless ioremap in watchdog
- Check return value from soc_clk_dump()
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/nand.h | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 87729047f9..1352359438 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -36,6 +36,7 @@ config ZYNQ_DDRC_INIT want to skip ddr init and this option is useful for it. config SYS_BOARD + string "Board name" default "zynq" config SYS_VENDOR diff --git a/arch/arm/mach-zynq/include/mach/nand.h b/arch/arm/mach-zynq/include/mach/nand.h deleted file mode 100644 index 61ef45f582..0000000000 --- a/arch/arm/mach-zynq/include/mach/nand.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (C) 2017 National Instruments Corp. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <nand.h> - -void zynq_nand_init(void); |