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/ls1046ardb/ls1046ardb.c | |
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/ls1046ardb/ls1046ardb.c')
-rw-r--r-- | board/freescale/ls1046ardb/ls1046ardb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 0a73fe859d..cc6bd883c3 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -69,7 +69,7 @@ int board_init(void) { struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; -#ifdef CONFIG_SECURE_BOOT +#ifdef CONFIG_NXP_ESBC /* * In case of Secure Boot, the IBR configures the SMMU * to allow only Secure transactions. |