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://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
config_uncmd_spl.h
diff --git
a/include/config_uncmd_spl.h
b/include/config_uncmd_spl.h
index
9f0fe44
..
3b198ae
100644
(file)
--- a/
include/config_uncmd_spl.h
+++ b/
include/config_uncmd_spl.h
@@
-20,7
+20,6
@@
#undef CONFIG_CMD_SNTP
#undef CONFIG_CMD_TFTPPUT
#undef CONFIG_CMD_TFTPSRV
#undef CONFIG_CMD_SNTP
#undef CONFIG_CMD_TFTPPUT
#undef CONFIG_CMD_TFTPSRV
-#undef CONFIG_OF_CONTROL
#ifndef CONFIG_SPL_DM
#undef CONFIG_DM_SERIAL
#ifndef CONFIG_SPL_DM
#undef CONFIG_DM_SERIAL
@@
-29,5
+28,8
@@
#undef CONFIG_DM_SPI
#endif
#undef CONFIG_DM_SPI
#endif
+#undef CONFIG_DM_WARN
+#undef CONFIG_DM_STDIO
+
#endif /* CONFIG_SPL_BUILD */
#endif /* __CONFIG_UNCMD_SPL_H__ */
#endif /* CONFIG_SPL_BUILD */
#endif /* __CONFIG_UNCMD_SPL_H__ */