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

[platform/kernel/u-boot.git] / include / configs / M52277EVB.h

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 126f889..21a0309 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -35,12 +35,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/* Command line configuration */
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_REGINFO
-#undef CONFIG_CMD_BMP
-
 #define CONFIG_HOSTNAME                        M52277EVB
 #define CONFIG_SYS_UBOOT_END           0x3FFFF
 #define        CONFIG_SYS_LOAD_ADDR2           0x40010007
@@ -90,7 +84,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
 #define CONFIG_SYS_USB_EHCI_REGS_BASE  0xFC0B0000
 #define CONFIG_SYS_USB_EHCI_CPU_INIT
 #endif
@@ -203,10 +196,7 @@
  * crc error warning if there is no correct environment on the flash.
  */
 #ifdef CONFIG_CF_SBF
-#      define CONFIG_ENV_IS_IN_SPI_FLASH
 #      define CONFIG_ENV_SPI_CS        2
-#else
-#      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 #define CONFIG_ENV_OVERWRITE           1