updated gpio table
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 80042c5..c98bc6b 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -1,10 +1,10 @@
#! /usr/bin/python
HOME_PATH = './'
-CACHE_PATH = HOME_PATH+'cache/'
+CACHE_PATH = HOME_PATH+'/var/cache/obmc'
FLASH_DOWNLOAD_PATH = "/tmp"
-
-SYSTEM_NAME = "Barreleye"
+GPIO_BASE = 320
+SYSTEM_NAME = "Palmetto"
## System states
@@ -31,7 +31,7 @@
'/org/openbmc/control/chassis0': 0,
'/org/openbmc/control/power0' : 0,
'/org/openbmc/control/led/BMC_READY' : 0,
- '/org/openbmc/control/Host_0' : 0,
+ '/org/openbmc/control/host0' : 0,
}
}
@@ -39,7 +39,7 @@
ENTER_STATE_CALLBACK = {
'HOST_POWERED_ON' : {
'bus_name' : 'org.openbmc.control.Host',
- 'obj_name' : '/org/openbmc/control/Host_0',
+ 'obj_name' : '/org/openbmc/control/host0',
'interface_name' : 'org.openbmc.control.Host',
'method_name' : 'boot'
},
@@ -51,152 +51,104 @@
}
}
-SYSTEM_CONFIG = {}
-
-SYSTEM_CONFIG['org.openbmc.managers.Property'] = {
- 'system_state' : 'BASE_APPS',
- 'start_process' : True,
+APPS = {
+ 'property_manager' : {
+ 'system_state' : 'BASE_APPS',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'property_manager.py',
- 'instances' : [ { 'name' : SYSTEM_NAME } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.control.Bmc'] = {
- 'system_state' : 'BMC_INIT',
- 'start_process' : True,
- 'monitor_process' : True,
- 'process_name' : 'control_bmc_barreleye.exe',
- 'instances' : [ { 'name' : 'Bmc_0' } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.managers.Inventory'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
- 'monitor_process' : True,
- 'process_name' : 'inventory_items.py',
- 'instances' : [ { 'name' : SYSTEM_NAME } ]
- }
-SYSTEM_CONFIG['org.openbmc.control.PciePresent'] = {
- 'system_state' : 'HOST_POWERED_ON',
- 'start_process' : True,
+ 'process_name' : 'property_manager.py',
+ 'args' : [ SYSTEM_NAME ]
+ },
+ 'bmc_init' : {
+ 'system_state' : 'BMC_INIT',
+ 'start_process' : True,
'monitor_process' : False,
- 'process_name' : 'pcie_slot_present.exe',
- 'instances' : [ { 'name' : 'Slots_0' } ]
- }
-SYSTEM_CONFIG['org.openbmc.sensor.Power8Virtual'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'control_bmc_barreleye.exe',
+ },
+ 'inventory' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'sensors_virtual_p8.py',
- 'instances' : [ { 'name' : 'virtual' } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.managers.Sensors'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'inventory_items.py',
+ 'args' : [ SYSTEM_NAME ]
+ },
+ 'pcie_present' : {
+ 'system_state' : 'HOST_POWERED_ON',
+ 'start_process' : True,
+ 'monitor_process' : False,
+ 'process_name' : 'pcie_slot_present.exe',
+ },
+ 'virtual_sensors' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'sensor_manager.py',
- 'instances' : [ { 'name' : SYSTEM_NAME } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.watchdog.Host'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'sensors_virtual_p8.py',
+ },
+ 'sensor_manager' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'host_watchdog.exe',
- 'instances' : [
- {
- 'name' : 'HostWatchdog_0',
- 'properties' : {
- 'org.openbmc.Watchdog' : {
- 'poll_interval': 30000,
- }
- }
- }
- ]
- }
-
-SYSTEM_CONFIG['org.openbmc.control.Power'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'sensor_manager.py',
+ 'args' : [ SYSTEM_NAME ]
+ },
+ 'host_watchdog' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
+ 'monitor_process' : True,
+ 'process_name' : 'host_watchdog.exe',
+ },
+ 'power_control' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
'process_name' : 'power_control.exe',
- 'instances' : [
- {
- 'name' : 'power0',
- 'user_label': 'Power control',
- 'properties' : {
- 'org.openbmc.Control': {
- 'poll_interval' : 3000
- },
- 'org.openbmc.control.Power': {
- 'pgood_timeout' : 10
- }
- }
- }
- ]
- }
-
-SYSTEM_CONFIG['org.openbmc.buttons.Power'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'args' : [ '3000', '10' ]
+ },
+ 'power_button' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'button_power.exe',
- 'instances' : [ { 'name' : 'PowerButton_0' } ]
- }
-SYSTEM_CONFIG['org.openbmc.control.led'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'button_power.exe',
+ },
+ 'led_control' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'led_controller.exe',
- 'instances' : [ { 'name' : 'Dummy' } ]
- }
-SYSTEM_CONFIG['org.openbmc.control.Flash'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'led_controller.exe',
+ },
+ 'flash_control' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'flash_bios.exe',
- 'instances' : [ { 'name' : 'dummy' } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.manager.Download'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'flash_bios.exe',
+ },
+ 'download_manager' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'download_manager.py',
- 'instances' : [ { 'name' : SYSTEM_NAME } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.control.Host'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'download_manager.py',
+ 'args' : [ SYSTEM_NAME ]
+ },
+ 'host_control' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'control_host.exe',
- 'instances' : [ { 'name' : 'Host_0' } ]
- }
-SYSTEM_CONFIG['org.openbmc.control.Chassis'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'control_host.exe',
+ },
+ 'chassis_control' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'chassis_control.py',
- 'instances' : [ { 'name' : 'chassis0' } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.vpd'] = {
- 'system_state' : 'HOST_POWERED_ON',
- 'start_process' : False,
- 'monitor_process' : False,
- 'process_name' : 'board_vpd.exe',
- 'instances' : [ { 'name' : 'MBVPD_0' } ]
- }
-
-SYSTEM_CONFIG['org.openbmc.sensors.Fan'] = {
- 'system_state' : 'BMC_STARTING',
- 'start_process' : True,
+ 'process_name' : 'chassis_control.py',
+ },
+ 'fans' : {
+ 'system_state' : 'BMC_STARTING',
+ 'start_process' : True,
'monitor_process' : True,
- 'process_name' : 'fan.exe',
- 'instances' : [ {'name' : 'Fan_0' }, {'name' : 'Fan_1'}, {'name' : 'Fan_2'} ]
+ 'process_name' : 'fan.exe',
+ 'args' : [ 'fan0','fan1','fan2','fan3','fan4' ]
}
+}
CACHED_INTERFACES = {
"org.openbmc.InventoryItem" : True,
@@ -301,9 +253,6 @@
}
-
-
-
ID_LOOKUP = {
'FRU' : {
0x0d : '<inventory_root>/system/chassis',
@@ -358,23 +307,23 @@
}
GPIO_CONFIG = {}
-GPIO_CONFIG['FSI_CLK'] = { 'gpio_num': 324, 'direction': 'out' }
-GPIO_CONFIG['FSI_DATA'] = { 'gpio_num': 325, 'direction': 'out' }
-GPIO_CONFIG['FSI_ENABLE'] = { 'gpio_num': 344, 'direction': 'out' }
-GPIO_CONFIG['POWER_PIN'] = { 'gpio_num': 353, 'direction': 'out' }
-GPIO_CONFIG['CRONUS_SEL'] = { 'gpio_num': 326, 'direction': 'out' }
-GPIO_CONFIG['PGOOD'] = { 'gpio_num': 343, 'direction': 'in' }
-GPIO_CONFIG['IDENTIFY'] = { 'gpio_num': 365, 'direction': 'out' }
-GPIO_CONFIG['BMC_READY'] = { 'gpio_num': 431, 'direction': 'out' }
-GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_num': 352, 'direction': 'falling' }
-GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_num': 424, 'direction': 'in' }
-GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_num': 425, 'direction': 'in' }
-GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_num': 426, 'direction': 'in' }
-GPIO_CONFIG['SLOT0_PRESENT'] = { 'gpio_num': 427, 'direction': 'in' }
-GPIO_CONFIG['SLOT1_PRESENT'] = { 'gpio_num': 428, 'direction': 'in' }
-GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_num': 429, 'direction': 'in' }
-GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_num': 432, 'direction': 'in' }
-GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_num': 433, 'direction': 'in' }
+GPIO_CONFIG['FSI_CLK'] = { 'gpio_pin': 'A4', 'direction': 'out' }
+GPIO_CONFIG['FSI_DATA'] = { 'gpio_pin': 'A5', 'direction': 'out' }
+GPIO_CONFIG['FSI_ENABLE'] = { 'gpio_pin': 'D0', 'direction': 'out' }
+GPIO_CONFIG['POWER_PIN'] = { 'gpio_pin': 'E1', 'direction': 'out' }
+GPIO_CONFIG['CRONUS_SEL'] = { 'gpio_pin': 'A6', 'direction': 'out' }
+GPIO_CONFIG['PGOOD'] = { 'gpio_pin': 'C7', 'direction': 'in' }
+GPIO_CONFIG['IDENTIFY'] = { 'gpio_pin': 'R4', 'direction': 'out' }
+GPIO_CONFIG['BMC_READY'] = { 'gpio_pin': 'R4', 'direction': 'out' }
+GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'E0', 'direction': 'falling' }
+GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_pin': 'N0', 'direction': 'in' }
+GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_pin': 'N1', 'direction': 'in' }
+GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_pin': 'N2', 'direction': 'in' }
+GPIO_CONFIG['SLOT0_PRESENT'] = { 'gpio_pin': 'N3', 'direction': 'in' }
+GPIO_CONFIG['SLOT1_PRESENT'] = { 'gpio_pin': 'N4', 'direction': 'in' }
+GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
+GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
+GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
def convertGpio(name):
name = name.upper()
@@ -386,5 +335,3 @@
-
-