[PATCH v2 2/3] board: freescale: undef CONFIG_SPL_DM_I2C for SPL

Igor Opaniuk
2021-02-09T09:28:50Z

On Tue, Feb 9, 2021 at 10:45 AM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> Hi Tom,
>
> On Tue, Feb 9, 2021 at 4:26 AM Tom Rini <trini@konsulko.com> wrote:
> >
> > On Tue, Feb 09, 2021 at 01:37:54AM +0200, Igor Opaniuk wrote:
> >
> > > From: Igor Opaniuk <igor.opaniuk@foundries.io>
> > >
> > > Replace CONFIG_DM_I2C undefs with CONFIG_SPL_DM_I2C for the SPL build
> > > case. This should be moved to appropriate board defconfigs
> > > in the future.
> > >
> > > Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
> > > ---
> > >
> > > (no changes since v1)
> > >
> > > include/configs/T104xRDB.h | 2 +-
> > > include/configs/imx8mp_evk.h | 2 +-
> > > include/configs/ls1021atwr.h | 2 +-
> > > include/configs/ls1046a_common.h | 2 +-
> > > include/configs/phycore_imx8mp.h | 2 +-
> > > 5 files changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
> > > index aee00a86cf..f4d0aec42b 100644
> > > --- a/include/configs/T104xRDB.h
> > > +++ b/include/configs/T104xRDB.h
> > > @@ -30,7 +30,7 @@
> > > #define CONFIG_SPL_SKIP_RELOCATE
> > > #define CONFIG_SPL_COMMON_INIT_DDR
> > > #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
> > > -#undef CONFIG_DM_I2C
> > > +#undef CONFIG_SPL_DM_I2C
> > > #endif
> > > #define RESET_VECTOR_OFFSET 0x27FFC
> > > #define BOOT_PAGE_OFFSET 0x27000
> > > diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
> > > index 4850b1b934..33c5759b46 100644
> > > --- a/include/configs/imx8mp_evk.h
> > > +++ b/include/configs/imx8mp_evk.h
> > > @@ -37,7 +37,7 @@
> > > #define CONFIG_POWER_I2C
> > > #define CONFIG_POWER_PCA9450
> > >
> > > -#undef CONFIG_DM_I2C
> > > +#undef CONFIG_SPL_DM_I2C
> > > #define CONFIG_SYS_I2C
> > >
> > > #endif
> > > diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
> > > index 3e85bb3850..f2bf35ffa5 100644
> > > --- a/include/configs/ls1021atwr.h
> > > +++ b/include/configs/ls1021atwr.h
> > > @@ -435,7 +435,7 @@
> > >
> > > #ifdef CONFIG_SPL_BUILD
> > > #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE
> > > -#undef CONFIG_DM_I2C
> > > +#undef CONFIG_SPL_DM_I2C
> > > #else
> > > #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
> > > #endif
> > > diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
> > > index d44a7f105e..b5bbb636da 100644
> > > --- a/include/configs/ls1046a_common.h
> > > +++ b/include/configs/ls1046a_common.h
> > > @@ -16,7 +16,7 @@
> > > #define SPL_NO_QSPI
> > > #define SPL_NO_USB
> > > #define SPL_NO_SATA
> > > -#undef CONFIG_DM_I2C
> > > +#undef CONFIG_SPL_DM_I2C
> > > #endif
> > > #if defined(CONFIG_SPL_BUILD) && \
> > > (defined(CONFIG_NAND_BOOT) || defined(CONFIG_QSPI_BOOT))
> > > diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
> > > index 889dd36e6e..dcd320f746 100644
> > > --- a/include/configs/phycore_imx8mp.h
> > > +++ b/include/configs/phycore_imx8mp.h
> > > @@ -33,7 +33,7 @@
> > > #define CONFIG_POWER_I2C
> > > #define CONFIG_POWER_PCA9450
> > >
> > > -#undef CONFIG_DM_I2C
> > > +#undef CONFIG_SPL_DM_I2C
> > > #define CONFIG_SYS_I2C
> > >
> > > #endif
> >
> > This is somewhere between "doesn't actually work" and "works by chance".
> > Since you're adding the symbol to Kconfig, keep it disabled on these
> > boards in the defconfig please.
> To be honest, I was expecting that comment :)
> You're 100% right, I just wanted to avoid messing a lot with
> defconfigs of boards I can't
> test (so I assumed this current change is less intrusive, as basically
> it just replicates
> previous behaviour).
>
> For only ls1046a there are 19 different defconfigs, not to mention other boards.
Seems I've bit over-estimated the problem, this little script did the trick:

cd configs
files=(*ls1046a*)
files2=(*T104*RDB*)
files3=(ls1021atwr_*)
files4=("imx8mp_evk_defconfig phycore-imx8mp_defconfig")
combine=("${files[@]}" "${files2[@]}" "${files3[@]}" "${files4[@]}")
cd ..

for item in ${combine[*]}
do
echo "Adjusting $item"
echo "# CONFIG_SPL_DM_I2C is not set" >> configs/$item
make $item && make savedefconfig && cp defconfig configs/$item
done

Automation rules as usual :)
>
> Ok, I'll address that and send v3.
> >
> > --
> > Tom
>
> Regards,
> Igor
>
> --
> Best regards - Freundliche Gr?sse - Meilleures salutations
>
> Igor Opaniuk
>
> mailto: igor.opaniuk at gmail.com
> skype: igor.opanyuk
> +380 (93) 836 40 67
> http://ua.linkedin.com/in/iopaniuk

--
Best regards - Freundliche Gr?sse - Meilleures salutations

Igor Opaniuk
Embedded Software Engineer
T: +380 938364067
E: igor.opaniuk at foundries.io
W: www.foundries.io