| commit | 5a9d419aa7be9c6283205e14d95a557aed5a670c | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Tue Jun 03 22:04:32 2025 -0400 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Tue Jun 03 22:20:51 2025 -0400 |
| tree | 74636c9b8208ac747d19860adc04106f390e821f | |
| parent | 4cd8ad0fdcf915817671edc9268ebe506906e6ca [diff] |
meta-openpower: move ibm cpu configs Move the IBM CPU configs to the openpower layer. The only usage of them in meta-phosphor was for an entity-manager config that also belongs in meta-openpower. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I0092c779afe6c92a51b3681ba5d34203f6ab6964
diff --git a/meta-phosphor/conf/machine/include/ibm-power-cpu.inc b/meta-openpower/conf/machine/include/ibm-power-cpu.inc similarity index 100% rename from meta-phosphor/conf/machine/include/ibm-power-cpu.inc rename to meta-openpower/conf/machine/include/ibm-power-cpu.inc
diff --git a/meta-phosphor/conf/machine/include/ibm-power10-cpu.inc b/meta-openpower/conf/machine/include/ibm-power10-cpu.inc similarity index 100% rename from meta-phosphor/conf/machine/include/ibm-power10-cpu.inc rename to meta-openpower/conf/machine/include/ibm-power10-cpu.inc
diff --git a/meta-phosphor/conf/machine/include/ibm-power8-cpu.inc b/meta-openpower/conf/machine/include/ibm-power8-cpu.inc similarity index 100% rename from meta-phosphor/conf/machine/include/ibm-power8-cpu.inc rename to meta-openpower/conf/machine/include/ibm-power8-cpu.inc
diff --git a/meta-phosphor/conf/machine/include/ibm-power9-cpu.inc b/meta-openpower/conf/machine/include/ibm-power9-cpu.inc similarity index 100% rename from meta-phosphor/conf/machine/include/ibm-power9-cpu.inc rename to meta-openpower/conf/machine/include/ibm-power9-cpu.inc
diff --git a/meta-openpower/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openpower/recipes-phosphor/configuration/entity-manager_%.bbappend new file mode 100644 index 0000000..36fe888 --- /dev/null +++ b/meta-openpower/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +# Systems with IBM processors tend to use IBM-formatted VPD, so fru-device +# shouldn't be enabled. +SYSTEMD_AUTO_ENABLE:fru-device:ibm-power-cpu = "disable"
diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 7ff1050..c357efd 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb
@@ -33,7 +33,6 @@ SYSTEMD_SERVICE:fru-device = "xyz.openbmc_project.FruDevice.service" SYSTEMD_SERVICE:devicetree-vpd = "devicetree-vpd-parser.service" SYSTEMD_SERVICE:gpio-presence = "xyz.openbmc_project.gpiopresence.service" -SYSTEMD_AUTO_ENABLE:fru-device:ibm-power-cpu = "disable" inherit pkgconfig meson systemd python3native