diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-05-26 21:48:42 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-06-04 18:02:41 +0300 |
| commit | 69222b510638c5c0c768bfcdfde126205ab55e2d (patch) | |
| tree | 27c39cc93d6c80f517b3a917bbc4bbf2530f4b66 /meta-facebook/conf/machine | |
| parent | cd01a3bb733a47cd26cb03413a96fb5ec5e14bdd (diff) | |
| download | openbmc-69222b510638c5c0c768bfcdfde126205ab55e2d.tar.xz | |
meta-facebook: prep for host-less machines
Create config files that split "nohost" and "withost" variants
of facebook machines.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I23460d8da076d02ebb6e5105b80244ca8a5681a4
Diffstat (limited to 'meta-facebook/conf/machine')
4 files changed, 19 insertions, 8 deletions
diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc index 66b0f756b..7d61f81e1 100644 --- a/meta-facebook/conf/machine/include/facebook-compute.inc +++ b/meta-facebook/conf/machine/include/facebook-compute.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook.inc +require conf/machine/include/facebook-withhost.inc OVERRIDES .= ":fb-compute" diff --git a/meta-facebook/conf/machine/include/facebook-nohost.inc b/meta-facebook/conf/machine/include/facebook-nohost.inc new file mode 100644 index 000000000..e9af8e94d --- /dev/null +++ b/meta-facebook/conf/machine/include/facebook-nohost.inc @@ -0,0 +1,3 @@ +require conf/machine/include/facebook.inc + +OVERRIDES .= ":fb-nohost" diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc new file mode 100644 index 000000000..ebe79d1a4 --- /dev/null +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -0,0 +1,15 @@ +require conf/machine/include/facebook.inc + +OBMC_MACHINE_FEATURES += "\ + obmc-chassis-state-mgmt \ + obmc-host-ipmi \ + obmc-host-state-mgmt \ + obmc-phosphor-chassis-mgmt \ + " + +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" + +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" + +OVERRIDES .= ":fb-withhost" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 9c9490bda..2993dc438 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,21 +1,14 @@ OBMC_MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ " VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" -VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" |