diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-18 18:36:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-18 18:36:06 +0300 |
| commit | 3c476d841daa491f87c8f07851038afbdf4d90a8 (patch) | |
| tree | 131891877d7b9b112ebc8c05ab88d53b9b18b702 /include/config_fsl_chain_trust.h | |
| parent | 9481f186d0bb06e492f62144cacdb5a8367e3cd2 (diff) | |
| parent | e0dfec863e2ca5088dd797a5b6853d4c0df9002c (diff) | |
| download | u-boot-3c476d841daa491f87c8f07851038afbdf4d90a8.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include/config_fsl_chain_trust.h')
| -rw-r--r-- | include/config_fsl_chain_trust.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index eb45e9851f..40d323e004 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -81,17 +81,18 @@ "setenv bs_size " __stringify(CONFIG_BS_SIZE)";" /* For secure boot flow, default environment used will be used */ -#if defined(CONFIG_SYS_RAMBOOT) -#if defined(CONFIG_RAMBOOT_NAND) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_NAND_BOOT) || \ + defined(CONFIG_SD_BOOT) +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_NAND_BOOT) #define CONFIG_BS_COPY_CMD \ "nand read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "nand read $bs_ram $bs_device $bs_size ;" -#endif /* CONFIG_RAMBOOT_NAND */ #elif defined(CONFIG_SD_BOOT) #define CONFIG_BS_COPY_CMD \ "mmc read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "mmc read $bs_ram $bs_device $bs_size ;" -#else /* CONFIG_SD_BOOT */ +#endif +#else #define CONFIG_BS_COPY_CMD \ "cp.b $bs_hdr_device $bs_hdr_ram $bs_hdr_size ;" \ "cp.b $bs_device $bs_ram $bs_size ;" |