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

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

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 934c9d8903660318fccb6011f6a0d0f4695658a0..56af0e3a5fb1db4734ca3287f06231c580735af2 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -25,10 +25,6 @@
 #undef CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
-/* Command line configuration */
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_SLTTMR
 
 #define CONFIG_FSLDMAFEC
@@ -68,9 +64,6 @@
 
 #ifdef CONFIG_CMD_USB
 #      define CONFIG_USB_OHCI_NEW
-#      ifndef CONFIG_CMD_PCI
-#              define CONFIG_CMD_PCI
-#      endif
 /*#    define CONFIG_PCI_OHCI*/
 #      define CONFIG_SYS_USB_OHCI_REGS_BASE            0x80041000
 #      define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS       15
@@ -220,7 +213,6 @@
  */
 #define CONFIG_ENV_OFFSET              0x40000
 #define CONFIG_ENV_SECT_SIZE   0x10000
-#define CONFIG_ENV_IS_IN_FLASH 1
 
 /*-----------------------------------------------------------------------
  * Cache Configuration