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

[oweals/u-boot.git] / include / configs / x86-common.h

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 54214f99e9a6b83a42a393e4ba1ce32b02b7f389..016b797a534ecca7822f17705aa8b9aa8dba5e02 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -61,8 +61,6 @@
  */
 #define CONFIG_SYS_CBSIZE                      512
 
-#define CONFIG_SYS_MEMTEST_START               0x00100000
-#define CONFIG_SYS_MEMTEST_END                 0x01000000
 #define CONFIG_SYS_LOAD_ADDR                   0x20000000
 
 /*-----------------------------------------------------------------------
@@ -79,7 +77,6 @@
 /*-----------------------------------------------------------------------
  * Environment configuration
  */
-#define CONFIG_ENV_SIZE                        0x01000
 
 /*-----------------------------------------------------------------------
  * PCI configuration