Changes in Makefile

dc557e9a1fe00ca9d884bd88feef5bebf23fede4 - Merge branch 'master' of git://git.denx.de/u-boot

Sat, 18 Jun 2016 08:24:54 +0000

Merge branch 'master' of git://git.denx.de/u-bootSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

ec8fb48ce98987065493b27422200897cf0909f8 - Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

Tue, 24 May 2016 12:20:43 +0000

Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

ad5b5801264e573bfbf17a20b04c546985c5bfc1 - ARM: zynq: Simplify zynq configuration

Fri, 20 May 2016 12:59:33 +0000

ARM: zynq: Simplify zynq configurationExtending Kconfig for adding new platform is a lot of workfor nothing. Setting SYS_CONFIG_NAME directly in Kconfig andremove all dependencies on TARGET_ZYNQ_* options including SPL.As a side-effect it also remove custom init folder for ps7_init_gpl.*files. Folder is chosen based on device-tree file.Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

4832e17787acb29734d895751bc7a594908aecc6 - Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

Fri, 18 Dec 2015 12:28:24 +0000

Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

f0b567bf0a0f271e60bcd63f49dd54599aa56a4f - ARM: zynq: Add default ps7_init_gpl.c/h for ZYBO

Tue, 24 Nov 2015 09:34:09 +0000

ARM: zynq: Add default ps7_init_gpl.c/h for ZYBOAdd ps7_init_gpl.c/h for the ZYBO board. This instance of the ps7_initis generated by the Vivado 2015.3 tools using the system configurationprovided by Digilent located on their website.Update the kconfig so that the defconfig is not overrided to use thecustom init ps7_init_gpl target by default.Signed-off-by: Nathan Rossi Cc: Albert Aribaud Cc: Michal Simek Cc: Masahiro Yamada Cc: Joe Hershberger Cc: "Sören Brinkmann" Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

5f5620ab2679608f94b3a77e51c77d0a770103bd - Merge git://git.denx.de/u-boot

Thu, 12 Nov 2015 16:13:26 +0000

Merge git://git.denx.de/u-boot List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

1e370ef7e7a4fb0b801a848e190c01e06a2fbfce - ARM: zynq: Remove zc70x target

Fri, 30 Oct 2015 14:05:54 +0000

ARM: zynq: Remove zc70x targetRemove zc70x target which was one setting for zc702 and zc706.Currently zc702 and zc706 are separated.Signed-off-by: Michal Simek Reviewed-by: Joe Hershberger List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

66d10c18bf2c34698362b6fe1891bcc6e8755243 - Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

Tue, 28 Jul 2015 15:31:21 +0000

Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

260bdf07a3f37f28b01ad42ec3e22d1428c31364 - zynq: Fix typo in Makefile about custom ps7_init file

Tue, 21 Jul 2015 09:05:31 +0000

zynq: Fix typo in Makefile about custom ps7_init fileTrivial fix.Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

d43e15421014c17b90c3e288e3eff18ad8aaf346 - Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

Tue, 26 May 2015 14:37:29 +0000

Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

95b237ecbced8ca120c37cc284c4b2feeec8ed57 - ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70x

Mon, 18 May 2015 06:31:52 +0000

ARM: zynq: add default ps7_init_gpl.c/h for Zed, MicroZed, ZC70xDue to licensing issues, the files ps7_init.c/h are not able to bedistributed with U-Boot source code. Recent Xilinx tools alsoprovide the GPL variants (ps7_init_gpl.c/h), compatible with U-Bootlicense.Prior to this commit, we had to copy ps7_init files intoboard/xilinx/zynq/ before the compile.To be more user-friendly, let's include ps7_init_gpl.c/h forZedboard, MicroZed, ZC702, ZC706.These init code have been taken from the hwplatform_templatesdirectory of Xilinx SDK 2014.4.You can still use customized ps7_init_gpl.c/h by enablingCONFIG_ZYNQ_CUSTOM_INIT. The recommended directory for storing themis now board/xilinx/zynq/custom_hw_platform, but board/xilinx/zynqis still supported for backward compatibility. The latter emitsa warning message to prompt users to gradually switch to the newdirectory.Signed-off-by: Masahiro Yamada Acked-by: Sören Brinkmann Acked-by: Joe Hershberger Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

9bd53b625582555820d7bce5407ee8b56edc2160 - ARM: zynq: add separate configuration for ZC702 and ZC706

Mon, 18 May 2015 06:31:51 +0000

ARM: zynq: add separate configuration for ZC702 and ZC706Prior to this commit, ZC702 and ZC706 shared the same configurationand were built as follows:ZC702: make zynq_zc70x_defconfig && makeZC706: make zynq_zc70x_defconfig && make DEVICE_TREE=zynq-zc706This commit introduces separate configuration for them, which makesthe next commit much easier.Going forward, the recommended build commands are:ZC702: make zynq_zc702_defconfig && makeZC706: make zynq_zc706_defconfig && makeAlthough the old work flow is still supported, CONFIG_TARGET_ZC70Xhas been marked as deprecated. If used, the warning message isshown to prompt users to switch to the new scheme.Signed-off-by: Masahiro Yamada Acked-by: Joe Hershberger Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

b939689c7b87773c44275a578ffc8674a867e39d - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Tue, 05 May 2015 08:09:06 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

ace97d26176a3ebc9ec07738450de93eea35975c - Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

Wed, 29 Apr 2015 10:46:33 +0000

Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

e7fa7d5c732b0fea4784b77c242bf35da06ead1d - ARM: zynq: drop legacy ps7_init.c/h support

Tue, 14 Apr 2015 07:50:50 +0000

ARM: zynq: drop legacy ps7_init.c/h supportWe are about to change the location for ps7_init files, breaking thecurrent work-flows. It is good time to drop the legacy ps7_init.c/hsupport.Going forward, please use ps7_init_gpl.c/h all the time.If you are still using old Xilinx tools that are only able togenerate ps7_init.c/h, rename them into ps7_init_gpl.c/h.Signed-off-by: Masahiro Yamada Suggested-by: Sören Brinkmann Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

3deb013ae780c19f40b0704a7f421ad479962618 - Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

Thu, 13 Nov 2014 13:38:17 +0000

Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

290f1f999a42fd08f3483722a61e2d9e0901eb17 - zynq: Use GPLed files for SPL

Thu, 30 Oct 2014 17:52:43 +0000

zynq: Use GPLed files for SPLThe latest Xilinx tools generate ps7_init files that are explicitlyavailable under GPL. Change the makefile to allow drop in of those filesfor building the SPL.Signed-off-by: Soren Brinkmann Acked-by: Jagannadha Sutradharudu Teki Reviewed-and-tested-by: Masahiro Yamada Signed-off-by: Michal Simek List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

c23154aab5825fec81d5500c53eaa686646c76b5 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Fri, 08 Aug 2014 08:18:40 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

362f16b1e9e94024a511adae9977d145ef942b50 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Tue, 29 Jul 2014 13:41:35 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile

f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 - Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

Sat, 26 Jul 2014 12:08:36 +0000

Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/xilinx/zynq/Makefile