[PATCH 9/9] Revert "arm: am335x: Enable SPL_OF_CONTROL on some configs"

[Simon Glass]

Hi Tom,

On Wed, 5 Jun 2024 at 08:42, Tom Rini <trini at konsulko.com> wrote:
>
> On Tue, Jun 04, 2024 at 09:25:21PM -0600, Simon Glass wrote:
>
> > This is a partial revert which makes boneblack_vboot boot again.
> >
> > This reverts commit f4b64e9736e73ceec14d51600bed9a8ac48f9fe8.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> >  configs/am335x_boneblack_vboot_defconfig | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> > index d473a1a793b..3ec4abddd77 100644
> > --- a/configs/am335x_boneblack_vboot_defconfig
> > +++ b/configs/am335x_boneblack_vboot_defconfig
> > @@ -40,7 +40,6 @@ CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
> >  # CONFIG_CMD_SETEXPR is not set
> >  CONFIG_BOOTP_DNS2=y
> >  CONFIG_OF_CONTROL=y
> > -CONFIG_SPL_OF_CONTROL=y
> >  CONFIG_ENV_OVERWRITE=y
> >  CONFIG_ENV_IS_IN_MMC=y
> >  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
>
> So, this change was a while ago. But I did it because some of the
> drivers, tho I forget which ones exactly, really were not functional
> without SPL_OF_CONTROL enabled. That said, does am335x_evm_defconfig
> work in your configuration? I think we have to keep am335x_evm_spiboot
> because it's so radically different from how the rest of the possible
> options boot, but I'm not sure we need a vboot defconfig? Or if we do,
> it should be updated to use the #include logic these days.

I don't actually have an am335x_evm board, which is why I'm using bbb.
We only have the vboot version, since the non-vboot was removed a
while back.

In any case, with this patch, bbb boots again.

Regards,
Simon