projects
/
platform
/
kernel
/
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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
configs
/
MPC8536DS_36BIT_defconfig
diff --git
a/configs/MPC8536DS_36BIT_defconfig
b/configs/MPC8536DS_36BIT_defconfig
index
70ffda7
..
a66baa0
100644
(file)
--- a/
configs/MPC8536DS_36BIT_defconfig
+++ b/
configs/MPC8536DS_36BIT_defconfig
@@
-1,5
+1,4
@@
CONFIG_PPC=y
-CONFIG_VIDEO=y
CONFIG_MPC85xx=y
# CONFIG_CMD_ERRATA is not set
CONFIG_TARGET_MPC8536DS=y
@@
-35,4
+34,5
@@
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_VIDEO=y
CONFIG_OF_LIBFDT=y