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 a3834f062974dd3f88f0661ede2503e9e3852e2c..b51d69568a62076f941b89fa66ec1c37e0f9e758 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -19,20 +19,12 @@
  * (easy to change)
  */
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 #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
@@ -73,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
@@ -96,8 +84,6 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI             1
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8
@@ -240,7 +226,6 @@
  */
 #define CONFIG_ENV_OFFSET              0x40000
 #define CONFIG_ENV_SECT_SIZE   0x10000
-#define CONFIG_ENV_IS_IN_FLASH 1
 
 /*-----------------------------------------------------------------------
  * Cache Configuration