On Mon, Jun 27, 2022 at 11:50:48AM +0200, Michal Simek wrote:

> Hi Tom,
> 
> please pull the following patches to your next branch.
> There are a lot of changes especially with Microblaze and having an option
> to disable MANUAL RELOC.
> 
> Gitlab CI doesn't show any issue.
> 
> And there is merge conflict with your next branch (Kconfig layout change)
> which is easy to resolve.
> Simply remove all reported lines from include/configs/microblaze-generic.h and
> include/configs/xilinx_zynqmp.h
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit c18e5fb055ab789f58434e3cb432582adee0134c:
> 
>   dtoc: Update test_src_scan.py for new tegra compatibles (2022-06-14
> 13:59:23 -0400)
> 
> are available in the Git repository at:
> 
>   [email protected]:u-boot/custodians/u-boot-microblaze.git
> tags/xilinx-for-v2022.10
> 
> for you to fetch changes up to 728a86edb63a647e6faf211c0dbc7bd0e4ff7ac6:
> 
>   timer: Add SPL_REGMAP dependency for Xilinx timer (2022-06-27 09:03:54 
> +0200)
> 

Applied to u-boot/next, thanks!

-- 
Tom

Attachment: signature.asc
Description: PGP signature

Reply via email to