diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2021-03-25 20:20:11 +0300 |
|---|---|---|
| committer | Adriana Kobylak <anoo@linux.ibm.com> | 2021-04-12 18:55:02 +0300 |
| commit | adba73526790154a7d2edd31787e03d394365934 (patch) | |
| tree | a28d15c0255d6c41917804477ab0b308b08f8e4d /meta-ibm | |
| parent | 645a895a7f4d12c574ae6b9483956425219b6fe4 (diff) | |
| download | openbmc-adba73526790154a7d2edd31787e03d394365934.tar.xz | |
ibm: power: Replace rainier with p10bmc
The IBM rainier machine name is being replaced with the generic p10bmc.
Change-Id: I8dece8c720fd520de7a6857a7311b62a65c054ba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-ibm')
| -rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json (renamed from meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json) | 0 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend | 4 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/power/power-sequencer.bb | 6 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml (renamed from meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json index baa96ac27..baa96ac27 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/p10bmc/psu.json diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 3c652cee9..c8084b39e 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -5,11 +5,11 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -EXTRA_OEMESON_append_rainier = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" +EXTRA_OEMESON_append_p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" DEPENDS_append_ibm-ac-server = " power-sequencer" -DEPENDS_append_rainier = " power-sequencer" +DEPENDS_append_p10bmc = " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb index cd5822202..6fc1133cf 100644 --- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb +++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml" -SRC_URI_append_rainier = " file://ucd90160.yaml" +SRC_URI_append_p10bmc = " file://ucd90160.yaml" FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" -FILES_${PN}_append_rainier = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml" S = "${WORKDIR}" @@ -19,7 +19,7 @@ do_install_append_ibm-ac-server() { install -D ucd90160.yaml ${DEST}/ucd90160.yaml } -do_install_append_rainier() { +do_install_append_p10bmc() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml index a6bba44ce..a6bba44ce 100644 --- a/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml +++ b/meta-ibm/recipes-phosphor/power/power-sequencer/p10bmc/ucd90160.yaml |