diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-core')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb | 2 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb | 2 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh | 14 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb | 8 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 2 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb | 7 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb | 2 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend (renamed from meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf.bbappend) | 0 |
8 files changed, 26 insertions, 11 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb index 0cf8ed0f0..4b445ce0f 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb @@ -13,7 +13,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir" SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "e3ef64c6427f7be7c9cd6aa4cd696dd5c33f5085" +SRCREV = "71a38355f46ee52620be7304c3712a47c00dad1e" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service" diff --git a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb index 170412e0c..1d2a6e9df 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb @@ -11,7 +11,7 @@ LICENSE = "CLOSED" LIC_FILES_CHKSUM = "" SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "e3ef64c6427f7be7c9cd6aa4cd696dd5c33f5085" +SRCREV = "71a38355f46ee52620be7304c3712a47c00dad1e" S = "${WORKDIR}/git/cpu-log-util" PACKAGES += "libpeci" diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh index 5a2637ba3..dd3b7f69a 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh +++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh @@ -84,6 +84,18 @@ if [ $? -ne 0 ]; then exit 1 fi +#this file being created at build time for PFR images +#TODO: Need to do runtime detection of PFR platform +#TODO: Also to check if PFR is provisioned or not +if [ -e /usr/share/pfr ] +then +TGT="/dev/mtd/image-stg" +echo "Updating $(basename $TGT)" +flash_erase $TGT 0 0 +echo "Writing $(stat -c "%s" "$LOCAL_PATH") bytes" +cat "$LOCAL_PATH" > "$TGT" +#TODO: Add I2C command to write to PFRCPLD about BMC update intent. +else # guess based on fw_env which partition we booted from BOOTADDR=$(fw_printenv bootcmd | awk '{print $2}') @@ -101,4 +113,4 @@ fw_setenv "bootcmd" "bootm ${BOOTADDR}" # reboot reboot - +fi diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb b/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb index ac8e58c03..08d0057ef 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb @@ -11,12 +11,20 @@ RDEPENDS_intel-fw-update += "dosfstools parted" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +PFR_EN = "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'pfr', '', d)}" SRC_URI += "file://fwupd.sh" SRC_URI += "file://usb-ctrl" +FILES_${PN} += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', '${datadir}/pfr', '', d)}" + do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/fwupd.sh ${D}${bindir} install -m 0755 ${WORKDIR}/usb-ctrl ${D}${bindir} + + if [ "${PFR_EN}" = "pfr" ]; then + install -d ${D}${datadir} + touch ${D}${datadir}/pfr + fi } diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index e0f4d5d2b..8e06bcbf2 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -1,2 +1,2 @@ SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "7944c3072287a3833a29283aafa8650a31cd4ce7" +SRCREV = "acc8a4ebf38231765175fe30a075c62643983748" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb index c23da6df2..39bf2b966 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb @@ -2,7 +2,7 @@ SUMMARY = "Intel IPMI Providers" DESCRIPTION = "IPMI Provider Libraries" SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" -SRCREV = "bbb45687fc2993980ac95117d8503ee6c2358965" +SRCREV = "91d0178dc4fe513cdfd0e3d52e5eb41193b2bf57" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" @@ -30,8 +30,3 @@ FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" -do_configure_prepend() { - cp -r ${WORKDIR}/recipe-sysroot${libdir}/phosphor-ipmi-host ${S} - cp -r ${WORKDIR}/recipe-sysroot${includedir}/phosphor-ipmi-host ${S} - cp -r ${WORKDIR}/recipe-sysroot${includedir}/intel-ipmi-oem ${S} -} diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb index dec71e0d6..71909e69c 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh" DEPENDS = "boost sdbusplus cpu-log-util" PV = "0.1+git${SRCPV}" -SRCREV = "f4d4bfc3296cb27feb17aa5d1d93b3061b56ce10" +SRCREV = "785f19b128794611574ea6c18805740fb851ecff" S = "${WORKDIR}/git/peci_pcie" diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend index 8f26d784b..8f26d784b 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd-conf_%.bbappend |