diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-08-02 02:10:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-02 02:10:54 +0300 |
commit | 25ad46338e5990f081ef280429a5fc8ada5735be (patch) | |
tree | 4c0e3cb32dc80f80460bdbf82ff6d401d4ff194f /meta-facebook | |
parent | 43a183cc0926da36e3a218efa02ab4838ace316f (diff) | |
parent | d0f63ef62c76c932a2003eaa42c0b250065ae06f (diff) | |
download | openbmc-25ad46338e5990f081ef280429a5fc8ada5735be.tar.xz |
Merge pull request #14 from Intel-BMC/update4
Update4
Diffstat (limited to 'meta-facebook')
5 files changed, 31 insertions, 1 deletions
diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb index 7c0663ab6..7f2ecf6a8 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "1b6fae3f3a3d0cd4e1c813a492e19d7edb55b4e9" +SRCREV = "1744cb3adedb262302df60d7beb3feb55f89f474" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb index 22eab9905..b6693e086 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb @@ -19,4 +19,5 @@ RDEPENDS_${PN}-system = " \ fb-powerctrl \ phosphor-ipmi-ipmb \ fb-ipmi-oem \ + phosphor-pid-control \ " diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 000000000..b70a42957 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +EXTRA_OECONF_append_tiogapass = " --enable-configure-dbus=yes" diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json new file mode 100644 index 000000000..03f284e47 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json @@ -0,0 +1,18 @@ +{ + "channels": [ + { + "type": "me", + "master-path": "/dev/i2c-4", + "slave-path": "/sys/bus/i2c/devices/4-1010/slave-mqueue", + "bmc-addr": 32, + "remote-addr": 44 + }, + { + "type": "ipmb", + "master-path": "/dev/i2c-9", + "slave-path": "/sys/bus/i2c/devices/9-1010/slave-mqueue", + "bmc-addr": 32, + "remote-addr": 96 + } + ] +} diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend new file mode 100644 index 000000000..b3205affa --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" + +SRC_URI_append_tiogapass = " file://ipmb-channels.json" + +do_install_append_tiogapass(){ + install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ + ${D}/usr/share/ipmbbridge +} |