Hi Ilias, Tom, On Tue, 19 Oct 2021 at 09:38, Ilias Apalodimas <ilias.apalodi...@linaro.org> wrote: > > On Tue, 19 Oct 2021 at 18:36, Tom Rini <tr...@konsulko.com> wrote: > > > > On Tue, Oct 19, 2021 at 06:30:59PM +0300, Ilias Apalodimas wrote: > > > On Tue, 19 Oct 2021 at 17:17, Tom Rini <tr...@konsulko.com> wrote: > > > > > > > > On Tue, Oct 19, 2021 at 08:03:07AM -0600, Simon Glass wrote: > > > > > > [...] > > > > > > > > > > > > > For some reason this still does not apply for me on -master. Can you > > > > > please confirm the hash you are using? > > > > > > > > The hunk for scripts/Makefile.spl still fails (it failed on v3 as well), > > > > but is easily fixed-up, fwiw. > > > > > > The reason is that I rebased on top of the prerequisite series, but > > > failed to pull in -master. As Tom says it's a single line of code > > > that's in conflict. Shall I send a v5 or will you pull that in Tom? > > > > Well, what should that look like exactly? It fails to apply cleanly on > > current master. I had swapped it to CONFIG_SANDBOX, but I gather from > > Simon's comment it should be OF_BOARD? > > > > It should be OF_SANDBOX. I tried to fold SANDBOX to OF_BOARD befire > sending it, but I had some failures I didn't have time to investigate. > So I'll leave that to Simon's further cleanup
Yes that's fine, my OF_BOARD series can clean it up. We can leave it as a special case for now. Regards, Simon