From 6d763a2b604e62a9a9644b620ac0a24d1e09f493 Mon Sep 17 00:00:00 2001 From: Duke Du Date: Mon, 25 Mar 2019 17:13:18 +0800 Subject: Quanta: configure fru parser Update fru information of project gsj and test on gsj board pass. (From meta-quanta rev: 4726abcab724b6e8a5abb5dca1603857a294ea97) Change-Id: I3efbc10722f956c7375e1513bb71a39186c12cdd Signed-off-by: Duke Du Signed-off-by: FranHsu Signed-off-by: Brad Bishop --- meta-quanta/meta-gsj/conf/machine/gsj.conf | 4 +- .../recipes-phosphor/ipmi/files/config.yaml | 72 ++++++++++++++++++++++ .../ipmi/gsj-channel-config/channel.yaml | 2 + .../ipmi/gsj-ipmi-channel-config-native.bb | 19 ++++++ .../ipmi/gsj-ipmi-fru-read-inventory-native.bb | 19 ++++++ .../ipmi/gsj-ipmi-inventory-map-native.bb | 19 ++++++ .../obmc/eeproms/system/chassis/bmc | 2 + .../obmc/eeproms/system/chassis/hsbp | 2 + .../ipmi/phosphor-ipmi-fru_%.bbappend | 20 ++++++ 9 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-channel-config/channel.yaml create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-channel-config-native.bb create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/hsbp create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend (limited to 'meta-quanta/meta-gsj') diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 96db9907b..e88e0583c 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -3,7 +3,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-npcm730-gsj.dtb" UBOOT_MACHINE = "PolegSVB_config" -FLASH_SIZE = "65536" +FLASH_SIZE = "32768" require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc @@ -23,3 +23,5 @@ OBMC_MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-gsj-apps" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "gsj-ipmi-inventory-map-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "gsj-ipmi-fru-read-inventory-native" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml new file mode 100644 index 000000000..b5d323f4e --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml @@ -0,0 +1,72 @@ +0x01: + /system: + entityID: 23 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product + /system/chassis: + entityID: 23 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product + /system/chassis/hsbp: + entityID: 16 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item.Board: +0x02: + /system/chassis/bmc: + entityID: 6 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + CustomField: + IPMIFruProperty: CustomField + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-channel-config/channel.yaml b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-channel-config/channel.yaml new file mode 100644 index 000000000..4e2a0a6fa --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-channel-config/channel.yaml @@ -0,0 +1,2 @@ +1: + ifName: eth0 diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-channel-config-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-channel-config-native.bb new file mode 100644 index 000000000..a4ad933d9 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-channel-config-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Quanta gsj IPMI Channel to if_name mapping." +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit phosphor-ipmi-host + +PROVIDES += "virtual/phosphor-ipmi-channel-config" + +SRC_URI += "file://channel.yaml" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${sensor_datadir} + install -d ${DEST} + install channel.yaml ${DEST}/channel.yaml +} diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb new file mode 100644 index 000000000..340955c1a --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "gsj inventory map for phosphor-ipmi-host" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit phosphor-ipmi-host + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${config_datadir} + install -d ${DEST} + install config.yaml ${DEST} +} diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..db3aaf20e --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "gsj IPMI to DBus Inventory mapping." +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${config_datadir} + install -d ${DEST} + install config.yaml ${DEST} +} diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc new file mode 100644 index 000000000..02f429851 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/10-0055/eeprom +FRUID=2 diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/hsbp b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/hsbp new file mode 100644 index 000000000..7a5056ae2 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/hsbp @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/9-0055/eeprom +FRUID=1 diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..0fb703bc0 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,20 @@ +inherit obmc-phosphor-systemd + +FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" + +EEPROM_NAMES = "hsbp bmc" + +EEPROMFMT = "system/chassis/{0}" +EEPROM_ESCAPEDFMT = "system-chassis-{0}" +EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" +EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" + +ENVFMT = "obmc/eeproms/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" + +TMPL = "obmc-read-eeprom@.service" +TGT = "${SYSTEMD_DEFAULT_TARGET}" +INSTFMT = "obmc-read-eeprom@{0}.service" +FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" + +SYSTEMD_LINK_${PN}_append_gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" -- cgit v1.2.1