Merge git://git.denx.de/u-boot-tegra

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

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 195595fb8406e53256587c3d54d0d06acc586a08..339a03c7b10559da5ad3a63c0d74d78a9f1119ab 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -27,7 +27,6 @@
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                115200
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
@@ -35,16 +34,14 @@
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_ENV_OFFSET              0x4000
 #define CONFIG_ENV_SECT_SIZE   0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
 #else
 #define CONFIG_ENV_ADDR                0xffe04000
 #define CONFIG_ENV_SECT_SIZE   0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
 #define LDS_BOARD_TEXT \
-        . = DEFINED(env_offset) ? env_offset : .; \
-        common/env_embedded.o (.text);
+       . = DEFINED(env_offset) ? env_offset : .; \
+       env/embedded.o(.text);
 
 /*
  * BOOTP options
@@ -55,12 +52,6 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Available command configuration */
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_DHCP
-
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
@@ -110,7 +101,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x800000
 
-#define CONFIG_BOOTDELAY       5
 #define CONFIG_BOOTCOMMAND     "bootm ffe40000"
 #define CONFIG_SYS_MEMTEST_START       0x400
 #define CONFIG_SYS_MEMTEST_END         0x380000