diff options
Diffstat (limited to 'meta-phosphor/conf/distro/include')
3 files changed, 2 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 |