[U-Boot] [GIT PULL] Zynq changes

Hi Tom,
here are 3 pending patches which were sent in merge window.
Thanks, Michal
The following changes since commit a84988c76d1dbca2dbe870d6b4f0ad398f287f85:
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2015-05-22 17:23:15 -0400)
are available in the git repository at:
git://www.denx.de/git/u-boot-microblaze.git zynq
for you to fetch changes up to 95b237ecbced8ca120c37cc284c4b2feeec8ed57:
ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70x (2015-05-25 10:52:36 +0200)
---------------------------------------------------------------- Masahiro Yamada (2): ARM: zynq: add separate configuration for ZC702 and ZC706 ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70x
Michal Simek (1): zynq: Use system timer implementation instead of our
arch/arm/mach-zynq/Kconfig | 25 +- arch/arm/mach-zynq/include/mach/hardware.h | 1 - arch/arm/mach-zynq/spl.c | 2 +- arch/arm/mach-zynq/timer.c | 83 +- board/xilinx/zynq/.gitignore | 2 +- board/xilinx/zynq/Makefile | 39 +- board/xilinx/zynq/MicroZed_hw_platform/ps7_init_gpl.c | 12974 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynq/MicroZed_hw_platform/ps7_init_gpl.h | 128 + board/xilinx/zynq/ZC702_hw_platform/ps7_init_gpl.c | 13307 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynq/ZC702_hw_platform/ps7_init_gpl.h | 128 + board/xilinx/zynq/ZC706_hw_platform/ps7_init_gpl.c | 13214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynq/ZC706_hw_platform/ps7_init_gpl.h | 128 + board/xilinx/zynq/custom_hw_platform/.gitignore | 1 + board/xilinx/zynq/zed_hw_platform/ps7_init_gpl.c | 12872 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynq/zed_hw_platform/ps7_init_gpl.h | 128 + configs/zynq_zc702_defconfig | 10 + configs/zynq_zc706_defconfig | 10 + doc/README.zynq | 15 +- include/configs/zynq-common.h | 5 + 19 files changed, 52971 insertions(+), 101 deletions(-) create mode 100644 board/xilinx/zynq/MicroZed_hw_platform/ps7_init_gpl.c create mode 100644 board/xilinx/zynq/MicroZed_hw_platform/ps7_init_gpl.h create mode 100644 board/xilinx/zynq/ZC702_hw_platform/ps7_init_gpl.c create mode 100644 board/xilinx/zynq/ZC702_hw_platform/ps7_init_gpl.h create mode 100644 board/xilinx/zynq/ZC706_hw_platform/ps7_init_gpl.c create mode 100644 board/xilinx/zynq/ZC706_hw_platform/ps7_init_gpl.h create mode 100644 board/xilinx/zynq/custom_hw_platform/.gitignore create mode 100644 board/xilinx/zynq/zed_hw_platform/ps7_init_gpl.c create mode 100644 board/xilinx/zynq/zed_hw_platform/ps7_init_gpl.h create mode 100644 configs/zynq_zc702_defconfig create mode 100644 configs/zynq_zc706_defconfig

On Mon, May 25, 2015 at 11:17:07AM +0200, Michal Simek wrote:
Hi Tom,
here are 3 pending patches which were sent in merge window.
Thanks, Michal
The following changes since commit a84988c76d1dbca2dbe870d6b4f0ad398f287f85:
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2015-05-22 17:23:15 -0400)
are available in the git repository at:
git://www.denx.de/git/u-boot-microblaze.git zynq
for you to fetch changes up to 95b237ecbced8ca120c37cc284c4b2feeec8ed57:
ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70x (2015-05-25 10:52:36 +0200)
Note: +(zynq_zc70x) ../board/xilinx/zynq/Makefile:43: CONFIG_TARGET_ZYNQ_ZC70X is deprecated. +(zynq_zc70x) ../board/xilinx/zynq/Makefile:44: Enable CONFIG_TARGET_ZYNQ_ZC702 or CONFIG_TARGET_ZYNQ_706 instead. +(zynq_zc70x) ../board/xilinx/zynq/Makefile:45: "make zynq_zc70x_defconfig" is also deprecated. +(zynq_zc70x) ../board/xilinx/zynq/Makefile:46: Use "make zynq_zc702_defconfig" or "make zynq_zc706_defconfig".
Applied to u-boot/master, thanks!
participants (2)
-
Michal Simek
-
Tom Rini