diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-02-27 09:32:10 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-28 05:31:28 +0300 |
| commit | 569cde226985532f06532904f20d508802fb8d78 (patch) | |
| tree | 8dd47ca71d08b9276a34c39c14d0d76461c1484d /meta-ingrasys | |
| parent | a151a218d1a6978c9a86ca6d52d6d0ed9db14da1 (diff) | |
| download | openbmc-569cde226985532f06532904f20d508802fb8d78.tar.xz | |
meta-zaius: Remove mention of vcs-workaround
This was a P9 DD1 workaround. These systems are no longer supported and
are not found in the wild, so the workaround has been retired.
Zaius opted to use it's own application for vcs control. We can now add
that directly instead of overriding vcs workaround with vcs control.
(From meta-ingrasys rev: 721db18e94f400a0b81d4a92ad2336be76fe1a6d)
Signed-off-by: Joel Stanley <joel@jms.id.au>
Change-Id: I4e9b26e5791a9b1dc8a5de343e52d5859154330a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ingrasys')
3 files changed, 1 insertions, 6 deletions
diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 38713cdf8..26595fa3d 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -5,8 +5,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" FLASH_SIZE = "65536" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' - require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ingrasys.inc diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 597dff4ba..3ab36b1b4 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -6,9 +6,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -PROVIDES += 'virtual/p9-vcs-workaround' -RPROVIDES_${PN} += 'virtual-p9-vcs-workaround' - TMPL_OFF = "vcs-off@.service" TMPL_ON = "vcs-on@.service" INSTFMT_OFF = "vcs-off@{0}.service" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend index 23cdb8d7d..42f7117ae 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_append_zaius = ' avsbus-control' +RDEPENDS_${PN}_append_zaius = ' avsbus-control vcs-control' |