net: fec_mxc: move CONFIG_FEC_MXC_PHYADDR from Kconfig to include/configs/*.h

[karo-tx-uboot.git] / include / configs / zipitz2.h

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index f9ccca75d611710941072e434984a5f1d24fcac3..0199190eb87d73a88024553fe6a03552fb300654 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -62,12 +62,7 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
 #define        CONFIG_CMD_ENV
-#undef CONFIG_CMD_IMLS
 #define        CONFIG_CMD_MMC
 #define        CONFIG_CMD_SPI
 
@@ -99,7 +94,6 @@
 #define        CONFIG_VIDEO_BMP_GZIP
 #define        CONFIG_VIDEO_BMP_RLE8
 #define        CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  (2 << 20)
-#undef SPI_INIT
 
 #define        SPI_DELAY       udelay(10)
 #define        SPI_SDA(val)    zipitz2_spi_sda(val)
@@ -125,9 +119,6 @@ unsigned char zipitz2_spi_read(void);
 #define        CONFIG_SYS_HUSH_PARSER          1
 
 #define        CONFIG_SYS_LONGHELP                             /* undef to save memory */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT               "$ "            /* Monitor Command Prompt */
-#endif
 #define        CONFIG_SYS_CBSIZE               256             /* Console I/O Buffer Size */
 #define        CONFIG_SYS_PBSIZE               (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)        /* Print Buffer Size */
 #define        CONFIG_SYS_MAXARGS              16              /* max number of command args */
@@ -137,8 +128,6 @@ unsigned char zipitz2_spi_read(void);
 /*
  * Clock Configuration
  */
-#undef CONFIG_SYS_CLKS_IN_HZ
-#define        CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
 #define CONFIG_SYS_CPUSPEED            0x190           /* standard setting for 312MHz; L=16, N=1.5, A=0, SDCLK!=SystemBus */
 
 /*
@@ -185,10 +174,10 @@ unsigned char zipitz2_spi_read(void);
 
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE      1
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2*CONFIG_SYS_HZ)
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2*CONFIG_SYS_HZ)
-#define CONFIG_SYS_FLASH_LOCK_TOUT     (2*CONFIG_SYS_HZ)
-#define CONFIG_SYS_FLASH_UNLOCK_TOUT   (2*CONFIG_SYS_HZ)
+#define CONFIG_SYS_FLASH_ERASE_TOUT    240000
+#define CONFIG_SYS_FLASH_WRITE_TOUT    240000
+#define CONFIG_SYS_FLASH_LOCK_TOUT     240000
+#define CONFIG_SYS_FLASH_UNLOCK_TOUT   240000
 #define CONFIG_SYS_FLASH_PROTECTION
 
 /*