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

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

diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 1d1cfa0..a8c6f0b 100644 (file)
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -45,7 +45,6 @@
  */
 #define CONFIG_FEC_MXC
 #define CONFIG_FEC_MXC_PHYADDR         0x00
-#define CONFIG_MII
 
 /*
  * BOOTP options
@@ -86,24 +85,15 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
-#define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE + 0x00040000)
-#define CONFIG_ENV_SECT_SIZE           (128 * 1024)
-#define CONFIG_ENV_SIZE                        (128 * 1024)
-
 /*
  * CFI FLASH driver setup
  */
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE      /* ~10x faster */
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE
 
 #define CONFIG_SYS_MEMTEST_START       (PHYS_SDRAM + (512*1024))
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM + PHYS_SDRAM_SIZE)
 
-#define CONFIG_PREBOOT  ""
-
 
 /*
  * Size of malloc() pool