Merge branch 'master' of /home/wd/git/u-boot/master

[u-boot] / include / configs / eNET.h

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index 61897949dd93f33e310048363ba503ff70e26111..361fe61b04fdbef4e75cefe20ae6877b2cc8f04d 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -53,7 +53,7 @@
  * bottom (processor) board MUST be removed!
  */
 #undef CONFIG_WATCHDOG
-#undef CONFIG_HW_WATCHDOG
+#define CONFIG_HW_WATCHDOG
 
  /*-----------------------------------------------------------------------
   * Serial Configuration
@@ -233,14 +233,6 @@
 #define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
 
-/*-----------------------------------------------------------------------
- * Hardware watchdog configuration
- */
-#define CONFIG_SYS_WATCHDOG_PIO_BIT            0x8000
-#define CONFIG_SYS_WATCHDIG_PIO_DATA           SC520_PIODATA15_0
-#define CONFIG_SYS_WATCHDIG_PIO_CLR            SC520_PIOCLR15_0
-#define CONFIG_SYS_WATCHDIG_PIO_SET            SC520_PIOSET15_0
-
 /*-----------------------------------------------------------------------
  * FPGA configuration
  */