nxp: Finish switch to CONFIG_NXP_ESBC

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@gmail.com>
Fixes: 5536c3c9d0 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name")
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2020-06-16 19:06:25 -04:00
parent 0567099bea
commit bba4c7f952
2 changed files with 3 additions and 3 deletions

View file

@ -887,7 +887,7 @@ ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
ifeq ($(CONFIG_SPL_FSL_PBL),y) ifeq ($(CONFIG_SPL_FSL_PBL),y)
ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin
else else
ifneq ($(CONFIG_SECURE_BOOT), y) ifneq ($(CONFIG_NXP_ESBC), y)
# For Secure Boot The Image needs to be signed and Header must also # For Secure Boot The Image needs to be signed and Header must also
# be included. So The image has to be built explicitly # be included. So The image has to be built explicitly
ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl

View file

@ -60,9 +60,9 @@
#define CONFIG_SYS_FSL_PBL_RCW \ #define CONFIG_SYS_FSL_PBL_RCW \
"board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg" "board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg"
#ifdef CONFIG_SECURE_BOOT #ifdef CONFIG_NXP_ESBC
#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) #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_MAX_SIZE 0x1a000
#define CONFIG_SPL_STACK 0x1001d000 #define CONFIG_SPL_STACK 0x1001d000