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

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

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 20684dc6f3d3bc5ab47f90c9aa218433ba2ce74d..866049febf2c533514eae01254b7707731063f51 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -57,9 +57,6 @@
 
 #define CONFIG_SYS_INIT_DBCR DBCR_IDM          /* Enable Debug Exceptions */
 
-#define CONFIG_SYS_MEMTEST_START       0x00200000      /* memtest region */
-#define CONFIG_SYS_MEMTEST_END         0x00400000
-
 #define CONFIG_SYS_CCSRBAR             0xe0000000
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
 
@@ -288,8 +285,6 @@
   #define FETH3_RST            0x80
 #endif                                 /* CONFIG_ETHER_INDEX */
 
-#define CONFIG_BITBANGMII              /* bit-bang MII PHY management */
-
 /*
  * GPIO pins used for bit-banged MII communications
  */