[EXT] Re: [PATCHv2 26/31] arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig

[Ye Li]

On Wed, 2020-06-17 at 10:51 +0200, Stefano Babic wrote:
> 
> On 17.06.20 01:06, Tom Rini wrote:
> > 
> > While in most cases CSF_SIZE is handled via Kconfig we have some
> > i.MX8M
> > platforms that set the size based on the now-renamed
> > CONFIG_SECURE_BOOT
> > symbol.  Update things so that CSF_SIZE itself depends on IMX_HAB
> > being
> > enabled and provide the default value for i.MX8M family of parts.
> > 
> > Cc: Stefano Babic <sbabic at denx.de>
> > Cc: Fabio Estevam <festevam at gmail.com>
> > Cc: Ye Li <ye.li at nxp.com>
> > Cc: NXP i.MX U-Boot Team <uboot-imx at nxp.com>
> > Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with
> > CONFIG_IMX_HAB")
> > Signed-off-by: Tom Rini <trini at konsulko.com>
> > ---
> > Changes in v2:
> > - Make CSF_SIZE depend on IMX_HAB and update to be default 0x2000
> > if
> >   ARCH_IMX8M after comments from Ye Li
> > - Reword the commit slightly
> > ---
> >  arch/arm/mach-imx/Kconfig       | 2 ++
> >  include/configs/imx8mm_beacon.h | 4 ----
> >  include/configs/imx8mm_evk.h    | 4 ----
> >  include/configs/imx8mn_evk.h    | 4 ----
> >  include/configs/imx8mp_evk.h    | 4 ----
> >  include/configs/verdin-imx8mm.h | 4 ----
> >  6 files changed, 2 insertions(+), 20 deletions(-)
> > 
> > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> > index 6c3fedf665d6..1531d09f3bea 100644
> > --- a/arch/arm/mach-imx/Kconfig
> > +++ b/arch/arm/mach-imx/Kconfig
> > @@ -52,6 +52,8 @@ config IMX_HAB
> > 
> >  config CSF_SIZE
> >       hex "Maximum size for Command Sequence File (CSF) binary"
> > +     depends on IMX_HAB
> > +     default 0x2000 if ARCH_IMX8M
> >       default 0x2060
> >       help
> >         Define the maximum size for Command Sequence File (CSF)
> > binary
> > diff --git a/include/configs/imx8mm_beacon.h
> > b/include/configs/imx8mm_beacon.h
> > index 21102d3c14d2..ce3ba7492435 100644
> > --- a/include/configs/imx8mm_beacon.h
> > +++ b/include/configs/imx8mm_beacon.h
> > @@ -9,10 +9,6 @@
> >  #include <linux/sizes.h>
> >  #include <asm/arch/imx-regs.h>
> > 
> > -#ifdef CONFIG_SECURE_BOOT
> > -#define CONFIG_CSF_SIZE              SZ_8K
> > -#endif
> > -
> >  #define CONFIG_SPL_MAX_SIZE          (148 * 1024)
> >  #define CONFIG_SYS_MONITOR_LEN       SZ_512K
> >  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
> > diff --git a/include/configs/imx8mm_evk.h
> > b/include/configs/imx8mm_evk.h
> > index 901a1bed6dd1..382ba620ccf4 100644
> > --- a/include/configs/imx8mm_evk.h
> > +++ b/include/configs/imx8mm_evk.h
> > @@ -10,10 +10,6 @@
> >  #include <linux/stringify.h>
> >  #include <asm/arch/imx-regs.h>
> > 
> > -#ifdef CONFIG_SECURE_BOOT
> > -#define CONFIG_CSF_SIZE                      SZ_8K
> > -#endif
> > -
> >  #define CONFIG_SPL_MAX_SIZE          (148 * 1024)
> >  #define CONFIG_SYS_MONITOR_LEN               SZ_512K
> >  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
> > diff --git a/include/configs/imx8mn_evk.h
> > b/include/configs/imx8mn_evk.h
> > index a07440c73ba8..4350b5a62aff 100644
> > --- a/include/configs/imx8mn_evk.h
> > +++ b/include/configs/imx8mn_evk.h
> > @@ -10,10 +10,6 @@
> >  #include <linux/stringify.h>
> >  #include <asm/arch/imx-regs.h>
> > 
> > -#ifdef CONFIG_SECURE_BOOT
> > -#define CONFIG_CSF_SIZE                      SZ_8K
> > -#endif
> > -
> >  #define CONFIG_SPL_MAX_SIZE          (148 * 1024)
> >  #define CONFIG_SYS_MONITOR_LEN               SZ_512K
> >  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
> > diff --git a/include/configs/imx8mp_evk.h
> > b/include/configs/imx8mp_evk.h
> > index 7f38f21c09c5..9c13235982c6 100644
> > --- a/include/configs/imx8mp_evk.h
> > +++ b/include/configs/imx8mp_evk.h
> > @@ -10,10 +10,6 @@
> >  #include <linux/stringify.h>
> >  #include <asm/arch/imx-regs.h>
> > 
> > -#ifdef CONFIG_SECURE_BOOT
> > -#define CONFIG_CSF_SIZE                      0x2000 /* 8K region
> > */
> > -#endif
> > -
> >  #define CONFIG_SPL_MAX_SIZE          (152 * 1024)
> >  #define CONFIG_SYS_MONITOR_LEN               (512 * 1024)
> >  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
> > diff --git a/include/configs/verdin-imx8mm.h
> > b/include/configs/verdin-imx8mm.h
> > index ca528598f2f1..878c4996df42 100644
> > --- a/include/configs/verdin-imx8mm.h
> > +++ b/include/configs/verdin-imx8mm.h
> > @@ -9,10 +9,6 @@
> >  #include <asm/arch/imx-regs.h>
> >  #include <linux/sizes.h>
> > 
> > -#ifdef CONFIG_SECURE_BOOT
> > -#define CONFIG_CSF_SIZE                      SZ_8K
> > -#endif
> > -
> >  #define CONFIG_SPL_MAX_SIZE          (148 * 1024)
> >  #define CONFIG_SYS_MONITOR_LEN               SZ_512K
> >  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
> > 
> 
> Reviewed-by: Stefano Babic <sbabic at denx.de>
> 
> BR,
> Stefano
> 
Reviewed-by: Ye Li <ye.li at nxp.com>

Best regards,
Ye Li
> --
> =====================================================================
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
> =====================================================================