[PATCH v3 00/20] Refactor the architecture parts of mt7628

[Stefan]

On 11.02.20 13:34, Mauro Condarelli wrote:
> Thanks for the fast answer, Stefan.
> 
> On 2/11/20 12:16 PM, Stefan wrote:
>> Hi Mauro,
>> ===8<----
>>>> https://gitlab.denx.de/u-boot/custodians/u-boot-mips/commits/testing
>>> I tried to use this repo/branch, but something is wrong (or I goofed
>>> badly).
>>
>> Just a quick reply: I tested u-boot-mips/testing today and it works just
>> fine on both LinkIt and the GARDENA board. So there is nothing wrong
>> with this repository AFAICT.
> Suspect is there's something wrong with handling of SPL_UART2_SPIS_PINMUX
> (that's where our boards are different), but I couldn't spot any relevant
> difference.

Correct, I have not selected this one. You need to select it via "make
menuconfig" for your board and save it to your defconfig by "make
savedefconfig".

If this does not work, then please double-check, if the correct code is
called in this pinx-mux case.

>> You might need to rebase your patch on top of this branch, as some files
>> might have changes in the meantime.
> What is the recommended procedure, in this case?
> I did a:
>  Â  git format-patch --full-index -o ../transport weijie.v3
> on old branch ("weijie.v3" is the branch on which I added Weijie's patches,
> of course), an then I tried simply (on u-boot-mips):
>  Â  git checkout -b vocore2 testing
>  Â  git am -3 ../transport/*

This sounds like a valid approach.

There are many ways. I usually use "git rebase" for this:

In your case:

- Check out your current working branch
- git checkout -b new-version
- git rebase u-boot-mips/testing

The rebase command will most likely issue some warnings or errors on
files that you need to manually fix. After this "git rebase --continue".
But the output will tell you, what to do.

But again, your approach looks also fine.

Thanks,
Stefan