Re: [PATCHv2 24/31] arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB
On Tue, Jun 16, 2020 at 07:06:24PM -0400, Tom Rini wrote: > There are a few remaining places where we say CONFIG_SECURE_BOOT rather > than CONFIG_IMX HAB. Update these instances. > > Cc: Stefano Babic > Cc: Fabio Estevam > Cc: NXP i.MX U-Boot Team > Cc: Eddy Petrișor > Cc: Shawn Guo > Cc: Priyanka Jain > Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") > Signed-off-by: Tom Rini > Reviewed-by: Stefano Babic Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [PATCHv2 24/31] arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB
On 17.06.20 01:06, Tom Rini wrote: > There are a few remaining places where we say CONFIG_SECURE_BOOT rather > than CONFIG_IMX HAB. Update these instances. > > Cc: Stefano Babic > Cc: Fabio Estevam > Cc: NXP i.MX U-Boot Team > Cc: Eddy Petrișor > Cc: Shawn Guo > Cc: Priyanka Jain > Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") > Signed-off-by: Tom Rini > --- > Changes in v2: > - Drop layerscape portion to its own patch > --- > arch/arm/mach-imx/spl_qspi.cfg| 2 +- > board/ea/mx7ulp_com/imximage.cfg | 2 +- > board/freescale/s32v234evb/s32v234evb.cfg | 2 +- > board/novtech/meerkat96/imximage.cfg | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg > index 88956e626ffd..1e39ae2f01f7 100644 > --- a/arch/arm/mach-imx/spl_qspi.cfg > +++ b/arch/arm/mach-imx/spl_qspi.cfg > @@ -12,6 +12,6 @@ BOOT_FROM qspi > /* > * Secure boot support > */ > -#ifdef CONFIG_SECURE_BOOT > +#ifdef CONFIG_IMX_HAB > CSF CONFIG_CSF_SIZE > #endif > diff --git a/board/ea/mx7ulp_com/imximage.cfg > b/board/ea/mx7ulp_com/imximage.cfg > index d298d17c1e92..1b218996aea9 100644 > --- a/board/ea/mx7ulp_com/imximage.cfg > +++ b/board/ea/mx7ulp_com/imximage.cfg > @@ -28,7 +28,7 @@ BOOT_FROM sd > PLUGIN board/freescale/mx7ulp_evk/plugin.bin 0x2F02 > #else > > -#ifdef CONFIG_SECURE_BOOT > +#ifdef CONFIG_IMX_HAB > CSF CONFIG_CSF_SIZE > #endif > /* > diff --git a/board/freescale/s32v234evb/s32v234evb.cfg > b/board/freescale/s32v234evb/s32v234evb.cfg > index 7881512139d0..d7f722006312 100644 > --- a/board/freescale/s32v234evb/s32v234evb.cfg > +++ b/board/freescale/s32v234evb/s32v234evb.cfg > @@ -23,6 +23,6 @@ BOOT_FROM sd > */ > > > -#ifdef CONFIG_SECURE_BOOT > +#ifdef CONFIG_IMX_HAB > SECURE_BOOT > #endif > diff --git a/board/novtech/meerkat96/imximage.cfg > b/board/novtech/meerkat96/imximage.cfg > index 3bd8cc55e53c..86275b84d9c8 100644 > --- a/board/novtech/meerkat96/imximage.cfg > +++ b/board/novtech/meerkat96/imximage.cfg > @@ -25,7 +25,7 @@ BOOT_FROM sd > /* > * Secure boot support > */ > -#ifdef CONFIG_SECURE_BOOT > +#ifdef CONFIG_IMX_HAB > CSF CONFIG_CSF_SIZE > #endif > > Reviewed-by: Stefano Babic BR, Stefano -- = 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: sba...@denx.de =
[PATCHv2 24/31] arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB
There are a few remaining places where we say CONFIG_SECURE_BOOT rather than CONFIG_IMX HAB. Update these instances. Cc: Stefano Babic Cc: Fabio Estevam Cc: NXP i.MX U-Boot Team Cc: Eddy Petrișor Cc: Shawn Guo Cc: Priyanka Jain Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB") Signed-off-by: Tom Rini --- Changes in v2: - Drop layerscape portion to its own patch --- arch/arm/mach-imx/spl_qspi.cfg| 2 +- board/ea/mx7ulp_com/imximage.cfg | 2 +- board/freescale/s32v234evb/s32v234evb.cfg | 2 +- board/novtech/meerkat96/imximage.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg index 88956e626ffd..1e39ae2f01f7 100644 --- a/arch/arm/mach-imx/spl_qspi.cfg +++ b/arch/arm/mach-imx/spl_qspi.cfg @@ -12,6 +12,6 @@ BOOT_FROM qspi /* * Secure boot support */ -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE #endif diff --git a/board/ea/mx7ulp_com/imximage.cfg b/board/ea/mx7ulp_com/imximage.cfg index d298d17c1e92..1b218996aea9 100644 --- a/board/ea/mx7ulp_com/imximage.cfg +++ b/board/ea/mx7ulp_com/imximage.cfg @@ -28,7 +28,7 @@ BOOT_FROM sd PLUGIN board/freescale/mx7ulp_evk/plugin.bin 0x2F02 #else -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE #endif /* diff --git a/board/freescale/s32v234evb/s32v234evb.cfg b/board/freescale/s32v234evb/s32v234evb.cfg index 7881512139d0..d7f722006312 100644 --- a/board/freescale/s32v234evb/s32v234evb.cfg +++ b/board/freescale/s32v234evb/s32v234evb.cfg @@ -23,6 +23,6 @@ BOOT_FROM sd */ -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB SECURE_BOOT #endif diff --git a/board/novtech/meerkat96/imximage.cfg b/board/novtech/meerkat96/imximage.cfg index 3bd8cc55e53c..86275b84d9c8 100644 --- a/board/novtech/meerkat96/imximage.cfg +++ b/board/novtech/meerkat96/imximage.cfg @@ -25,7 +25,7 @@ BOOT_FROM sd /* * Secure boot support */ -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE #endif -- 2.17.1