diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-11 14:19:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-11 14:19:04 -0500 |
| commit | 0b73ef0c02313e651af4b0a8e206c7c4a198e7f8 (patch) | |
| tree | 6e84ad48ccdb4b02b3a272ec30e7967426c15e13 /board/freescale/common | |
| parent | a4b7485e2f311b1319b1b9cd59f5666536e24a28 (diff) | |
| parent | bef18454044e62800ece687b8d50ddd853117660 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Rename CONFIG_SECURE_BOOT to CONFIG_NXP_ESBC.
- Few bug fixes and updates related to SPI, hwconfig, ethernet,
fsl-layerscape, pci, icid, PSCI
Diffstat (limited to 'board/freescale/common')
| -rw-r--r-- | board/freescale/common/Kconfig | 2 | ||||
| -rw-r--r-- | board/freescale/common/Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/common/p_corenet/tlb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index 8b89c10aba..1b1fd69cb2 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -1,5 +1,5 @@ config CHAIN_OF_TRUST - depends on !FIT_SIGNATURE && SECURE_BOOT + depends on !FIT_SIGNATURE && NXP_ESBC imply CMD_BLOB imply CMD_HASH if ARM select FSL_CAAM diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index a9d61a8bcf..b0e109f0b8 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -75,7 +75,7 @@ obj-$(CONFIG_TARGET_P5040DS) += p_corenet/ obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ns_access.o -ifdef CONFIG_SECURE_BOOT +ifdef CONFIG_NXP_ESBC obj-$(CONFIG_CMD_ESBC_VALIDATE) += fsl_validate.o cmd_esbc_validate.o endif obj-$(CONFIG_CHAIN_OF_TRUST) += fsl_chain_of_trust.o diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c index 3d9459b133..c0ab1a5fd1 100644 --- a/board/freescale/common/p_corenet/tlb.c +++ b/board/freescale/common/p_corenet/tlb.c @@ -43,7 +43,7 @@ struct fsl_e_tlb_entry tlb_table[] = { /* *I*** - Covers boot page */ #if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR) -#if !defined(CONFIG_SECURE_BOOT) +#if !defined(CONFIG_NXP_ESBC) /* * *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the * SRAM is at 0xfff00000, it covered the 0xfffff000. |