diff options
author | Manojkiran Eda <manojkiran.eda@gmail.com> | 2021-01-27 06:20:48 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-16 20:26:41 +0300 |
commit | adf08c51fac4ae0aacaf92fdc5b432d29fd68800 (patch) | |
tree | f3aeb5b8ecd2e6b7d105868f5f8f66a300d456c5 /meta-ibm/recipes-phosphor | |
parent | 44e756d6cabc014ffca8007b200216e92f6ba29e (diff) | |
download | openbmc-adf08c51fac4ae0aacaf92fdc5b432d29fd68800.tar.xz |
Remove bios configurations from meta-layer & bump
- The intent behind this commit is to enable & set OEM
specific options to pldm recipe via the meta-ibm layer.
- pldm in its current state, has a configurations folder
which contains all the configurations that are consumed
by the daemon at runtime.
- pldm also has an oem folder(s) that can contain the
vendor specific configuration files.
- So, removing these files from the meta-layer as they are
obsolete.
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
Change-Id: I91d23c37abff45f3da18676269be843610b6a9d1
Diffstat (limited to 'meta-ibm/recipes-phosphor')
-rw-r--r-- | meta-ibm/recipes-phosphor/pldm/pldm/11.json | 28 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json | 54 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json | 10 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/pldm/pldm/host_eid | 1 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend | 16 |
5 files changed, 1 insertions, 108 deletions
diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/11.json b/meta-ibm/recipes-phosphor/pldm/pldm/11.json deleted file mode 100644 index 26fdf5c09..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/11.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "entries" : [{ - "type" : 33, - "instance" : 0, - "container" : 0, - "effecters" : [{ - "set" : { - "id" : 196, - "size" : 1, - "states" : [1,2] - }, - "dbus" : "/xyz/openbmc_project/state/host0" - }] - }, - { - "type" : 45, - "instance" : 0, - "container" : 0, - "effecters" : [{ - "set" : { - "id" : 260, - "size" : 2, - "states" : [9] - }, - "dbus" : "/xyz/openbmc_project/state/chassis0" - }] - }] -} diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json b/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json deleted file mode 100755 index cf20e3e31..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "entries":[ - { - "attribute_name":"pvm-fw-boot-side", - "possible_values":[ - "Perm", - "Temp" - ], - "default_values":[ - "Perm" - ] - }, - { - "attribute_name":"pvm-os-boot-side", - "possible_values":[ - "Perm", - "Temp" - ], - "default_values":[ - "Perm" - ] - }, - { - "attribute_name":"pvm-inband-code-update", - "possible_values":[ - "Allowed", - "Not Allowed" - ], - "default_values":[ - "Allowed" - ] - }, - { - "attribute_name":"pvm-surveillance", - "possible_values":[ - "Disabled", - "Enabled" - ], - "default_values":[ - "Enabled" - ] - }, - { - "attribute_name":"pvm-pcie-error-inject", - "possible_values":[ - "Disabled", - "Enabled" - ], - "default_values":[ - "Enabled" - ] - } - ] -} diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json b/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json deleted file mode 100755 index 9d9750a58..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "path":"/var/lib/pldm/PHYP-NVRAM", - "file_traits":1 - }, - { - "path":"/var/lib/pldm/PHYP-NVRAM-CKSUM", - "file_traits":4 - } -] diff --git a/meta-ibm/recipes-phosphor/pldm/pldm/host_eid b/meta-ibm/recipes-phosphor/pldm/pldm/host_eid deleted file mode 100644 index ec635144f..000000000 --- a/meta-ibm/recipes-phosphor/pldm/pldm/host_eid +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index 1d6042027..32809764b 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -1,18 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - PACKAGECONFIG += "oem-ibm" PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools" -SRC_URI += "file://fileTable.json" -SRC_URI += "file://enum_attrs.json" -SRC_URI += "file://11.json" -SRC_URI += "file://host_eid" - -do_install_append() { - install -d ${D}${datadir}/pldm/bios/ - install -d ${D}${datadir}/pldm/pdr/ - install -m 0644 ${WORKDIR}/fileTable.json ${D}${datadir}/pldm/ - install -m 0644 ${WORKDIR}/enum_attrs.json ${D}${datadir}/pldm/bios/ - install -m 0644 ${WORKDIR}/11.json ${D}${datadir}/pldm/pdr/ - install -m 0644 ${WORKDIR}/host_eid ${D}${datadir}/pldm/ -} +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}" |