diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-10-13 17:29:26 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-10-14 12:28:28 +0300 |
commit | ce74d6760a19b7a3cd244556cff2d323a53d4734 (patch) | |
tree | df1d204eea63263f78f21a77b07a785025c4b9b4 | |
parent | cb01b982d034ad422436d30e6fd0fed983257162 (diff) | |
download | openbmc-ce74d6760a19b7a3cd244556cff2d323a53d4734.tar.xz |
treewide: more obmc-host-ctl cleanups
obmc-host-ctl is defined as a MACHINE, DISTRO, and IMAGE feature.
The IMAGE feature pulls in a virtual provider only if the COMBINED
feature (MACHINE + DISTRO) is enabled. This is only done on openpower
machines. There are a lot of other places where machines are half-way
disabling this feature and/or changing variables which have zero effect
anyhow. Clean up almost all references to `obmc-host-ctl`.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I090d782bb6a34dc4e3c43df97e8ccf6e1812fed5
-rw-r--r-- | meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf | 1 | ||||
-rw-r--r-- | meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf | 1 | ||||
-rw-r--r-- | meta-fii/meta-mori/conf/machine/mori.conf | 1 | ||||
-rw-r--r-- | meta-hpe/conf/machine/include/hpe.inc | 1 | ||||
-rw-r--r-- | meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf | 1 | ||||
-rw-r--r-- | meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 | ||||
-rw-r--r-- | meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf index 55773fcec1..f4cdcd1970 100644 --- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf +++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf @@ -12,5 +12,4 @@ require conf/machine/include/facebook-compute-singlehost.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index 4a520542e6..667357ecc4 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -12,6 +12,5 @@ require conf/machine/include/facebook-compute-multihost.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" OBMC_HOST_INSTANCES = "1 2 3 4" diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf index 920579032b..25ce57cc4d 100644 --- a/meta-fii/meta-mori/conf/machine/mori.conf +++ b/meta-fii/meta-mori/conf/machine/mori.conf @@ -35,7 +35,6 @@ IMAGE_FEATURES:remove = "obmc-fan-mgmt" IMAGE_FEATURES:remove = "obmc-flash-mgmt" IMAGE_FEATURES:remove = "obmc-fru-ipmi" IMAGE_FEATURES:remove = "obmc-health-monitor" -IMAGE_FEATURES:remove = "obmc-host-ctl" IMAGE_FEATURES:remove = "obmc-host-ipmi" IMAGE_FEATURES:remove = "obmc-ikvm" IMAGE_FEATURES:remove = "obmc-inventory" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 281d2d5441..120d2f009b 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -16,7 +16,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" IMAGE_CLASSES:append = " hpe-rootfs-postcommands" diff --git a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf index 93e25120f1..0143b57079 100644 --- a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf +++ b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf @@ -21,7 +21,6 @@ OBMC_MACHINE_FEATURES += "\ obmc-host-state-mgmt \ " -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" FEATURE_PACKAGES_obmc-system-mgmt = "" diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 803ecf67f5..12388f024c 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -36,7 +36,6 @@ IMAGE_FEATURES:remove = "obmc-fan-mgmt" IMAGE_FEATURES:remove = "obmc-flash-mgmt" IMAGE_FEATURES:remove = "obmc-fru-ipmi" IMAGE_FEATURES:remove = "obmc-health-monitor" -IMAGE_FEATURES:remove = "obmc-host-ctl" IMAGE_FEATURES:remove = "obmc-host-ipmi" IMAGE_FEATURES:remove = "obmc-host-state-mgmt" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 90f6927dc7..7844bee873 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -31,7 +31,6 @@ IMAGE_FEATURES:remove = "obmc-fan-mgmt" IMAGE_FEATURES:remove = "obmc-flash-mgmt" IMAGE_FEATURES:remove = "obmc-fru-ipmi" IMAGE_FEATURES:remove = "obmc-health-monitor" -IMAGE_FEATURES:remove = "obmc-host-ctl" IMAGE_FEATURES:remove = "obmc-host-ipmi" IMAGE_FEATURES:remove = "obmc-host-state-mgmt" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf index dc36d9b4e8..373e828c42 100644 --- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf +++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf @@ -20,7 +20,6 @@ FLASH_SIZE = "32768" # obmc-phosphor-chassis-mgmt \ # obmc-phosphor-flash-mgmt \ # obmc-host-ipmi \ -# obmc-host-ctl \ # obmc-host-state-mgmt \ # obmc-chassis-state-mgmt \ # obmc-bmc-state-mgmt \ |