Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 8237ba1..b270832 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -160,9 +160,9 @@
  * only the first 6k in EEPROM are available for user. Of that we use 256b
  */
 #define        CONFIG_SOFT_I2C
-#define CFG_ENV_IS_IN_EEPROM   1       /* turn on EEPROM env feature */
-#define CFG_ENV_OFFSET         0x1000
-#define CFG_ENV_SIZE           0x0700
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
+#define CONFIG_ENV_OFFSET              0x1000
+#define CONFIG_ENV_SIZE                0x0700
 #define CFG_I2C_EEPROM_ADDR 0x57
 #define CFG_FACT_OFFSET                0x1800
 #define CFG_FACT_SIZE          0x0800
@@ -201,10 +201,10 @@
  * defines we need to get FEC running
  */
 #define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
-#define CONFIG_FEC_ENET        1       /* Ethernet only via FEC        */
-#define        FEC_ENET                        1       /* eth.c needs it that way... */
+#define CONFIG_FEC_ENET                1       /* Ethernet only via FEC        */
+#define        FEC_ENET                1       /* eth.c needs it that way... */
 #define CFG_DISCOVER_PHY       1
-#define CONFIG_MII                     1
+#define CONFIG_MII             1
 #define CONFIG_MII_INIT                1
 #define CONFIG_PHY_ADDR                31
 
@@ -287,7 +287,7 @@
  *-----------------------------------------------------------------------
  * set up SYPCR:
  *     16      SWTC    0xffff          Software watchdog timer count
- *     8       BMT             0xff            Bus monitor timing
+ *     8       BMT             0xff            Bus monitor timing
  *     1       BME             1                       Bus monitor enable
  *     3       0               000
  *     1       SWF             1                       Software watchdog freeze
@@ -297,7 +297,7 @@
  */
 #if defined (CONFIG_WATCHDOG)
  #define CFG_SYPCR     (SYPCR_SWTC | SYPCR_BMT | SYPCR_BME | SYPCR_SWF | \
-                                        SYPCR_SWE  | SYPCR_SWRI| SYPCR_SWP)
+                                        SYPCR_SWE  | SYPCR_SWRI| SYPCR_SWP)
 #else
  #define CFG_SYPCR     (SYPCR_SWTC | SYPCR_BMT | SYPCR_BME | SYPCR_SWF)
 #endif