ppc4xx: Fix 405EZ uart base baud calculation

[platform/kernel/u-boot.git] / post / board / lwmon5 / sysmon.c

diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c
index 23cb709..aef5bd0 100644 (file)
--- a/post/board/lwmon5/sysmon.c
+++ b/post/board/lwmon5/sysmon.c
@@ -51,7 +51,7 @@
 #include <mb862xx.h>
 #endif
 
-#if CONFIG_POST & CFG_POST_SYSMON
+#if CONFIG_POST & CONFIG_SYS_POST_SYSMON
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -67,7 +67,7 @@ extern int dspic_read(ushort reg);
 #define TEMPERATURE_MIN                        (-40)   /* degr. C */
 #define TEMPERATURE_MAX                        (+90)   /* degr. C */
 #define TEMPERATURE_DISPLAY_MIN                (-35)   /* degr. C */
-#define TEMPERATURE_DISPLAY_MAX                (+85)   /* degr. C */  
+#define TEMPERATURE_DISPLAY_MAX                (+85)   /* degr. C */
 
 #define VOLTAGE_5V_MIN                 (+4500) /* mV */
 #define VOLTAGE_5V_MAX                 (+5500) /* mV */
@@ -90,7 +90,7 @@ struct sysmon_s
 };
 
 static sysmon_t sysmon_dspic =
-       {CFG_I2C_DSPIC_IO_ADDR, sysmon_dspic_init, sysmon_dspic_read};
+       {CONFIG_SYS_I2C_DSPIC_IO_ADDR, sysmon_dspic_init, sysmon_dspic_read};
 
 static sysmon_t * sysmon_list[] =
 {
@@ -133,16 +133,16 @@ static sysmon_table_t sysmon_table[] =
        {
        "+ 5 V", "V", &sysmon_dspic, NULL, NULL,
        100, 1000, -0x8000, 0x7FFF, 0xFFFF,
-       VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
-       VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
+       0x8000 + VOLTAGE_5V_MIN, 0x8000 + VOLTAGE_5V_MAX, 0,
+       0x8000 + VOLTAGE_5V_MIN, 0x8000 + VOLTAGE_5V_MAX, 0,
        REG_VOLTAGE_5V,
        },
 
        {
        "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
        100, 1000, -0x8000, 0x7FFF, 0xFFFF,
-       VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
-       VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
+       0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0,
+       0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0,
        REG_VOLTAGE_5V_STANDBY,
        },
 };
@@ -267,4 +267,4 @@ int sysmon_post_test (int flags)
 
        return res;
 }
-#endif /* CONFIG_POST & CFG_POST_SYSMON */
+#endif /* CONFIG_POST & CONFIG_SYS_POST_SYSMON */