From 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c Mon Sep 17 00:00:00 2001
From: Dave Cobbley <david.j.cobbley@linux.intel.com>
Date: Wed, 22 Aug 2018 21:40:54 -0400
Subject: [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>
---
 meta-ibm/meta-z/conf/bblayers.conf.sample | 25 +++++++++++++++++++++++++
 meta-ibm/meta-z/conf/conf-notes.txt       |  2 ++
 meta-ibm/meta-z/conf/layer.conf           |  5 +++++
 meta-ibm/meta-z/conf/local.conf.sample    | 18 ++++++++++++++++++
 meta-ibm/meta-z/conf/machine/ibm-z.conf   | 13 +++++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 meta-ibm/meta-z/conf/bblayers.conf.sample
 create mode 100644 meta-ibm/meta-z/conf/conf-notes.txt
 create mode 100644 meta-ibm/meta-z/conf/layer.conf
 create mode 100644 meta-ibm/meta-z/conf/local.conf.sample
 create mode 100644 meta-ibm/meta-z/conf/machine/ibm-z.conf

(limited to 'meta-ibm/meta-z')

diff --git a/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-ibm/meta-z/conf/bblayers.conf.sample
new file mode 100644
index 000000000..5dbab8590
--- /dev/null
+++ b/meta-ibm/meta-z/conf/bblayers.conf.sample
@@ -0,0 +1,25 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "8"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-openembedded/meta-oe/   \
+  ##OEROOT##/meta-openembedded/meta-filesystems/   \
+  ##OEROOT##/meta-openembedded/meta-networking/   \
+  ##OEROOT##/meta-openembedded/meta-python/   \
+  ##OEROOT##/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-ibm/meta-fsp2 \
+  ##OEROOT##/meta-openpower \
+  ##OEROOT##/meta-ibm \
+  ##OEROOT##/meta-ibm/meta-z \
+"
+BBLAYERS_NON_REMOVABLE ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  "
diff --git a/meta-ibm/meta-z/conf/conf-notes.txt b/meta-ibm/meta-z/conf/conf-notes.txt
new file mode 100644
index 000000000..9b3c01a55
--- /dev/null
+++ b/meta-ibm/meta-z/conf/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+     obmc-phosphor-image
diff --git a/meta-ibm/meta-z/conf/layer.conf b/meta-ibm/meta-z/conf/layer.conf
new file mode 100644
index 000000000..790dc69e8
--- /dev/null
+++ b/meta-ibm/meta-z/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "ibm-z"
+BBFILE_PATTERN_ibm-z = ""
diff --git a/meta-ibm/meta-z/conf/local.conf.sample b/meta-ibm/meta-z/conf/local.conf.sample
new file mode 100644
index 000000000..988416f1a
--- /dev/null
+++ b/meta-ibm/meta-z/conf/local.conf.sample
@@ -0,0 +1,18 @@
+MACHINE ??= "ibm-z"
+DISTRO ?= "openbmc-phosphor"
+PACKAGE_CLASSES ?= "package_rpm"
+SANITY_TESTED_DISTROS_append ?= " *"
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+CONF_VERSION = "1"
+INHERIT += "extrausers"
diff --git a/meta-ibm/meta-z/conf/machine/ibm-z.conf b/meta-ibm/meta-z/conf/machine/ibm-z.conf
new file mode 100644
index 000000000..90765bd2b
--- /dev/null
+++ b/meta-ibm/meta-z/conf/machine/ibm-z.conf
@@ -0,0 +1,13 @@
+MACHINE = "ibm-z"
+KERNEL_DEVICETREE = "fsp2.dtb"
+KBUILD_DEFCONFIG = "44x/fsp2_defconfig"
+
+require conf/machine/include/fsp2.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/ibm.inc
+
+#dummy uboot settings
+UBOOT_MACHINE_sunray2 = "mpc8308_p1m_defconfig"
+UBOOT_ENTRYPOINT = "0x0"
+UBOOT_LOADADDRESS = "0x0"
+
-- 
cgit v1.2.3