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

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

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 370e381..5bd0d52 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -462,7 +462,6 @@
        #define CONFIG_ENV_SECT_SIZE    0x10000 /* 64K (one sector) for env */
        #define CONFIG_ENV_SIZE         0x4000
 #else
        #define CONFIG_ENV_SECT_SIZE    0x10000 /* 64K (one sector) for env */
        #define CONFIG_ENV_SIZE         0x4000
 #else

-       #define CONFIG_SYS_NO_FLASH     1       /* Flash is not usable now */

        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE-0x1000)
        #define CONFIG_ENV_SIZE         0x2000
        #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE-0x1000)
        #define CONFIG_ENV_SIZE         0x2000


@@ -669,7 +668,6 @@
 
                                /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                800000
 
                                /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                800000

-#define CONFIG_BAUDRATE                115200

 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "netdev=" CONFIG_NETDEV "\0"                            \
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "netdev=" CONFIG_NETDEV "\0"                            \