From d34e2ad521dd7026cfdfa4bc946dbe77dca0089b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <tpearson@raptorengineering.com>
Date: Fri, 19 Apr 2019 09:14:15 +0000
Subject: Move RCS specific layers to correct location for latest OpenBMC

---
 .../recipes-phosphor/host/ast-vga-disable.bb       | 33 ----------------------
 .../host/ast-vga-disable/ast-vga-disable-check     | 13 ---------
 .../host/ast-vga-disable/ast_vga_disable@.service  | 19 -------------
 3 files changed, 65 deletions(-)
 delete mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb
 delete mode 100755 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check
 delete mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service

(limited to 'meta-openbmc-machines/meta-openpower')

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb
deleted file mode 100644
index fc5b567be..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Talos II VGA Disable"
-DESCRIPTION = "Talos II power on VGA disable controller"
-PR = "r0"
-
-LICENSE = "LGPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
-                    file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \
-                    "
-
-inherit obmc-phosphor-systemd
-
-PROVIDES += 'virtual/talos-ast-vga-disable'
-RPROVIDES_${PN} += 'virtual-talos-ast-vga-disable'
-
-RDEPENDS_${PN} += "bash"
-
-S = "${WORKDIR}"
-SRC_URI += "file://ast-vga-disable-check"
-SRC_URI += "file://COPYING"
-SRC_URI += "file://COPYING.LESSER"
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 ${WORKDIR}/ast-vga-disable-check ${D}${bindir}/ast-vga-disable-check
-}
-
-TMPL = "ast_vga_disable@.service"
-INSTFMT = "ast_vga_disable@{0}.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check
deleted file mode 100755
index 31ed3dff7..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Copyright © 2018 Raptor Engineering, LLC
-
-FPGA_STATUS=$(i2cget -y 12 0x31 0x7)
-AST_VGA_DISABLE=$(( FPGA_STATUS & 0x40 ))
-if [[ $AST_VGA_DISABLE == 64 ]]; then
-	# On-board VGA disabled
-	devmem 0x1e6e207c 32 0x00008000
-else
-	# On-board VGA enabled
-	devmem 0x1e6e2070 32 0x00008000
-fi
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service
deleted file mode 100644
index 2e52c9e3c..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Apply ASpeed VGA disable setting on host%i
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%i.target
-Wants=fsi-scan@%i.service
-After=fsi-scan@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-ExecStart=/usr/bin/env /usr/bin/ast-vga-disable-check
-SyslogIdentifier=ast-vga-disable-check
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
-- 
cgit v1.2.1