rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / post / board / lwmon5 / watchdog.c

diff --git a/post/board/lwmon5/watchdog.c b/post/board/lwmon5/watchdog.c
index 48ff68746074d002628badc16b7dff1106d92269..44f048832343bde96114620b6c08cd2d9dabf383 100644 (file)
--- a/post/board/lwmon5/watchdog.c
+++ b/post/board/lwmon5/watchdog.c
@@ -24,17 +24,14 @@
 
 #include <common.h>
 
-/*
- * This test verifies if the reason of last reset was an abnormal voltage
+/* This test verifies if the reason of last reset was an abnormal voltage
  * condition, than it performs watchdog test, measuing time required to
  * trigger watchdog reset.
  */
 
-#ifdef CONFIG_POST
-
 #include <post.h>
 
-#if CONFIG_POST & CFG_POST_WATCHDOG
+#if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG
 
 #include <watchdog.h>
 #include <asm/gpio.h>
@@ -42,20 +39,20 @@
 
 static uint watchdog_magic_read(void)
 {
-       return in_be32((void *)CFG_WATCHDOG_FLAGS_ADDR) &
-               CFG_WATCHDOG_MAGIC_MASK;
+       return in_be32((void *)CONFIG_SYS_WATCHDOG_FLAGS_ADDR) &
+               CONFIG_SYS_WATCHDOG_MAGIC_MASK;
 }
 
 static void watchdog_magic_write(uint value)
 {
-       out_be32((void *)CFG_WATCHDOG_FLAGS_ADDR, value |
-               (in_be32((void *)CFG_WATCHDOG_FLAGS_ADDR) &
-                       ~CFG_WATCHDOG_MAGIC_MASK));
+       out_be32((void *)CONFIG_SYS_WATCHDOG_FLAGS_ADDR, value |
+               (in_be32((void *)CONFIG_SYS_WATCHDOG_FLAGS_ADDR) &
+                       ~CONFIG_SYS_WATCHDOG_MAGIC_MASK));
 }
 
 int sysmon1_post_test(int flags)
 {
-       if (gpio_read_in_bit(CFG_GPIO_SYSMON_STATUS)) {
+       if (gpio_read_in_bit(CONFIG_SYS_GPIO_SYSMON_STATUS) == 0) {
                /*
                 * 3.1. GPIO62 is low
                 * Assuming system voltage failure.
@@ -69,14 +66,11 @@ int sysmon1_post_test(int flags)
 
 int lwmon5_watchdog_post_test(int flags)
 {
-       ulong time;
-
        /* On each reset scratch register 1 should be tested,
         * but first test GPIO62:
         */
        if (!(flags & POST_MANUAL) && sysmon1_post_test(flags)) {
-               /*
-                * 3.1. GPIO62 is low
+               /* 3.1. GPIO62 is low
                 * Assuming system voltage failure.
                 */
                /* 3.1.1. Set scratch register 1 to 0x0000xxxx */
@@ -85,52 +79,50 @@ int lwmon5_watchdog_post_test(int flags)
                return 1;
        }
 
-       if (watchdog_magic_read() != CFG_WATCHDOG_MAGIC) {
-               /*
-                * 3.2. Scratch register 1 differs from magic value 0x1248xxxx
+       if (watchdog_magic_read() != CONFIG_SYS_WATCHDOG_MAGIC) {
+               /* 3.2. Scratch register 1 differs from magic value 0x1248xxxx
                 * Assuming PowerOn
                 */
                int ints;
                ulong base;
+               ulong time;
 
                /* 3.2.1. Set magic value to scratch register */
-               watchdog_magic_write(CFG_WATCHDOG_MAGIC);
+               watchdog_magic_write(CONFIG_SYS_WATCHDOG_MAGIC);
 
                ints = disable_interrupts ();
                /* 3.2.2. strobe watchdog once */
                WATCHDOG_RESET();
-               out_be32((void *)CFG_WATCHDOG_TIME_ADDR, 0);
+               out_be32((void *)CONFIG_SYS_WATCHDOG_TIME_ADDR, 0);
                /* 3.2.3. save time of strobe in scratch register 2 */
                base = post_time_ms (0);
 
                /* 3.2.4. Wait for 150 ms (enough for reset to happen) */
                while ((time = post_time_ms (base)) < 150)
-                       out_be32((void *)CFG_WATCHDOG_TIME_ADDR, time);
+                       out_be32((void *)CONFIG_SYS_WATCHDOG_TIME_ADDR, time);
                if (ints)
                        enable_interrupts ();
 
-               /*
-                * 3.2.5. Reset didn't happen. - Set 0x0000xxxx
+               /* 3.2.5. Reset didn't happen. - Set 0x0000xxxx
                 * into scratch register 1
                 */
                watchdog_magic_write(0);
                /* 3.2.6. Mark test as failed. */
                post_log("hw watchdog time : %u ms, failed ", time);
                return 2;
+       } else {
+               /* 3.3. Scratch register matches magic value 0x1248xxxx
+                * Assume this is watchdog-initiated reset
+                */
+               ulong time;
+               /* 3.3.1. So, the test succeed, save measured time to syslog. */
+               time = in_be32((void *)CONFIG_SYS_WATCHDOG_TIME_ADDR);
+               post_log("hw watchdog time : %u ms, passed ", time);
+               /* 3.3.2. Set scratch register 1 to 0x0000xxxx */
+               watchdog_magic_write(0);
+               return 0;
        }
-
-       /*
-        * 3.3. Scratch register matches magic value 0x1248xxxx
-        * Assume this is watchdog-initiated reset
-        */
-       /* 3.3.1. So, the test succeed, save measured time to syslog. */
-       time = in_be32((void *)CFG_WATCHDOG_TIME_ADDR);
-       post_log("hw watchdog time : %u ms, passed ", time);
-       /* 3.3.2. Set scratch register 1 to 0x0000xxxx */
-       watchdog_magic_write(0);
-
-       return 0;
+       return -1;
 }
 
-#endif /* CONFIG_POST & CFG_POST_WATCHDOG */
-#endif /* CONFIG_POST */
+#endif /* CONFIG_POST & CONFIG_SYS_POST_WATCHDOG */