meta-ibm: move all meta-witherspoon metadata
The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon. Move everything to meta-ibm.
The meta-ibm README is re-written to more accurately reflect the scope
of the layer.
Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.
(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)
Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml
new file mode 100644
index 0000000..71ed671
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml
@@ -0,0 +1,6 @@
+---
+/org/open_power/control/host0/ClearHostSecurityKeys:
+ - Interface: org.open_power.Control.TPM.SecurityKeys
+ Properties:
+ ClearHostSecurityKeys:
+ Default: 0
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml
new file mode 100644
index 0000000..905ac12
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml
@@ -0,0 +1,6 @@
+---
+/xyz/openbmc_project/control/host0/TPMEnable:
+ - Interface: xyz.openbmc_project.Control.TPM.Policy
+ Properties:
+ TPMEnable:
+ Default: 'true'
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 9dd3575..1068e1d 100644
--- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,2 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml"
+SRC_URI_append_ibm-ac-server += " file://ClearHostSecurityKeys-default-zero.override.yml"
+SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml"
SRC_URI_append = " file://ibm_settings.override.yml"
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
new file mode 100644
index 0000000..aa8149c
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+MRW_EXPRESSION_VARS = "-v PS_DERATING=${POWER_SUPPLY_DERATING_FACTOR}"
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml
new file mode 100644
index 0000000..c823896
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml
@@ -0,0 +1,11 @@
+/xyz/openbmc_project/control/host0/power_cap:
+ - Interface: xyz.openbmc_project.Control.Power.Cap
+ Properties:
+ PowerCap:
+ Default: 0
+ Validation:
+ Type: "range"
+ Validator: "[[MRW_OPEN_POWER_SOFT_MIN_PCAP_WATTS/(PS_DERATING/100)]]..[[MRW_OPEN_POWER_N_PLUS_ONE_BULK_POWER_LIMIT_WATTS/(PS_DERATING/100)]]"
+ Unit: "Watts"
+ PowerCapEnable:
+ Default: 'false'