diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2020-05-01 19:13:39 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-06 23:42:28 +0300 |
commit | 3fa06b6de94f5527f4277055445f21e2bfe73b9b (patch) | |
tree | 4e636d5fda6430d224d02c4e45bde327f6a219e3 /meta-facebook/meta-yosemitev2/conf/machine | |
parent | d0183da9a284b01300ae62d2f50e7e80262bf6a8 (diff) | |
download | openbmc-3fa06b6de94f5527f4277055445f21e2bfe73b9b.tar.xz |
meta-facebook: restructure phosphor default-virtuals
Due to our structure and missing RPROVIDES we were picking up
old python-based implementations of some daemons. Restructure
our conf and package group files to look more like meta-intel,
and point to the proper implementations of services.
(From meta-facebook rev: fbe12f7a42a592be01e2ced7215705ad5261e529)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I0995a3d80604f71900222983574f3b29d418fe1b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-facebook/meta-yosemitev2/conf/machine')
-rw-r--r-- | meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index d37fc56dd..97da01fb0 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -3,22 +3,11 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" UBOOT_MACHINE = "ast_g5_ncsi_config" +require conf/machine/include/facebook.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc SERIAL_CONSOLES = "57600;ttyS4" -OBMC_MACHINE_FEATURES += "\ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ - " PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" FLASH_SIZE = "32768" -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" - |