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

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

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index cc7aeb821c0ad27f6e1843816bc43baad38fd4d6..3385dcb5b7fb2c91c3463c4f45a4050400485c7d 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -16,16 +16,10 @@
  */
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
-#define CONFIG_BAUDRATE                        115200
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
-/* Command line configuration */
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_MII               1
@@ -61,7 +55,6 @@
 #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
@@ -85,17 +78,7 @@
        ""
 
 #define CONFIG_PRAM            512     /* 512 KB */
-#define CONFIG_SYS_LONGHELP    /* undef to save memory */
-
-#ifdef CONFIG_CMD_KGDB
-#      define CONFIG_SYS_CBSIZE        1024    /* Console I/O Buffer Size */
-#else
-#      define CONFIG_SYS_CBSIZE        256     /* Console I/O Buffer Size */
-#endif
 
-#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)        /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS     16              /* max number of cmd args */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE       /* Boot Arg Buf Sz */
 #define CONFIG_SYS_LOAD_ADDR   0x40010000
 
 #define CONFIG_SYS_CLK         166666666       /* CPU Core Clock */
@@ -166,11 +149,10 @@
 #define CONFIG_ENV_OFFSET              0x2000
 #define CONFIG_ENV_SIZE                        0x1000
 #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*);
+       . = DEFINED(env_offset) ? env_offset : .; \
+       env/embedded.o(.text*);
 
 /* Cache Configuration */
 #define CONFIG_SYS_CACHELINE_SIZE      16