From 997e7367d0917e91910386b83737e1cece7c058e Mon Sep 17 00:00:00 2001 From: Xo Wang Date: Mon, 22 Aug 2016 15:41:17 -0700 Subject: Add Zaius machine under meta-ingrasys. Zaius is a P9 system announced at the 2016 OpenPOWER Summit. This uses samples.inc for phosphor feature selection as skeleton does not yet have configs for Zaius. Signed-off-by: Xo Wang Change-Id: I9aa35304251ce62660115d5f2ebc9c6a829fceec --- .../meta-openpower/meta-ingrasys/conf/layer.conf | 5 ++++ .../conf/machine/include/ingrasys.inc | 1 + .../meta-zaius/conf/bblayers.conf.sample | 27 ++++++++++++++++++++++ .../meta-ingrasys/meta-zaius/conf/conf-notes.txt | 2 ++ .../meta-ingrasys/meta-zaius/conf/layer.conf | 9 ++++++++ .../meta-zaius/conf/local.conf.sample | 21 +++++++++++++++++ .../meta-zaius/conf/machine/zaius.conf | 8 +++++++ .../meta-ingrasys/meta-zaius/recipes.txt | 1 + 8 files changed, 74 insertions(+) create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/layer.conf create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/machine/include/ingrasys.inc create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/conf-notes.txt create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/layer.conf create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf create mode 100644 meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes.txt (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/layer.conf new file mode 100644 index 000000000..329067371 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/layer.conf @@ -0,0 +1,5 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +BBFILE_COLLECTIONS += "ingrasys" +BBFILE_PATTERN_ingrasys = "" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/machine/include/ingrasys.inc b/meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/machine/include/ingrasys.inc new file mode 100644 index 000000000..e7f221305 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/conf/machine/include/ingrasys.inc @@ -0,0 +1 @@ +require conf/machine/include/sample.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample new file mode 100644 index 000000000..1d3b5e41a --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -0,0 +1,27 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "6" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ + ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \ + ##OEROOT##/meta-openbmc-machines/meta-openpower \ + ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \ + ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ + ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \ + ##OEROOT##/meta-openbmc-machines/meta-openpower \ + ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys \ + ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius \ + " diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/layer.conf new file mode 100644 index 000000000..12e9f7eff --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/layer.conf @@ -0,0 +1,9 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "zaius" +BBFILE_PATTERN_zaius = "" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample new file mode 100644 index 000000000..f0fa56b1e --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/local.conf.sample @@ -0,0 +1,21 @@ +MACHINE ??= "zaius" +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" +EXTRA_USERS_PARAMS = " \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf new file mode 100644 index 000000000..f342da70a --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -0,0 +1,8 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" + +UBOOT_MACHINE = "ast_g5_ncsi_config" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/ingrasys.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes.txt b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes.txt new file mode 100644 index 000000000..c58366847 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes.txt @@ -0,0 +1 @@ +recipes-phosphor - Phosphor OpenBMC applications and configuration -- cgit v1.2.1