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

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

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 8131ea0ee1f0b4b83b3a58742d8ca3253dbe2cc9..cc703aac19a5b94d45700cc7d612793e90d8c6fb 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -21,7 +21,6 @@
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
 
 #undef CONFIG_MONITOR_IS_IN_RAM        /* define if monitor is started from a pre-loader */
 
@@ -30,7 +29,6 @@
  */
 #define CONFIG_ENV_ADDR                0xffe04000
 #define CONFIG_ENV_SIZE                0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
 
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
@@ -70,7 +68,6 @@
 #      endif                   /* CONFIG_SYS_DISCOVER_PHY */
 #endif
 
-#define CONFIG_BOOTDELAY       5
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_IPADDR    192.162.1.2
 #      define CONFIG_NETMASK   255.255.255.0