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 git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
configs
/
MigoR_defconfig
diff --git
a/configs/MigoR_defconfig
b/configs/MigoR_defconfig
index f09794e13c011683aa5f5c7bb3912d44f5bdbd2b..b8e2da2678e36f139045dd3931f1b9d9c5b36a8f 100644
(file)
--- a/
configs/MigoR_defconfig
+++ b/
configs/MigoR_defconfig
@@
-1,5
+1,6
@@
CONFIG_SH=y
CONFIG_TARGET_MIGOR=y
CONFIG_SH=y
CONFIG_TARGET_MIGOR=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
# CONFIG_CMD_BDI is not set
CONFIG_BOOTDELAY=3
CONFIG_VERSION_VARIABLE=y
# CONFIG_CMD_BDI is not set
@@
-19,4
+20,5
@@
CONFIG_VERSION_VARIABLE=y
CONFIG_CMD_PING=y
# CONFIG_CMD_MISC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_CMD_PING=y
# CONFIG_CMD_MISC is not set
CONFIG_MTD_NOR_FLASH=y
+CONFIG_SCIF_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_USE_PRIVATE_LIBGCC=y