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-fdt
[platform/kernel/u-boot.git]
/
include
/
configs
/
atstk1006.h
diff --git
a/include/configs/atstk1006.h
b/include/configs/atstk1006.h
index
8cfa312
..
f93118e
100644
(file)
--- a/
include/configs/atstk1006.h
+++ b/
include/configs/atstk1006.h
@@
-142,9
+142,9
@@
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MMC
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MMC
-#undef CONFIG_CMD_AUTOSCRIPT
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_SETGETDCR
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_SETGETDCR
+#undef CONFIG_CMD_SOURCE
#undef CONFIG_CMD_XIMG
#define CONFIG_ATMEL_USART 1
#undef CONFIG_CMD_XIMG
#define CONFIG_ATMEL_USART 1