summaryrefslogtreecommitdiff
path: root/include/configs/DK1S10.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-11-13 08:16:40 +0100
committerStefan Roese <sr@denx.de>2007-11-13 08:16:40 +0100
commit5c568d6a7f950b9e7e32a63a5893f979b8789b4d (patch)
tree44ed0fdc0548facecfa35e8d6eedf0616c3ca269 /include/configs/DK1S10.h
parent49801028715cd8bc22863cdfc0ee7919b7a6af4b (diff)
parent992742a5b09d9040adbd156fb90756af66ade310 (diff)
downloadu-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.zip
u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.tar.gz
u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/DK1S10.h')
-rw-r--r--include/configs/DK1S10.h51
1 files changed, 19 insertions, 32 deletions
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index 0032fd3..bd36071 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -466,38 +466,25 @@
/*
* Command line configuration.
*/
-#include <config_cmd_all.h>
-
-#undef CONFIG_CMD_ASKENV
-#undef COND_CMD_BEDBUG
-#undef COND_CMD_BMP
-#undef COND_CMD_BSP
-#undef COND_CMD_CACHE
-#undef COND_CMD_DATE
-#undef COND_CMD_DOC
-#undef COND_CMD_DTT
-#undef COND_CMD_EEPROM
-#undef COND_CMD_ELF
-#undef COND_CMD_FAT
-#undef COND_CMD_FDC
-#undef COND_CMD_FDOS
-#undef COND_CMD_HWFLOW
-#undef COND_CMD_IDE
-#undef COND_CMD_I2C
-#undef COND_CMD_JFFS2
-#undef COND_CMD_KGDB
-#undef COND_CMD_NAND
-#undef COND_CMD_NFS
-#undef COND_CMD_MMC
-#undef COND_CMD_MII
-#undef COND_CMD_PCI
-#undef COND_CMD_PCMCIA
-#undef COND_CMD_SCSI
-#undef COND_CMD_SPI
-#undef COND_CMD_VFD
-#undef COND_CMD_USB
-#undef COND_CMD_XIMG
-
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_CDP
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_DISPLAY
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_PORTIO
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_REISER
+#define CONFIG_CMD_SAVES
+#define CONFIG_CMD_SDRAM
+#define CONFIG_CMD_SNTP
+
+#undef CONFIG_CMD_NFS
+#undef CONFIG_CMD_XIMG
/*------------------------------------------------------------------------
* KGDB