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

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

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 9390464b10d214ab375be8bf585adc4d93d04193..b426c18b3bf784faa0d10287e95de2c1304caae6 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -22,17 +22,6 @@
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
-#undef CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
 #define CONFIG_MCFFEC
@@ -70,16 +59,13 @@
 #define CONFIG_SYS_FSL_I2C_OFFSET      0x58000
 #define CONFIG_SYS_IMMR                        CONFIG_SYS_MBAR
 
-#define CONFIG_BOOTDELAY               1       /* autoboot after 5 seconds */
 #define CONFIG_UDP_CHECKSUM
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      define CONFIG_IPADDR    192.162.1.2
 #      define CONFIG_NETMASK   255.255.255.0
 #      define CONFIG_SERVERIP  192.162.1.1
 #      define CONFIG_GATEWAYIP 192.162.1.1
-#      define CONFIG_OVERWRITE_ETHADDR_ONCE
 #endif                         /* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME                M5208EVBe
@@ -96,7 +82,6 @@
        ""
 
 #define CONFIG_PRAM            512     /* 512 KB */
-#define CONFIG_SYS_PROMPT      "-> "
 #define CONFIG_SYS_LONGHELP    /* undef to save memory */
 
 #ifdef CONFIG_CMD_KGDB
@@ -180,6 +165,10 @@
 #define CONFIG_ENV_SECT_SIZE           0x2000
 #define CONFIG_ENV_IS_IN_FLASH         1
 
+#define LDS_BOARD_TEXT \
+        . = DEFINED(env_offset) ? env_offset : .; \
+        common/env_embedded.o (.text*);
+
 /* Cache Configuration */
 #define CONFIG_SYS_CACHELINE_SIZE      16