summaryrefslogtreecommitdiff
path: root/meta-ampere
diff options
context:
space:
mode:
authorThang Tran <thuutran@amperecomputing.com>2022-07-01 05:08:52 +0300
committerThang Q. Nguyen <thang@os.amperecomputing.com>2022-07-03 04:26:50 +0300
commit09ce09cd02b3f20b90d7eead0af6b5ad17659a29 (patch)
tree6bb9d4560919ebd67b58c644f51eed31a64eb570 /meta-ampere
parent6ebc9fc0d1c961c3912a884edb76037d02b27c16 (diff)
downloadopenbmc-09ce09cd02b3f20b90d7eead0af6b5ad17659a29.tar.xz
meta-ampere: mtjade: fru: remove redundant dimm0/1, cpu0/1
When running "ipmitool fru print" command, the output shows dimm0/1, cpu0/1 without data. This is from the host-ipmid which uses default configuration file to handle "Get SDR"/"Get Device SDR" command, including DIMM0/1, CPU0/1. This commit configures to use mtjade-ipmi-fru.yaml file so that correct FRU information is displayed, preventing the DIMM0/1, CPU0/1 to be reported. Tested: - Check fru information. $ ipmitool fru print --> Console does not display DIMM0/1, CPU0/1 data. FRU data is displayed. Signed-off-by: Thang Tran <thuutran@amperecomputing.com>a Change-Id: Ibd18bfd5656676ccef70608dd5f78b93ab8432fc
Diffstat (limited to 'meta-ampere')
-rw-r--r--meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb4
-rw-r--r--meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend5
2 files changed, 7 insertions, 2 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
index 376ebc075e..06046c30ce 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
@@ -6,6 +6,7 @@ inherit allarch
SRC_URI = " \
file://mtjade-ipmi-sensors.yaml \
+ file://mtjade-ipmi-fru.yaml \
"
S = "${WORKDIR}"
@@ -13,10 +14,13 @@ S = "${WORKDIR}"
do_install() {
install -m 0644 -D mtjade-ipmi-sensors.yaml \
${D}${datadir}/${BPN}/ipmi-sensors.yaml
+ install -m 0644 -D mtjade-ipmi-fru.yaml \
+ ${D}${datadir}/${BPN}/ipmi-fru-read.yaml
}
FILES:${PN}-dev = " \
${datadir}/${BPN}/ipmi-sensors.yaml \
+ ${datadir}/${BPN}/ipmi-fru-read.yaml \
"
ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index d8d2390bba..283b5065f3 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,8 +1,9 @@
FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
-DEPENDS:append = " ${MACHINE}-yaml-config"
+DEPENDS:append = " mtjade-yaml-config"
EXTRA_OEMESON = " \
- -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \
+ -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors.yaml \
+ -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
"