Re: [U-Boot] [PATCH 4/6] mvebu: select boot device at SoC level

Weird git am failed for me so I had to tweak the patch. I must have done something wrong on my end. I did test on the helios4 after applying the set and it booted fine

On 6 August 2018 2:13:33 pm GMT+02:00, Stefan Roese sr@denx.de wrote:

Hi Baruch,

On 06.08.2018 12:12, Baruch Siach wrote:

...

Hi Dennis,

Thanks for taking the time to look into this series.

Dennis Gilmore writes:

...

this patch needs to be rebased on git master as it does not apply.

The conflict is trivial for git to handle automatically on rebase (remove, remove). I assume 'git am -3' can do the same. Would you

like

...

me to send v2 of this series for that?

Seems to be fine. I just tried it and it applies fine, resolving the conflicts automatically. No new version necessary.

Thanks, Stefan