projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
include
/
configs
/
ls1012ardb.h
diff --git
a/include/configs/ls1012ardb.h
b/include/configs/ls1012ardb.h
index 17554ea955d0a8cbccc3de1efdd80dc3168e5ad6..f149a604cfcc3eb76793339d21ebf274fd38ba48 100644
(file)
--- a/
include/configs/ls1012ardb.h
+++ b/
include/configs/ls1012ardb.h
@@
-112,8
+112,14
@@
"bootm $load_addr#$board\0"
#undef CONFIG_BOOTCOMMAND
"bootm $load_addr#$board\0"
#undef CONFIG_BOOTCOMMAND
+#ifdef CONFIG_TFABOOT
+#undef QSPI_NOR_BOOTCOMMAND
+#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
+ "env exists secureboot && esbc_halt;"
+#else
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
"env exists secureboot && esbc_halt;"
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
"env exists secureboot && esbc_halt;"
+#endif
#include <asm/fsl_secure_boot.h>
#include <asm/fsl_secure_boot.h>