[PATCH v3 01/38] spl: Use CONFIG_SPL... instead of CONFIG_..._SPL_...

[Simon Glass]

Hi Felix,

On Mon, 25 Sept 2023 at 08:56, Felix Brack <fb at ltec.ch> wrote:
>
> Hi Simon,
>
> On 24.09.23 21:24, Simon Glass wrote:
> > We like to put the SPL first so it is clear that it relates to SPL. Rename
> > various malloc-related options which have crept in, to stick to this
> > convention.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > Reviewed-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> > Reviewed-by: Martyn Welch <martyn.welch at collabora.com>
> > Reviewed-by: Svyatoslav Ryhel <clamor95 at gmail.com>
> > ---
> >
> > (no changes since v1)
> > .....
>
> I just tried to apply the patch to master for testing and got the
> following result:
>
> error: patch failed: configs/am335x_baltos_defconfig:18
> error: configs/am335x_baltos_defconfig: patch does not apply
> error: patch failed: configs/am335x_igep003x_defconfig:20
> error: configs/am335x_igep003x_defconfig: patch does not apply
> error: patch failed: configs/dh_imx6_defconfig:39
> error: configs/dh_imx6_defconfig: patch does not apply
> error: patch failed: configs/starfive_visionfive2_defconfig:47
> error: configs/starfive_visionfive2_defconfig: patch does not apply
>
> For what I want to test (changes for PDU001 board) this doesn't matter
> however. I'm just not sure: should I go ahead with testing or wait for
> an updated patch?

I had to resync the defconfigs before this patch, to avoid conflicts
when applied.

So you can use './tools/moveconfig -Cy' and then the series should apply OK.

Regards,
Simon