| Message ID | 20200616230631.29189-25-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | bba4c7f9523d50998c186c468427fb710197b209 |
| Headers | show |
| Series | [PATCHv2,01/31] Convert CONFIG_AM335X_LCD to Kconfig | expand |
On Tue, Jun 16, 2020 at 07:06:25PM -0400, Tom Rini wrote: > There are two remaining users of the CONFIG_SECURE_BOOT symbol that have > not been migrated to another symbol. In this case, they should be using > CONFIG_NXP_ESBC as their guard. > > Cc: Vladimir Oltean <olteanv at gmail.com> > Fixes: 5536c3c9d0d1 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name") > Signed-off-by: Tom Rini <trini at konsulko.com> Applied to u-boot/next, thanks!
diff --git a/Makefile b/Makefile index 149f83994814..035b2cc6685a 100644 --- a/Makefile +++ b/Makefile @@ -887,7 +887,7 @@ ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin ifeq ($(CONFIG_SPL_FSL_PBL),y) ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin else -ifneq ($(CONFIG_SECURE_BOOT), y) +ifneq ($(CONFIG_NXP_ESBC), y) # For Secure Boot The Image needs to be signed and Header must also # be included. So The image has to be built explicitly ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index e76e54e97fc9..72aed8fed61c 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_NXP_ESBC #define CONFIG_U_BOOT_HDR_SIZE (16 << 10) -#endif /* ifdef CONFIG_SECURE_BOOT */ +#endif /* ifdef CONFIG_NXP_ESBC */ #define CONFIG_SPL_MAX_SIZE 0x1a000 #define CONFIG_SPL_STACK 0x1001d000
There are two remaining users of the CONFIG_SECURE_BOOT symbol that have not been migrated to another symbol. In this case, they should be using CONFIG_NXP_ESBC as their guard. Cc: Vladimir Oltean <olteanv at gmail.com> Fixes: 5536c3c9d0d1 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name") Signed-off-by: Tom Rini <trini at konsulko.com> --- Changes in v2: - New patch --- Makefile | 2 +- include/configs/ls1021atsn.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)