diff options
author | Edward A. James <eajames@us.ibm.com> | 2017-06-23 17:21:03 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-15 19:46:48 +0000 |
commit | 8bcbb91411d3eea942eba23c460c075f447ca582 (patch) | |
tree | 698b0976ddb65c8930dfe464a279323e5327e790 /meta-openbmc-machines | |
parent | 06a010f1c36602b4e644d3031b8e24eda147e0f9 (diff) | |
download | talos-openbmc-8bcbb91411d3eea942eba23c460c075f447ca582.tar.gz talos-openbmc-8bcbb91411d3eea942eba23c460c075f447ca582.zip |
Add fsidbg tool. Remove iicmaster.
iicmaster no longer works with the (soon to be) upstreamed FSI-based
I2C driver.
fsidbg is one tool to access FSI engines and perform client driver
operations, including SCOM, SBEFIFO, OCC, and I2C.
Change-Id: I1802977d1b812d42213b38462596ee49838cfd3b
Signed-off-by: Edward A. James <eajames@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
4 files changed, 19 insertions, 25 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb new file mode 100644 index 000000000..b6fed556a --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb @@ -0,0 +1,18 @@ +SUMMARY = "FSI debug tool" +DESCRIPTION = "fsidbg is a tool to access remote FSI engines and perform client driver operations" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI += "git://github.com/eddiejames/fsidbg.git" + +SRCREV = "dfe278065c877724242dfae15a4c627fd2e3611c" +PV = "git${SRCREV}" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 fsidbg ${D}${bindir} +} + +TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/iicmaster/iicmaster.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/iicmaster/iicmaster.bb deleted file mode 100644 index 2511e45d2..000000000 --- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/iicmaster/iicmaster.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "I2C debug tool" -DESCRIPTION = "iicmaster provides a debug interface for remote, FSI-based I2C engines" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" - -SRC_URI += "git://github.com/eddiejames/iicmaster.git" - -SRCREV = "b71dbf99af495a631dc5f3564296903667bc516c" -PV = "git${SRCREV}" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${bindir} - install -m 0755 iicmaster ${D}${bindir} -} - -#TODO: openbmc/openbmc#1362 - Fix GNU_HASH warnings in iic2master -TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index f794e6a57..91c6b03a9 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,11 +1,5 @@ RDEPENDS_${PN}-extrasdev += "obmc-pydevtools" -# Add the iicmaster debug tool to p9 systems. iicmaster is for fsi-based i2c -# engines. This is a temporary addition until proper kernel i2c driver is in -# place. Use p9-vcs-workaround to restrict iicmaster installtion to p9 systems -# that use openfsi -RDEPENDS_${PN}-extrasdev += "${@mf_enabled(d, 'p9-vcs-workaround', 'iicmaster')}" - # Add the deprecated /org/openbmc inventory namespace providing # obmc-mgr-inventory application to the inventory packagegroup # until all applications have been updated to use the new, diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend index e8d656a74..f4474e901 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend @@ -2,4 +2,5 @@ RDEPENDS_${PN}_append = " \ pflash \ gard \ pdbg \ + fsidbg \ " |