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

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

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index df9cc48..f410763 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -10,7 +10,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 family */
-#define CONFIG_QE              1       /* Has QE */
 
 /*
  * System IO Config
@@ -238,15 +237,6 @@
 /*
  * Environment
  */
-#ifndef CONFIG_SYS_RAMBOOT
-       #define CONFIG_ENV_ADDR         \
-                       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
-       #define CONFIG_ENV_SECT_SIZE    0x20000
-       #define CONFIG_ENV_SIZE         0x2000
-#else
-       #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)
-       #define CONFIG_ENV_SIZE         0x2000
-#endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */