summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-06-11 17:09:25 -0400
committerTom Rini <trini@konsulko.com>2020-06-16 14:02:32 -0400
commit6fd4834d5f3974c28c4014d1f116197659118eab (patch)
tree4426443898d6903c31f56e6dc80ec58388a438d9
parent6eee1ba67e90aaf8cc870232b44360d223d65f2b (diff)
downloadu-boot-6fd4834d5f3974c28c4014d1f116197659118eab.tar.gz
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: 5536c3c9d0d1 ("freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name") Signed-off-by: Tom Rini <trini@konsulko.com> --- Changes in v2: - New patch
-rw-r--r--Makefile2
-rw-r--r--include/configs/ls1021atsn.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 149f839948..035b2cc668 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 e76e54e97f..72aed8fed6 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