meta-ibm: acx22: new YAML dependency scheme
A prior patch added a new recipe acx22-yaml-config to provide all the
YAML configuration for ACx22 systems. This patch switches the layer to
that recipe by setting EXTRA_OECONF and DEPENDS as appropriate in the
required bbappends.
With this switch, a number of recipes and their provided YAML are now
dead metadata, so remove those.
Change-Id: I7b0190986615bc2a66334f125d97a54466a37eb9
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
new file mode 100644
index 0000000..588f23e
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -0,0 +1,5 @@
+DEPENDS_append = " acx22-yaml-config"
+
+EXTRA_OECONF = " \
+ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
+ "
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml
deleted file mode 100644
index 072cc5c..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-50:
- /system/chassis/motherboard/fan0:
- entityID: 29
- entityInstance: 1
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Product Name
- IPMIFruSection: Product
-51:
- /system/chassis/motherboard/fan1:
- entityID: 29
- entityInstance: 2
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Product Name
- IPMIFruSection: Product
-52:
- /system/chassis/motherboard/fan2:
- entityID: 29
- entityInstance: 3
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Product Name
- IPMIFruSection: Product
-53:
- /system/chassis/motherboard/fan3:
- entityID: 29
- entityInstance: 4
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Product Name
- IPMIFruSection: Product
-60:
- /system/chassis/motherboard/boxelder/bmc:
- entityID: 6
- entityInstance: 1
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Board Name
- IPMIFruSection: Board
- xyz.openbmc_project.Inventory.Decorator.Asset:
- PartNumber:
- IPMIFruProperty: Part Number
- IPMIFruSection: Board
- SerialNumber:
- IPMIFruProperty: Serial Number
- IPMIFruSection: Board
- Model:
- IPMIFruProperty: Model Number
- IPMIFruSection: Board
- Manufacturer:
- IPMIFruProperty: Manufacturer
- IPMIFruSection: Board
- BuildDate:
- IPMIFruProperty: Mfg Date
- IPMIFruSection: Board
-70:
- /system/chassis/motherboard/boxelder/bmc/ethernet:
- entityID: 1
- entityInstance: 1
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Product Name
- IPMIFruSection: Product
-75:
- /system/chassis/motherboard/powersupply0:
- entityID: 10
- entityInstance: 1
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Board Name
- IPMIFruSection: Board
- xyz.openbmc_project.Inventory.Decorator.Asset:
- PartNumber:
- IPMIFruProperty: Part Number
- IPMIFruSection: Board
- SerialNumber:
- IPMIFruProperty: Serial Number
- IPMIFruSection: Board
- Model:
- IPMIFruProperty: Model Number
- IPMIFruSection: Board
- Manufacturer:
- IPMIFruProperty: Manufacturer
- IPMIFruSection: Board
- BuildDate:
- IPMIFruProperty: Mfg Date
- IPMIFruSection: Board
-76:
- /system/chassis/motherboard/powersupply1:
- entityID: 10
- entityInstance: 2
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Board Name
- IPMIFruSection: Board
- xyz.openbmc_project.Inventory.Decorator.Asset:
- PartNumber:
- IPMIFruProperty: Part Number
- IPMIFruSection: Board
- SerialNumber:
- IPMIFruProperty: Serial Number
- IPMIFruSection: Board
- Model:
- IPMIFruProperty: Model Number
- IPMIFruSection: Board
- Manufacturer:
- IPMIFruProperty: Manufacturer
- IPMIFruSection: Board
- BuildDate:
- IPMIFruProperty: Mfg Date
- IPMIFruSection: Board
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml
deleted file mode 100644
index 65c02b6..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-20:
- /system/chassis/motherboard/gv100card0: &DEFAULTS
- entityInstance: 1
- entityID: 3
- interfaces:
- xyz.openbmc_project.Inventory.Item:
- PrettyName:
- IPMIFruProperty: Board Name
- IPMIFruSection: Board
-21:
- /system/chassis/motherboard/gv100card1:
- <<: *DEFAULTS
- entityInstance: 2
-22:
- /system/chassis/motherboard/gv100card2:
- <<: *DEFAULTS
- entityInstance: 3
-23:
- /system/chassis/motherboard/gv100card3:
- <<: *DEFAULTS
- entityInstance: 4
-24:
- /system/chassis/motherboard/gv100card4:
- <<: *DEFAULTS
- entityInstance: 5
-25:
- /system/chassis/motherboard/gv100card5:
- <<: *DEFAULTS
- entityInstance: 6
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
new file mode 100644
index 0000000..408364c
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -0,0 +1,6 @@
+DEPENDS_append = " acx22-yaml-config"
+
+EXTRA_OECONF = " \
+ YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
+ PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
+ "
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
deleted file mode 100644
index 8e0634f..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml
+++ /dev/null
@@ -1,485 +0,0 @@
-0xdd:
- entityID: 0x1D
- entityInstance: 1
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan0_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xdf:
- entityID: 0x1D
- entityInstance: 3
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan1_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe3:
- entityID: 0x1D
- entityInstance: 5
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan2_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe5:
- entityID: 0x1D
- entityInstance: 7
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan3_0
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe7:
- entityID: 0x0A
- entityInstance: 1
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/fan_disk_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xee:
- entityID: 0x0A
- entityInstance: 9
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p0_io_power
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xef:
- entityID: 0x0A
- entityInstance: 10
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p1_io_power
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf0:
- entityID: 0x0A
- entityInstance: 11
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p0_mem_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf1:
- entityID: 0x0A
- entityInstance: 12
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p1_mem_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf2:
- entityID: 0x0A
- entityInstance: 13
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p0_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf3:
- entityID: 0x0A
- entityInstance: 14
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/p1_power
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-
-0xf4:
- entityID: 0x0A
- entityInstance: 15
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/ps0_input_power
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf5:
- entityID: 0x0A
- entityInstance: 16
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/ps1_input_power
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf6:
- entityID: 0x0A
- entityInstance: 17
- sensorType: 0x08
- path: /xyz/openbmc_project/sensors/power/total_power
- sensorReadingType: 0x01
- multiplierM: 20
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
- scale: -6
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf7:
- entityID: 0x0A
- entityInstance: 19
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf8:
- entityID: 0x0A
- entityInstance: 20
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage
- sensorReadingType: 0x01
- multiplierM: 2
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xf9:
- entityID: 0x0A
- entityInstance: 21
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfa:
- entityID: 0x0A
- entityInstance: 22
- sensorType: 0x02
- path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage
- sensorReadingType: 0x01
- multiplierM: 10
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfb:
- entityID: 0x0A
- entityInstance: 23
- sensorType: 0x03
- path: /xyz/openbmc_project/sensors/current/ps0_output_current
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfc:
- entityID: 0x0A
- entityInstance: 24
- sensorType: 0x03
- path: /xyz/openbmc_project/sensors/current/ps1_output_current
- sensorReadingType: 0x01
- multiplierM: 1
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfd:
- entityID: 0x23
- entityInstance: 1
- sensorType: 0x01
- path: /xyz/openbmc_project/sensors/temperature/pcie
- sensorReadingType: 0x01
- multiplierM: 30
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xfe:
- entityID: 0x40
- entityInstance: 1
- sensorType: 0x01
- path: /xyz/openbmc_project/sensors/temperature/ambient
- sensorReadingType: 0x01
- multiplierM: 20
- offsetB: 0
- bExp: 0
- rExp: -2
- unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
- scale: -3
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
deleted file mode 100644
index a52a8f0..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/occ_sensors.hardcoded.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-0x08:
- entityID: 0xD2
- entityInstance: 1
- sensorType: 0x09
- path: /org/open_power/control/occ0
- sensorReadingType: 0x09
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: assertion
- mutability: Mutability::Write|Mutability::Read
- sensorNamePattern: nameLeaf
- interfaces:
- org.open_power.OCC.Status:
- OccActive:
- Offsets:
- 0x00:
- assert: false
- deassert: true
- type: bool
- 0x01:
- assert: true
- deassert: false
- type: bool
-0x09:
- entityID: 0xD2
- entityInstance: 2
- sensorType: 0x09
- path: /org/open_power/control/occ1
- sensorReadingType: 0x09
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: assertion
- mutability: Mutability::Write|Mutability::Read
- sensorNamePattern: nameLeaf
- interfaces:
- org.open_power.OCC.Status:
- OccActive:
- Offsets:
- 0x00:
- assert: false
- deassert: true
- type: bool
- 0x01:
- assert: true
- deassert: false
- type: bool
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml
deleted file mode 100644
index 69c4ccd..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-0xde:
- entityID: 0x1D
- entityInstance: 2
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe2:
- entityID: 0x1D
- entityInstance: 4
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe4:
- entityID: 0x1D
- entityInstance: 6
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
-0xe6:
- entityID: 0x1D
- entityInstance: 8
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index bb28054..16b1379 100644
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,10 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " \
- file://occ_sensors.hardcoded.yaml \
- file://hwmon_sensors.hardcoded.yaml \
- "
+DEPENDS_append = " acx22-yaml-config"
-# System-specific sensors
-SRC_URI_append_witherspoon = " \
- file://witherspoon_hwmon_sensors.hardcoded.yaml \
- "
+EXTRA_OECONF = " \
+ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
+ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
+ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
+ "