Merge pull request #119 from anoo1/vpd
Remove Chassis and Product area from IO Board
diff --git a/configs/Palmetto.py b/configs/Palmetto.py
index bbe4afc..1eed30d 100644
--- a/configs/Palmetto.py
+++ b/configs/Palmetto.py
@@ -154,6 +154,12 @@
'monitor_process' : True,
'process_name' : 'chassis_control.py',
},
+ 'restore' : {
+ 'system_state' : 'BMC_READY',
+ 'start_process' : True,
+ 'monitor_process' : False,
+ 'process_name' : 'discover_system_state.py',
+ },
'bmc_control' : {
'system_state' : 'BMC_STARTING',
'start_process' : True,
diff --git a/hostcheckstop/host_checkstop_obj.c b/hostcheckstop/host_checkstop_obj.c
index 74c940e..c6eab2f 100644
--- a/hostcheckstop/host_checkstop_obj.c
+++ b/hostcheckstop/host_checkstop_obj.c
@@ -1,3 +1,5 @@
+#include <string.h>
+
#include <openbmc_intf.h>
#include <openbmc.h>
#include <gpio.h>
diff --git a/libopenbmc_intf/openbmc.h b/libopenbmc_intf/openbmc.h
index c1c0335..fe4deef 100644
--- a/libopenbmc_intf/openbmc.h
+++ b/libopenbmc_intf/openbmc.h
@@ -36,7 +36,7 @@
// write_reg(reg,val);
//}
#else
-static inline devmem(uint32_t val, uint32_t reg)
+static inline uint32_t devmem(uint32_t val, uint32_t reg)
{
}
static inline uint32_t devmem_read(void* addr)
diff --git a/pyhwmon/hwmon.py b/pyhwmon/hwmon.py
index e5dc19a..bb363dc 100644
--- a/pyhwmon/hwmon.py
+++ b/pyhwmon/hwmon.py
@@ -65,6 +65,7 @@
self.writeAttribute(attribute,rtn[1])
except:
print "HWMON: Attibute no longer exists: "+attribute
+ self.sensors.pop(objpath,None)
return False