Merge branch 'master' of git://git.denx.de/u-boot-rockchip

[oweals/u-boot.git] / include / configs / M5475EVB.h

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 3b40cd00c83511e1d89b365c8204a18be10634cd..b51d69568a62076f941b89fa66ec1c37e0f9e758 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -21,16 +21,10 @@
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
 
 #undef CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
-/* Command line configuration */
-#undef CONFIG_CMD_DATE
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_SLTTMR
 
 #define CONFIG_FSLDMAFEC
@@ -71,11 +65,7 @@
 #ifdef CONFIG_CMD_USB
 #      define CONFIG_USB_OHCI_NEW
 
-#      ifndef CONFIG_CMD_PCI
-#              define CONFIG_CMD_PCI
-#      endif
 #      define CONFIG_PCI_OHCI
-#      define CONFIG_DOS_PARTITION
 
 #      undef CONFIG_SYS_USB_OHCI_BOARD_INIT
 #      undef CONFIG_SYS_USB_OHCI_CPU_INIT
@@ -236,7 +226,6 @@
  */
 #define CONFIG_ENV_OFFSET              0x40000
 #define CONFIG_ENV_SECT_SIZE   0x10000
-#define CONFIG_ENV_IS_IN_FLASH 1
 
 /*-----------------------------------------------------------------------
  * Cache Configuration