diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
| commit | ec7483e34ea932fb68267dc0b1de30be51f271c9 (patch) | |
| tree | 6120e2d0923962ec16cc757a22454bc942c90af4 /board | |
| parent | 07d778382200a05a8b86cc135f79ec48e386f25a (diff) | |
| parent | ec85721c8b94f9eb6807ebb15a223e4ec49a092a (diff) | |
| download | u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.tar.gz u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.tar.xz u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.zip | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1046aqds.h
include/configs/ls1046ardb.h
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/common/fsl_chain_of_trust.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 2cd4fba13f..dfe5d204d4 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -81,7 +81,13 @@ int fsl_setenv_chain_of_trust(void) * bootcmd = CONFIG_CHAIN_BOOT_CMD (Validate and execute Boot script) */ setenv("bootdelay", "0"); + +#ifdef CONFIG_ARM + setenv("secureboot", "y"); +#else setenv("bootcmd", CONFIG_CHAIN_BOOT_CMD); +#endif + return 0; } #endif |