diff options
| author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
| commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
| tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-phosphor/conf | |
| parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
| parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
| download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz | |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-phosphor/conf')
4 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-aspeed-spi-master-mode.inc b/meta-phosphor/conf/distro/include/phosphor-aspeed-spi-master-mode.inc new file mode 100644 index 000000000..9c1b48945 --- /dev/null +++ b/meta-phosphor/conf/distro/include/phosphor-aspeed-spi-master-mode.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "obmc-aspeed-spi-master" +DISTROOVERRIDES .= ":df-aspeed-spi-master" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 731f9f11f..64f293cf0 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -110,10 +110,6 @@ DISTRO_FEATURES += " \ ${DISTRO_FEATURES_OBMC} \ " -MACHINE_FEATURES += " \ - ${OBMC_MACHINE_FEATURES} \ - " - DISTRO_EXTRA_RDEPENDS:remove:qemuarm = "packagegroup-core-device-devel" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 8673a15c1..948a09051 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -97,8 +97,6 @@ VIRTUAL-RUNTIME_obmc-dump-manager ?= "phosphor-debug-collector-manager" # Provide support for monitoring BMC core dumps VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" - # phosphor-hwmon-config # # The phosphor-hwmon package can have its configuration generated diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc new file mode 100644 index 000000000..0d41a1b97 --- /dev/null +++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc @@ -0,0 +1,4 @@ +# EVB systems have different packages they can support, due to not having a +# managed host. Enable this machine override to allow other recipes to know +# that the machine is a special type. +MACHINEOVERRIDES =. "phosphor-evb:" |