From af04d19514726cead1f7cfbaa5731a737d132f0d Mon Sep 17 00:00:00 2001 From: Alvin Wang Date: Wed, 28 Aug 2019 15:18:15 +0800 Subject: Add Mihawk mac address sync (From meta-ibm rev: effd83bdc65d9ae8f9d000205f8d55e0c29557e4) Change-Id: I5d8fb1cd15e0b0bf2c2360631be8f259f42be98f Signed-off-by: Alvin Wang Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/mihawk.conf | 5 ++++- .../images/obmc-phosphor-image.bbappend | 2 +- .../network/first-boot-set-mac_%.bbappend | 1 + .../vpd/mihawk-openpower-fru-inventory-native.bb | 19 +++++++++++++++++++ .../vpd/mihawk-openpower-fru-inventory/inventory | 3 +++ .../vpd/mihawk-openpower-fru-vpd-layout-native.bb | 20 ++++++++++++++++++++ .../vpd/mihawk-openpower-fru-vpd-layout/layout.yaml | 17 +++++++++++++++++ 7 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf index 53a9f5b9c..7a6fd8778 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf @@ -7,6 +7,7 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' +PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "mihawk-openpower-fru-vpd-layout-native" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc @@ -36,4 +37,6 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \ "mihawk-led-manager-config-native" -PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native" \ No newline at end of file +PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native" + +PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw = "mihawk-openpower-fru-inventory-native" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index 199d2c465..c66cc4efc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,2 +1,2 @@ OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname" -OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller" +OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend index cb167ee3f..fc8f6b861 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend @@ -1 +1,2 @@ SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " first-boot-set-mac@eth0.service" +SYSTEMD_SERVICE_${PN}_append_mihawk = " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service" \ No newline at end of file diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb new file mode 100644 index 000000000..e868fe99b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Mihawk Inventory config for openpower-vpd-parser" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit openpower-fru-vpd + +SRC_URI += "file://inventory" + +PROVIDES += "virtual/openpower-fru-inventory" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${inventory_datadir_native} + install -d ${DEST} + install inventory ${DEST} +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory new file mode 100644 index 000000000..5ae35ff9b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory @@ -0,0 +1,3 @@ +FRUS=ETHERNET,ETHERNET1 +PATHS=/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1 +EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0050/eeprom diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb new file mode 100644 index 000000000..0b9d6a785 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb @@ -0,0 +1,20 @@ +SUMMARY = "Mihawk VPD layout for openpower-fru-vpd" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit native +inherit openpower-fru-vpd + +SRC_URI += "file://layout.yaml" + +PROVIDES += "virtual/openpower-fru-vpd-layout" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${vpdlayout_datadir} + + install -d ${DEST} + install layout.yaml ${DEST} +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml new file mode 100644 index 000000000..5bceb2f72 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml @@ -0,0 +1,17 @@ +BMC: + xyz.openbmc_project.Inventory.Decorator.Asset: + OPFR,VP: PartNumber + OPFR,VS: SerialNumber + OPFR,VN: Manufacturer + xyz.openbmc_project.Inventory.Item: + VINI,DR: PrettyName + xyz.openbmc_project.Inventory.Item.Bmc: +ETHERNET: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + VINI,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: +ETHERNET1: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + OPFR,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: + -- cgit v1.2.3