rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / board / fads / fads.h

diff --git a/board/fads/fads.h b/board/fads/fads.h
index dea8a0d..23310a4 100644 (file)
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -96,6 +96,7 @@
 
 #ifdef CONFIG_FEC_ENET
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII_INIT                1
 #endif
 
 
@@ -142,7 +143,7 @@
 #define        CFG_MAXARGS             16              /* max number of command args   */
 #define CFG_BARGSIZE           CFG_CBSIZE      /* Boot Argument Buffer Size    */
 
-#define CFG_LOAD_ADDR          0x00100000
+#define CFG_LOAD_ADDR          0x00100000
 
 #define        CFG_HZ                  1000    /* decrementer freq: 1 ms ticks */
 
@@ -175,7 +176,7 @@
  */
 #define        CFG_SDRAM_BASE          0x00000000
 #if defined(CONFIG_MPC86xADS) || defined(CONFIG_MPC885ADS) /* New ADS or Duet */
-#define        CFG_SDRAM_SIZE          0x00800000              /* 8 Mbyte */
+#define        CFG_SDRAM_SIZE          0x00800000      /* 8 Mbyte */
 /*
  * 2048        SDRAM rows
  * 1000        factor s -> ms
@@ -194,7 +195,7 @@
 #if (CFG_SDRAM_SIZE)
 #define CFG_MEMTEST_END                CFG_SDRAM_SIZE  /* 1 ... SDRAM_SIZE     */
 #else
-#define CFG_MEMTEST_END                0x0400000       /* 1 ... 4 MB in DRAM   */
+#define CFG_MEMTEST_END                0x0400000       /* 1 ... 4 MB in DRAM   */
 #endif /* CFG_SDRAM_SIZE */
 
 /*
@@ -225,10 +226,10 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-#define        CFG_ENV_IS_IN_FLASH     1
-#define CFG_ENV_SECT_SIZE      0x40000 /* see README - env sector total size   */
-#define CFG_ENV_OFFSET         CFG_ENV_SECT_SIZE
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment            */
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* see README - env sector total size   */
+#define CONFIG_ENV_OFFSET              CONFIG_ENV_SECT_SIZE
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment            */
 #define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
 
 #define        CFG_DIRECT_FLASH_TFTP
@@ -457,10 +458,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*-----------------------------------------------------------------------
  * PCMCIA stuff
  *-----------------------------------------------------------------------