30 Apr
2020
30 Apr
'20
7 p.m.
On Thu, Apr 30, 2020 at 09:38:06AM +0200, Michal Simek wrote:
Hi Tom,
Please pull these patches to your tree. Travis looks good. https://travis-ci.org/github/michalsimek/u-boot/builds/680070323
Gitlab CI too https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze/pipelines/2952
I have tried to merge with your latest branch and there is small conflict because of defconfig resync. It is easy to resolve like this.
diff --cc configs/zynq_cse_nand_defconfig index 80a427d905d3,19491c9e47eb..000000000000
Applied to u-boot/master, thanks!
--
Tom