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-openpower/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-openpower/conf')
-rw-r--r-- | meta-openpower/conf/distro/include/openpower-distrovars.inc | 4 | ||||
-rw-r--r-- | meta-openpower/conf/distro/include/openpower-mrw.inc | 5 | ||||
-rw-r--r-- | meta-openpower/conf/distro/include/openpower-ubi.inc | 2 | ||||
-rw-r--r-- | meta-openpower/conf/distro/openbmc-openpower.conf | 2 | ||||
-rw-r--r-- | meta-openpower/conf/layer.conf | 11 | ||||
-rw-r--r-- | meta-openpower/conf/machine/include/openpower.inc | 34 | ||||
-rw-r--r-- | meta-openpower/conf/machine/include/p8.inc | 1 | ||||
-rw-r--r-- | meta-openpower/conf/machine/include/p9.inc | 2 |
8 files changed, 61 insertions, 0 deletions
diff --git a/meta-openpower/conf/distro/include/openpower-distrovars.inc b/meta-openpower/conf/distro/include/openpower-distrovars.inc new file mode 100644 index 0000000000..479e099fc6 --- /dev/null +++ b/meta-openpower/conf/distro/include/openpower-distrovars.inc @@ -0,0 +1,4 @@ +DISTRO_FEATURES += "openpower" +DISTRO_FEATURES_FILTER_NATIVE += "openpower" +DISTRO_FEATURES_FILTER_NATIVESDK += "openpower" +DISTROOVERRIDES .= ":df-openpower" diff --git a/meta-openpower/conf/distro/include/openpower-mrw.inc b/meta-openpower/conf/distro/include/openpower-mrw.inc new file mode 100644 index 0000000000..87f0fbf19e --- /dev/null +++ b/meta-openpower/conf/distro/include/openpower-mrw.inc @@ -0,0 +1,5 @@ +require conf/distro/include/phosphor-mrw.inc + +PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw ?= "openpower-fru-inventory-mrw-native" +PREFERRED_PROVIDER_virtual/openpower-fru-properties_df-mrw ?= "openpower-fru-properties-mrw-native" +PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native_df-mrw ?= "openpower-occ-control-config-mrw-native" diff --git a/meta-openpower/conf/distro/include/openpower-ubi.inc b/meta-openpower/conf/distro/include/openpower-ubi.inc new file mode 100644 index 0000000000..cb488c8302 --- /dev/null +++ b/meta-openpower/conf/distro/include/openpower-ubi.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "openpower-ubi-fs" +DISTROOVERRIDES .= ":df-openpower-ubi-fs" diff --git a/meta-openpower/conf/distro/openbmc-openpower.conf b/meta-openpower/conf/distro/openbmc-openpower.conf new file mode 100644 index 0000000000..5ee9b7c752 --- /dev/null +++ b/meta-openpower/conf/distro/openbmc-openpower.conf @@ -0,0 +1,2 @@ +require conf/distro/include/phosphor-base.inc +require conf/distro/include/openpower-distrovars.inc diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf new file mode 100644 index 0000000000..7b01b6c961 --- /dev/null +++ b/meta-openpower/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ + ${LAYERDIR}/common/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "openpower" +BBFILE_PATTERN_openpower = "^${LAYERDIR}/" +LAYERVERSION_openpower = "1" +LAYERSERIES_COMPAT_openpower = "sumo" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc new file mode 100644 index 0000000000..cbfe4fa0c9 --- /dev/null +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -0,0 +1,34 @@ +OBMC_MACHINE_FEATURES += "\ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-flash-mgmt \ + obmc-host-ipmi \ + obmc-host-ctl \ + obmc-host-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-bmc-state-mgmt \ + " + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" + +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" +PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" +PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" +PREFERRED_PROVIDER_virtual/openpower-fru-inventory ?= "openpower-fru-inventory-example-native" +PREFERRED_PROVIDER_virtual/openpower-fru-properties ?= "openpower-fru-properties-example-native" + +# The openpower-occ-control application is data-driven and requires an input +# yaml of OCC instance numbers to sensor IDs. +# This virtual is a native recipe that provides that mapping by installing +# configuration files in the format and native sysroot location expected by +# the openpower-occ-control build process in the native sysroot. +PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native ?= "openpower-occ-control-config-example-native" + +#Default value for power supply output power efficiency. +POWER_SUPPLY_DERATING_FACTOR = "90" diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc new file mode 100644 index 0000000000..b43045d5ae --- /dev/null +++ b/meta-openpower/conf/machine/include/p8.inc @@ -0,0 +1 @@ +OBMC_MACHINE_FEATURES += 'i2c-occ' diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc new file mode 100644 index 0000000000..b0e0bb95ee --- /dev/null +++ b/meta-openpower/conf/machine/include/p9.inc @@ -0,0 +1,2 @@ +OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi p9-cfam-override' +PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" |