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

[platform/kernel/u-boot.git] / include / configs / cobra5272.h

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 4644369..67a143f 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -7,7 +7,7 @@
  */
 
 /* ---
- * Version: U-boot 1.0.0 - initial release for Sentec COBRA5272 board
+ * Version: U-Boot 1.0.0 - initial release for Sentec COBRA5272 board
  * Date: 2004-03-29
  * Author: Florian Schlote
  *
@@ -25,16 +25,6 @@
 #define _CONFIG_COBRA5272_H
 
 /* ---
- * Define processor
- * possible values for Sentec board: only Coldfire M5272 processor supported
- * (please do not change)
- * ---
- */
-
-#define CONFIG_MCF52x2                 /* define processor family */
-#define CONFIG_M5272                   /* define processor type */
-
-/* ---
  * Defines processor clock - important for correct timings concerning serial
  * interface etc.
  * ---
@@ -114,6 +104,9 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 #endif
 
+#define LDS_BOARD_TEXT \
+        . = DEFINED(env_offset) ? env_offset : .; \
+        common/env_embedded.o (.text);
 
 /*
  * BOOTP options
@@ -127,12 +120,8 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
 #undef CONFIG_CMD_MII
 
 #ifdef CONFIG_MCFFEC
@@ -184,14 +173,11 @@ considered during boot */
 
 /* User network settings */
 
-#define CONFIG_ETHADDR 00:00:00:00:00:09       /* default ethernet MAC addr. */
 #define CONFIG_IPADDR 192.168.100.2            /* default board IP address */
 #define CONFIG_SERVERIP 192.168.100.1  /* default tftp server IP address */
 
 #endif
 
-#define CONFIG_SYS_PROMPT              "COBRA > "      /* Layout of u-boot prompt*/
-
 #define CONFIG_SYS_LOAD_ADDR           0x20000         /*Defines default RAM address
 from which user programs will be started */