From d34e2ad521dd7026cfdfa4bc946dbe77dca0089b Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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 ------------- .../cf-fsi-firmware/cf-fsi-firmware_git.bb | 2 +- meta-phosphor/classes/mrw-rev.bbclass | 2 +- .../recipes-phosphor/chassis/obmc-hardbeep.bb | 9 ------ .../recipes-phosphor/chassis/obmc-softbeep.bb | 9 ------ .../system/obmc-ipl-status-led-monitor.bb | 23 --------------- .../org.openbmc.status.IPLLED.service | 14 --------- .../system/obmc-ipl-status-observer.bb | 23 --------------- .../org.openbmc.status.IPL.service | 15 ---------- meta-rcs/recipes-phosphor/chassis/obmc-hardbeep.bb | 9 ++++++ meta-rcs/recipes-phosphor/chassis/obmc-softbeep.bb | 9 ++++++ meta-rcs/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 +++++++++++++ .../system/obmc-ipl-status-led-monitor.bb | 23 +++++++++++++++ .../org.openbmc.status.IPLLED.service | 14 +++++++++ .../system/obmc-ipl-status-observer.bb | 23 +++++++++++++++ .../org.openbmc.status.IPL.service | 15 ++++++++++ 20 files changed, 160 insertions(+), 160 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 delete mode 100644 meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb delete mode 100644 meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb delete mode 100644 meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb delete mode 100644 meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service delete mode 100644 meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb delete mode 100644 meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service create mode 100644 meta-rcs/recipes-phosphor/chassis/obmc-hardbeep.bb create mode 100644 meta-rcs/recipes-phosphor/chassis/obmc-softbeep.bb create mode 100644 meta-rcs/recipes-phosphor/host/ast-vga-disable.bb create mode 100755 meta-rcs/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check create mode 100644 meta-rcs/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service create mode 100644 meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb create mode 100644 meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service create mode 100644 meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer.bb create mode 100644 meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service 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 diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb b/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb index d96a2ef4b..95b2015c3 100644 --- a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb +++ b/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" SRCREV = "bae32e353a3641b5164211f6bf06c5620f6e384d" -SRC_URI = "git://github.com/ozbenh/cf-fsi.git" +SRC_URI = "git://scm.raptorcs.com/scm/git/cf-fsi;protocol=https" PR = "r1" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass index 9ad00fa9e..77a1b9402 100644 --- a/meta-phosphor/classes/mrw-rev.bbclass +++ b/meta-phosphor/classes/mrw-rev.bbclass @@ -1,4 +1,4 @@ -MRW_API_SRC_URI ?= "git://scm.raptorcs.com/scm/git/serverwiz;protocol=https;subpath=scripts" +MRW_API_SRC_URI ?= "git://scm.raptorcs.com/scm/git/serverwiz;protocol=https" MRW_API_SRCREV ?= "60c8e10cbb11768cd1ba394b35cb1d6627efec42" MRW_TOOLS_SRC_URI ?= "git://scm.raptorcs.com/scm/git/phosphor-mrw-tools;protocol=https" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb deleted file mode 100644 index 8066752e2..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "OpenBMC hardware PWM beep" -DESCRIPTION = "A sample implementation for hardware beep on a PWM." -PR = "r1" - -inherit skeleton-gdbus -inherit pkgconfig - -LICENSE = "GPLv3" -SKELETON_DIR = "hardbeep" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb deleted file mode 100644 index 034d5c4c4..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "OpenBMC software beep" -DESCRIPTION = "A sample implementation for software beep on a GPIO." -PR = "r1" - -inherit skeleton-gdbus -inherit pkgconfig - -LICENSE = "GPLv3" -SKELETON_DIR = "softbeep" diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb deleted file mode 100644 index cf4520368..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OpenBMC IPL status LED monitor" -DESCRIPTION = "OpenBMC IPL status LED monitor." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-subprocess \ - python-pygobject \ - pyphosphor \ - pyphosphor-dbus \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - obmc-ipl-status-observer \ - " - -SKELETON_DIR = "pyiplledmonitor" - -DBUS_SERVICE_${PN} += "org.openbmc.status.IPLLED.service" diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service deleted file mode 100644 index c1daa0469..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Phoshpor IPL Status LED Monitor -Wants=org.openbmc.status.IPL.service -After=org.openbmc.status.IPL.service - -[Service] -Restart=always -ExecStart=/usr/bin/env ipl_status_led_monitor.py -SyslogIdentifier=ipl_status_led_monitor.py -Type=simple -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb deleted file mode 100644 index 95d358e3d..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OpenBMC IPL status observer" -DESCRIPTION = "OpenBMC IPL status observer." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-subprocess \ - python-pygobject \ - pyphosphor \ - pyphosphor-dbus \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - pdbg \ - " - -SKELETON_DIR = "pyiplobserver" - -DBUS_SERVICE_${PN} += "org.openbmc.status.IPL.service" diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service deleted file mode 100644 index a92b2f146..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Phoshpor IPL Status Observer -Wants=xyz.openbmc_project.State.Host.service -After=xyz.openbmc_project.State.Host.service - -[Service] -Restart=always -ExecStart=/usr/bin/env ipl_status_observer.py -SyslogIdentifier=ipl_status_observer.py -Type=dbus -BusName={BUSNAME} -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-rcs/recipes-phosphor/chassis/obmc-hardbeep.bb b/meta-rcs/recipes-phosphor/chassis/obmc-hardbeep.bb new file mode 100644 index 000000000..8066752e2 --- /dev/null +++ b/meta-rcs/recipes-phosphor/chassis/obmc-hardbeep.bb @@ -0,0 +1,9 @@ +SUMMARY = "OpenBMC hardware PWM beep" +DESCRIPTION = "A sample implementation for hardware beep on a PWM." +PR = "r1" + +inherit skeleton-gdbus +inherit pkgconfig + +LICENSE = "GPLv3" +SKELETON_DIR = "hardbeep" diff --git a/meta-rcs/recipes-phosphor/chassis/obmc-softbeep.bb b/meta-rcs/recipes-phosphor/chassis/obmc-softbeep.bb new file mode 100644 index 000000000..034d5c4c4 --- /dev/null +++ b/meta-rcs/recipes-phosphor/chassis/obmc-softbeep.bb @@ -0,0 +1,9 @@ +SUMMARY = "OpenBMC software beep" +DESCRIPTION = "A sample implementation for software beep on a GPIO." +PR = "r1" + +inherit skeleton-gdbus +inherit pkgconfig + +LICENSE = "GPLv3" +SKELETON_DIR = "softbeep" diff --git a/meta-rcs/recipes-phosphor/host/ast-vga-disable.bb b/meta-rcs/recipes-phosphor/host/ast-vga-disable.bb new file mode 100644 index 000000000..fc5b567be --- /dev/null +++ b/meta-rcs/recipes-phosphor/host/ast-vga-disable.bb @@ -0,0 +1,33 @@ +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-rcs/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check b/meta-rcs/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check new file mode 100755 index 000000000..31ed3dff7 --- /dev/null +++ b/meta-rcs/recipes-phosphor/host/ast-vga-disable/ast-vga-disable-check @@ -0,0 +1,13 @@ +#!/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-rcs/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service b/meta-rcs/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service new file mode 100644 index 000000000..2e52c9e3c --- /dev/null +++ b/meta-rcs/recipes-phosphor/host/ast-vga-disable/ast_vga_disable@.service @@ -0,0 +1,19 @@ +[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 diff --git a/meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb new file mode 100644 index 000000000..cf4520368 --- /dev/null +++ b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb @@ -0,0 +1,23 @@ +SUMMARY = "OpenBMC IPL status LED monitor" +DESCRIPTION = "OpenBMC IPL status LED monitor." +PR = "r1" + +inherit skeleton-python +inherit obmc-phosphor-dbus-service + +VIRTUAL-RUNTIME_skeleton_workbook ?= "" + +RDEPENDS_${PN} += "\ + python-dbus \ + python-json \ + python-subprocess \ + python-pygobject \ + pyphosphor \ + pyphosphor-dbus \ + ${VIRTUAL-RUNTIME_skeleton_workbook} \ + obmc-ipl-status-observer \ + " + +SKELETON_DIR = "pyiplledmonitor" + +DBUS_SERVICE_${PN} += "org.openbmc.status.IPLLED.service" diff --git a/meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service new file mode 100644 index 000000000..c1daa0469 --- /dev/null +++ b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service @@ -0,0 +1,14 @@ +[Unit] +Description=Phoshpor IPL Status LED Monitor +Wants=org.openbmc.status.IPL.service +After=org.openbmc.status.IPL.service + +[Service] +Restart=always +ExecStart=/usr/bin/env ipl_status_led_monitor.py +SyslogIdentifier=ipl_status_led_monitor.py +Type=simple +Environment="PYTHONUNBUFFERED=1" + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer.bb b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer.bb new file mode 100644 index 000000000..95d358e3d --- /dev/null +++ b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer.bb @@ -0,0 +1,23 @@ +SUMMARY = "OpenBMC IPL status observer" +DESCRIPTION = "OpenBMC IPL status observer." +PR = "r1" + +inherit skeleton-python +inherit obmc-phosphor-dbus-service + +VIRTUAL-RUNTIME_skeleton_workbook ?= "" + +RDEPENDS_${PN} += "\ + python-dbus \ + python-json \ + python-subprocess \ + python-pygobject \ + pyphosphor \ + pyphosphor-dbus \ + ${VIRTUAL-RUNTIME_skeleton_workbook} \ + pdbg \ + " + +SKELETON_DIR = "pyiplobserver" + +DBUS_SERVICE_${PN} += "org.openbmc.status.IPL.service" diff --git a/meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service new file mode 100644 index 000000000..a92b2f146 --- /dev/null +++ b/meta-rcs/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service @@ -0,0 +1,15 @@ +[Unit] +Description=Phoshpor IPL Status Observer +Wants=xyz.openbmc_project.State.Host.service +After=xyz.openbmc_project.State.Host.service + +[Service] +Restart=always +ExecStart=/usr/bin/env ipl_status_observer.py +SyslogIdentifier=ipl_status_observer.py +Type=dbus +BusName={BUSNAME} +Environment="PYTHONUNBUFFERED=1" + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} -- cgit v1.2.1