diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-fii/meta-kudo/recipes-kudo | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-fii/meta-kudo/recipes-kudo')
6 files changed, 10 insertions, 7 deletions
diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb index c5a4328ae..c0793adf6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb +++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb @@ -15,7 +15,7 @@ EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" LIBRARY_NAMES = "libfiioemcmds.so" SRC_URI = "git://github.com/openbmc/foxconn-ipmi-oem.git" -SRCREV = "163226efd02b91994aaa474005979560965ac3d6" +SRCREV = "35c1ac40e476caa19c84a546d4f85ba96cb5dbbd" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh index 498fe7d0a..e0697b906 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh @@ -1,5 +1,5 @@ - #!/bin/bash + BMC_CPLD_VER_FILE="/run/cpld0.version" MB_CPLD_VER_FILE="/run/cpld1.version" ver='' @@ -25,4 +25,4 @@ echo "BMC CPLD version : ${ver}" echo "${ver}" > "${BMC_CPLD_VER_FILE}" fw_rev cpldm echo "MB CPLD version : ${ver}" -echo "${ver}" > "${MB_CPLD_VER_FILE}"
\ No newline at end of file +echo "${ver}" > "${MB_CPLD_VER_FILE}" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh index 1ef73cc13..d103747b2 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh @@ -41,6 +41,8 @@ function fwbios() { dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img fwscp /run/initramfs/myscp.img fi + # Disable LPI mode NV_SI_CPU_LPI_FREQ_DISABLE. + nvparm -s 0x1 -o 0x114090 rm -f $1 } diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb index 8d2fb1324..2c82ac8f6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb @@ -1,6 +1,5 @@ SUMMARY = "Phosphor OpenBMC Kudo SCP Firmware Upgrade Command" DESCRIPTION = "Phosphor OpenBMC Kudo SCP Firmware Upgrade Comman Daemon" -FILESEXTRAPATHS_prepend := "${THISDIR}/kudo-scp-update:" PR = "r1" LICENSE = "Apache-2.0" diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service index 14c14d480..54c7c7aa1 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service @@ -1,5 +1,7 @@ [Unit] Description = Host Power Control Sequence +Wants=ssifbridge.service +After=ssifbridge.service [Service] Restart=no diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index 41a345d8e..07d038024 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -1,4 +1,4 @@ -SUMMARY = "OpenBMC for KUDO system - Applications" +SUMMARY = "OpenBMC for kudo system - Applications" PR = "r1" inherit packagegroup @@ -17,7 +17,7 @@ RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" -SUMMARY_${PN}-kudo-system = "KUDO System" +SUMMARY_${PN}-kudo-system = "kudo System" RDEPENDS_${PN}-kudo-system = " \ ipmitool \ ethtool \ @@ -34,7 +34,7 @@ RDEPENDS_${PN}-kudo-system = " \ kudo-cmd \ " -SUMMARY_${PN}-kudo-fw = "KUDO Firmware" +SUMMARY_${PN}-kudo-fw = "kudo Firmware" RDEPENDS_${PN}-kudo-fw = " \ kudo-fw \ kudo-bios-update \ |