diff options
author | Lei YU <mine260309@gmail.com> | 2019-04-28 08:18:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-29 19:15:17 +0300 |
commit | c33eff4fcb93de18055475eaf482cf8ed1024989 (patch) | |
tree | 903e5585891b295e475b3e46b5d1a1c4d15824e0 | |
parent | 9bda022ff21f1ba3836c334311c5f26cd673c797 (diff) | |
download | openbmc-c33eff4fcb93de18055475eaf482cf8ed1024989.tar.xz |
meta-romulus: add occ-control-config-native
openpower-occ-control requires a sensor header file generated from
occ_sensor.yaml. By default it uses an example yaml, which does not fit
for Romulus.
Add romulus-occ-control-config-native.bb to use its own
occ_sensor.yaml, so that the package uses the correct config.
Tested: Verify the build uses the correct config generated from
Romulus's occ_sensor.yaml.
(From meta-ibm rev: 54abf3c0be5618333cb37faebc55af48aa2a872b)
Change-Id: Iaa3adf0d20e5b6d080866dd1b19fa3ee7f4d7369
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
3 files changed, 25 insertions, 0 deletions
diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index ddbc7dbb8..4b580a220 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -20,3 +20,4 @@ PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-man PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "romulus-ipmi-fru-read-inventory-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-inventory-sel = "romulus-ipmi-inventory-sel-native" PREFERRED_PROVIDER_virtual/phosphor-logging-callouts = "romulus-phosphor-logging-callouts-native" +PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "romulus-occ-control-config-native" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/occ/files/occ_sensor.yaml b/meta-ibm/meta-romulus/recipes-phosphor/occ/files/occ_sensor.yaml new file mode 100644 index 000000000..ebfaf763a --- /dev/null +++ b/meta-ibm/meta-romulus/recipes-phosphor/occ/files/occ_sensor.yaml @@ -0,0 +1,6 @@ +- Instance: 0 + SensorID: 0x03 + SensorName: occ0 +- Instance: 1 + SensorID: 0x04 + SensorName: occ1 diff --git a/meta-ibm/meta-romulus/recipes-phosphor/occ/romulus-occ-control-config-native.bb b/meta-ibm/meta-romulus/recipes-phosphor/occ/romulus-occ-control-config-native.bb new file mode 100644 index 000000000..ec6a39df4 --- /dev/null +++ b/meta-ibm/meta-romulus/recipes-phosphor/occ/romulus-occ-control-config-native.bb @@ -0,0 +1,18 @@ +SUMMARY = "Romulus OCC Control sensor IDs" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit openpower-occ-control + +SRC_URI += "file://occ_sensor.yaml" + +PROVIDES += "virtual/openpower-occ-control-config-native" + +S = "${WORKDIR}" + +do_install() { + install -d ${YAML_DEST}/ + install -D occ_sensor.yaml ${YAML_DEST}/occ_sensor.yaml +} |