diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-23 04:40:54 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 19:39:42 +0300 |
commit | 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c (patch) | |
tree | 823835cd29daf8901a31ac14c7e6534abf199be3 /meta-ibm/meta-witherspoon/conf | |
parent | 4feb727cd6b77a68bdaca63e121b378d814f5eaf (diff) | |
download | openbmc-194ff4f1f5d44b12e9cb06ddafa6adb20174a13c.tar.xz |
[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>
Diffstat (limited to 'meta-ibm/meta-witherspoon/conf')
6 files changed, 106 insertions, 0 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample new file mode 100644 index 000000000..3f18f5434 --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample @@ -0,0 +1,35 @@ +# 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-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + ##OEROOT##/meta-ibm/meta-witherspoon \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + ##OEROOT##/meta-ibm/meta-witherspoon \ + " diff --git a/meta-ibm/meta-witherspoon/conf/conf-notes.txt b/meta-ibm/meta-witherspoon/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf new file mode 100644 index 000000000..f24a74b01 --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf @@ -0,0 +1,5 @@ +require conf/distro/include/phosphor-base.inc +require conf/distro/include/phosphor-ubi.inc +require conf/distro/include/openpower-mrw.inc +require conf/distro/include/openpower-ubi.inc +require conf/distro/include/openpower-distrovars.inc diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf new file mode 100644 index 000000000..6ea504177 --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/layer.conf @@ -0,0 +1,10 @@ +# 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 += "witherspoon" +BBFILE_PATTERN_witherspoon = "" +LAYERSERIES_COMPAT_witherspoon = "sumo" diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample new file mode 100644 index 000000000..ca640ce56 --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/local.conf.sample @@ -0,0 +1,21 @@ +MACHINE ??= "witherspoon" +DISTRO ?= "openbmc-witherspoon" +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-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf new file mode 100644 index 000000000..1ccd1cf5a --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -0,0 +1,33 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +KERNEL_FEATURES_append = " phosphor-wdt-on-panic" + +UBOOT_MACHINE = "ast_g5_ncsi_config" + +OBMC_POWER_SUPPLY_INSTANCES = "0 1" + +PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/ibm.inc +require conf/machine/include/p9.inc + +PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" +PHOSPHOR_MRW_REV = "6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181" + +# Inhibit phosphor-hwmon-config-mrw +VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" + +# Pick up the Witherspoon-specific IPMI configuration +VIRTUAL-RUNTIME_ipmi-config = "witherspoon-ipmi-config" + +# Inhibit phosphor-fan-presence-mrw-native +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ + "phosphor-fan-presence-config-native" + +# Inhibit phosphor-fan-control-fan-config-mrw-native +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ + "phosphor-fan-control-fan-config-native" + +PREFERRED_RPROVIDER_virtual/phosphor-ipmi-config = "witherspoon-ipmi-config" |