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 branch '2019-10-04-master-imports'
[oweals/u-boot.git]
/
configs
/
colibri_imx7_defconfig
diff --git
a/configs/colibri_imx7_defconfig
b/configs/colibri_imx7_defconfig
index c1bee450f6ec2d6eeddd2321a29eda9199c4ef53..a9149dd15c76cfe21aa925c3b4e8c4d562c443b6 100644
(file)
--- a/
configs/colibri_imx7_defconfig
+++ b/
configs/colibri_imx7_defconfig
@@
-19,6
+19,8
@@
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOUNCE_BUFFER=y
CONFIG_SYS_PROMPT="Colibri iMX7 # "
# CONFIG_CMD_BOOTD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
CONFIG_CMD_ASKENV=y