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 'zynq' of git://www.denx.de/git/u-boot-microblaze
[oweals/u-boot.git]
/
configs
/
zynq_zed_defconfig
diff --git
a/configs/zynq_zed_defconfig
b/configs/zynq_zed_defconfig
index 01fa7235f982780916d9e011a1422c7ee6ee5ea5..b2b4b99fad565f923dd72d37edbdcbec79778235 100644
(file)
--- a/
configs/zynq_zed_defconfig
+++ b/
configs/zynq_zed_defconfig
@@
-1,6
+1,6
@@
CONFIG_SPL=y
CONFIG_ARM=y
-CONFIG_ZYNQ=y
+CONFIG_
ARCH_
ZYNQ=y
CONFIG_TARGET_ZYNQ_ZED=y
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
@@
-8,4
+8,3
@@
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
-CONFIG_DM=y