[Subtree] Bring openbmc machines to top level

The new subtree model brings the subtrees up from the openbmc-machines
layer.

Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

8 files changed, 0 insertions, 130 deletions

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs.inc b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs.inc
deleted file mode 100644
index f144884aa..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Tools for manipulating FFS flash images."
-DESCRIPTION = "FFS is the FSP Flash File Structure which is also currently \
-used on OpenPOWER machines for the flash layout."
-
-HOMEPAGE = "https://github.com/open-power/ffs"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-inherit autotools pkgconfig
-
-ALLOW_EMPTY_${PN} = "1"
-PACKAGE_BEFORE_PN += "${PN}-ecc ${PN}-deprecated"
-
-FILES_${PN}-ecc = "${bindir}/ecc"
-FILES_${PN}-deprecated = "${bindir}"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb
deleted file mode 100644
index 2340121bd..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ffs.inc
-
-PV = "v0.1.0+git${SRCPV}"
-
-SRCREV = "3ec70fbc458e32eef0d0b1de79688b4dc48cbd57"
-SRC_URI += "git://github.com/open-power/ffs.git"
-
-S = "${WORKDIR}/git"
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
deleted file mode 100644
index b6fed556a..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-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/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch
deleted file mode 100644
index dba62e3fe..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg/0001-CFAM-reg-0x2918-access-hack.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e21d90ae8c131eae9d78e3d06f29cab55c952884 Mon Sep 17 00:00:00 2001
-From: Matt Spinler <spinler@us.ibm.com>
-Date: Thu, 19 Jan 2017 09:06:48 -0600
-Subject: [PATCH] CFAM reg 0x2918 access hack
-
----
- libpdbg/bmcfsi.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/libpdbg/bmcfsi.c b/libpdbg/bmcfsi.c
-index 64dbd69..f763f2a 100644
---- a/libpdbg/bmcfsi.c
-+++ b/libpdbg/bmcfsi.c
-@@ -247,7 +247,16 @@ static uint64_t fsi_abs_ar(uint32_t addr, int read)
- 	/* Reformat the address. I'm not sure I fully understand this
- 	 * yet but we basically shift the bottom byte and add 0b01
- 	 * (for the write word?) */
--       	addr = ((addr & 0x1fff00) | ((addr & 0xff) << 2)) << 1;
-+
-+    /* Hack: this shifting doesn't work for all addresses, but it does
-+     * work for 2918 and (and 2nd chip 2918) so use it just for that */
-+    if ((addr == 0x2918) || (addr == 0x102918)) {
-+        addr = ((addr & 0x1ffe00) | ((addr & 0x1ff) << 2)) << 1;
-+    }
-+    else {
-+        addr = ((addr & 0x1fff00) | ((addr & 0xff) << 2)) << 1;
-+    }
-+
- 	addr |= 0x3;
- 	addr |= slave_id << 26;
- 	addr |= (0x8ULL | !!(read)) << 22;
--- 
-2.11.0
-
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg_1.0.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg_1.0.bb
deleted file mode 100644
index 4d48a0ddf..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg_1.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY     = "PowerPC FSI Debugger"
-DESCRIPTION = "pdbg allows JTAG-like debugging of the host POWER processors"
-LICENSE     = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI += "git://github.com/open-power/pdbg.git;branch=master"
-SRCREV = "3f1c06d62f81dfbfbb1723d15a6ff3c2f23708f1"
-
-DEPENDS += "dtc-native"
-
-S = "${WORKDIR}/git"
-
-inherit autotools
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/gard.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/gard.bb
deleted file mode 100644
index 214e905ef..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/gard.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SUMMARY = "gard record tool for OpenPower"
-DESCRIPTION = "gard record tool for OpenPower machines"
-
-require skiboot.inc
-EXTRA_OEMAKE_append = " PFLASH_VERSION=${PV} GARD_VERSION=${PV}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/pflash.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/pflash.bb
deleted file mode 100644
index 05aa2fcca..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/pflash.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SUMMARY = "pflash programmer for OpenPower"
-DESCRIPTION = "pflash firmware programming tool for OpenPower machines"
-
-require skiboot.inc
-EXTRA_OEMAKE_append = " PFLASH_VERSION=${PV} LINKAGE=dynamic"
-
-#TODO: openbmc/openbmc#1361 - Fix GNU_HASH warnings in pflash
-TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
deleted file mode 100644
index 169b207b7..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-HOMEPAGE = "https://github.com/open-power"
-LICENSE = "Apache-2.0"
-
-SRC_URI += "git://github.com/open-power/skiboot.git;nobranch=1"
-
-FILESEXTRAPATHS_append := "${THISDIR}/skiboot:"
-
-LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRCREV = "452998f4be5973d8884e3db5aa362bf40e11467a"
-PV = "v6.1"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SKIBOOT_VERSION=${PV} V=1"
-
-SKIBOOT_SUBDIR ?= "external/${PN}"
-
-do_compile() {
-    oe_runmake -C ${SKIBOOT_SUBDIR} all
-}
-
-# TODO: remove PREFIX=$prefix when updating to a version that has
-# http://patchwork.ozlabs.org/patch/923741/ is merged upstream
-do_install() {
-    oe_runmake -C ${SKIBOOT_SUBDIR} install DESTDIR=${D} prefix=/usr PREFIX=$prefix
-}