diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-10 10:12:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-10 10:12:25 -0400 |
| commit | f6af0d77e6b8b47ecb4546126a47684d84660d85 (patch) | |
| tree | ff7e06b938f7c65f055915edcf9ca5e0c56c1802 | |
| parent | aeabaff87fbe2f5bc4e2a4ef48ca4eaadeef0c56 (diff) | |
| download | u-boot-WIP/more-CONFIG-moves.tar.gz | |
arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HABWIP/more-CONFIG-moves
There are a few remaining places where we say CONFIG_SECURE_BOOT rather
than CONFIG_IMX HAB. Update these instances.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP i.MX U-Boot Team <uboot-imx@nxp.com>
Cc: Eddy Petrișor <eddy.petrisor@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Vladimir Oltean <olteanv@gmail.com>
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Note that we have one place left for CONFIG_SECURE_BOOT being in use but
I think that is shared with PowerPC so I don't think IMX_HAB is the
right name. But perhaps I'm wrong about it being used for PowerPC?
| -rw-r--r-- | arch/arm/mach-imx/spl_qspi.cfg | 2 | ||||
| -rw-r--r-- | board/ea/mx7ulp_com/imximage.cfg | 2 | ||||
| -rw-r--r-- | board/freescale/s32v234evb/s32v234evb.cfg | 2 | ||||
| -rw-r--r-- | board/novtech/meerkat96/imximage.cfg | 2 | ||||
| -rw-r--r-- | include/configs/ls1021atsn.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg index 88956e626f..1e39ae2f01 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 d298d17c1e..1b218996ae 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 0x2F020000 #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 7881512139..d7f7220063 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 3bd8cc55e5..86275b84d9 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 diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index e76e54e97f..efa708a239 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -60,9 +60,9 @@ #define CONFIG_SYS_FSL_PBL_RCW \ "board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg" -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_IMX_HAB #define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -#endif /* ifdef CONFIG_SECURE_BOOT */ +#endif /* ifdef CONFIG_IMX_HAB */ #define CONFIG_SPL_MAX_SIZE 0x1a000 #define CONFIG_SPL_STACK 0x1001d000 |