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 'master' of git://git.denx.de/u-boot-ubi
[oweals/u-boot.git]
/
configs
/
MPC8536DS_36BIT_defconfig
diff --git
a/configs/MPC8536DS_36BIT_defconfig
b/configs/MPC8536DS_36BIT_defconfig
index 4229aed3285c16b1cba0897ce043f854d61d0733..925f3fac4d91ec58f702075ff3ec5f73ba2207cd 100644
(file)
--- a/
configs/MPC8536DS_36BIT_defconfig
+++ b/
configs/MPC8536DS_36BIT_defconfig
@@
-8,6
+8,7
@@
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=10
# CONFIG_CONSOLE_MUX is not set
+# CONFIG_MISC_INIT_R is not set
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y