diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
commit | 0e0df451ae365f09d5c0c766b253f23de26901f2 (patch) | |
tree | db4d7d3ce85e02ee01ad58a86ede02ac876aae77 /meta-ibm/recipes-phosphor/power | |
parent | e370fd750e2821620ec427f26f8efab0069824ff (diff) | |
parent | 7e10dee74964afa47859704886128dd256acf854 (diff) | |
download | openbmc-0e0df451ae365f09d5c0c766b253f23de26901f2.tar.xz |
Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/recipes-phosphor/power')
-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 |