diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2016-09-21 09:52:52 -0500 |
|---|---|---|
| committer | Matt Spinler <spinler@us.ibm.com> | 2016-09-21 11:06:36 -0500 |
| commit | cad44d68f5b976dcc6b381fa343dec60900d49d6 (patch) | |
| tree | e79ce845793c48bc1dbd9e1772fb16c537339563 /configs/Palmetto.py | |
| parent | 6be71f4a254cd43547df83e3fe3ef1ddc1157e27 (diff) | |
| download | blackbird-skeleton-cad44d68f5b976dcc6b381fa343dec60900d49d6.tar.gz blackbird-skeleton-cad44d68f5b976dcc6b381fa343dec60900d49d6.zip | |
Fix some hardcoded inventory paths
Modify hardcoded inventory paths to match the
ones generated by the machine readable workbook.
Note the FRU_INSTANCES array is no longer used
and will be removed with a separate commit.
Resolves openbmc/openbmc#563.
Change-Id: I7af395f08551692f03c95c151bfbbae9e33dee00
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'configs/Palmetto.py')
| -rw-r--r-- | configs/Palmetto.py | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/configs/Palmetto.py b/configs/Palmetto.py index 70320d6..76b8b31 100644 --- a/configs/Palmetto.py +++ b/configs/Palmetto.py @@ -86,8 +86,8 @@ ID_LOOKUP = { 'FRU' : { 0x0d : '<inventory_root>/system/chassis', 0x34 : '<inventory_root>/system/chassis/motherboard', - 0x01 : '<inventory_root>/system/chassis/motherboard/cpu0', - 0x02 : '<inventory_root>/system/chassis/motherboard/membuf0', + 0x01 : '<inventory_root>/system/chassis/motherboard/cpu', + 0x02 : '<inventory_root>/system/chassis/motherboard/membuf', 0x03 : '<inventory_root>/system/chassis/motherboard/dimm0', 0x04 : '<inventory_root>/system/chassis/motherboard/dimm1', 0x05 : '<inventory_root>/system/chassis/motherboard/dimm2', @@ -97,8 +97,8 @@ ID_LOOKUP = { 'FRU_STR' : { 'PRODUCT_15' : '<inventory_root>/system', 'CHASSIS_2' : '<inventory_root>/system/chassis', - 'BOARD_1' : '<inventory_root>/system/chassis/motherboard/cpu0', - 'BOARD_2' : '<inventory_root>/system/chassis/motherboard/membuf0', + 'BOARD_1' : '<inventory_root>/system/chassis/motherboard/cpu', + 'BOARD_2' : '<inventory_root>/system/chassis/motherboard/membuf', 'BOARD_14' : '<inventory_root>/system/chassis/motherboard', 'PRODUCT_3' : '<inventory_root>/system/chassis/motherboard/dimm0', 'PRODUCT_4' : '<inventory_root>/system/chassis/motherboard/dimm1', @@ -107,25 +107,24 @@ ID_LOOKUP = { }, 'SENSOR' : { 0x34 : '<inventory_root>/system/chassis/motherboard', - 0x35 : '<inventory_root>/system/systemevent', 0x37 : '<inventory_root>/system/chassis/motherboard/refclock', 0x38 : '<inventory_root>/system/chassis/motherboard/pcieclock', 0x39 : '<inventory_root>/system/chassis/motherboard/todclock', - 0x3A : '<inventory_root>/system/chassis/motherboard/apss', - 0x2f : '<inventory_root>/system/chassis/motherboard/cpu0', - 0x22 : '<inventory_root>/system/chassis/motherboard/cpu0/core0', - 0x23 : '<inventory_root>/system/chassis/motherboard/cpu0/core1', - 0x24 : '<inventory_root>/system/chassis/motherboard/cpu0/core2', - 0x25 : '<inventory_root>/system/chassis/motherboard/cpu0/core3', - 0x26 : '<inventory_root>/system/chassis/motherboard/cpu0/core4', - 0x27 : '<inventory_root>/system/chassis/motherboard/cpu0/core5', - 0x28 : '<inventory_root>/system/chassis/motherboard/cpu0/core6', - 0x29 : '<inventory_root>/system/chassis/motherboard/cpu0/core7', - 0x2a : '<inventory_root>/system/chassis/motherboard/cpu0/core8', - 0x2b : '<inventory_root>/system/chassis/motherboard/cpu0/core9', - 0x2c : '<inventory_root>/system/chassis/motherboard/cpu0/core10', - 0x2d : '<inventory_root>/system/chassis/motherboard/cpu0/core11', - 0x2e : '<inventory_root>/system/chassis/motherboard/membuf0', + 0x3A : '<inventory_root>/system/chassis/apss', + 0x2f : '<inventory_root>/system/chassis/motherboard/cpu', + 0x22 : '<inventory_root>/system/chassis/motherboard/cpu/core1', + 0x23 : '<inventory_root>/system/chassis/motherboard/cpu/core2', + 0x24 : '<inventory_root>/system/chassis/motherboard/cpu/core3', + 0x25 : '<inventory_root>/system/chassis/motherboard/cpu/core4', + 0x26 : '<inventory_root>/system/chassis/motherboard/cpu/core5', + 0x27 : '<inventory_root>/system/chassis/motherboard/cpu/core6', + 0x28 : '<inventory_root>/system/chassis/motherboard/cpu/core9', + 0x29 : '<inventory_root>/system/chassis/motherboard/cpu/core10', + 0x2a : '<inventory_root>/system/chassis/motherboard/cpu/core11', + 0x2b : '<inventory_root>/system/chassis/motherboard/cpu/core12', + 0x2c : '<inventory_root>/system/chassis/motherboard/cpu/core13', + 0x2d : '<inventory_root>/system/chassis/motherboard/cpu/core14', + 0x2e : '<inventory_root>/system/chassis/motherboard/membuf', 0x1e : '<inventory_root>/system/chassis/motherboard/dimm0', 0x1f : '<inventory_root>/system/chassis/motherboard/dimm1', 0x20 : '<inventory_root>/system/chassis/motherboard/dimm2', @@ -137,8 +136,8 @@ ID_LOOKUP = { 0x33 : '/org/openbmc/sensors/host/PowerCap', }, 'GPIO_PRESENT' : { - 'SLOT0_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot0', - 'SLOT1_PRESENT' : '<inventory_root>/system/chassis/io_board/pcie_slot1', + 'SLOT0_PRESENT' : '<inventory_root>/system/chassis/motherboard/pciecard_x16', + 'SLOT1_PRESENT' : '<inventory_root>/system/chassis/motherboard/pciecard_x8', } } |
