Merge git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / include / configs / MPC837XEMDS.h

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 1a65c25c4809158f596d65644152e87141c0015a..badb233f7e7a891dc77edf4548e838b589083fe9 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -278,7 +278,6 @@
 /*
  * NAND Flash on the Local Bus
  */
-#define CONFIG_CMD_NAND                1
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_NAND_FSL_ELBC   1
 
@@ -466,10 +465,6 @@ extern int board_pci_host_broken(void);
  * Command line configuration.
  */
 
-#if defined(CONFIG_PCI)
-    #define CONFIG_CMD_PCI
-#endif
-
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support   */
 
@@ -641,8 +636,6 @@ extern int board_pci_host_broken(void);
 
 #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
 
-#undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
-
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "consoledev=ttyS0\0"                                            \