From 40108db4434d8c2e0a1ad2d1dd3f5ae34b17352c Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Mon, 3 Aug 2020 15:40:26 -0700 Subject: Update to internal 0.72 Signed-off-by: Jason M. Bills --- .../console/obmc-console/obmc-console.conf | 3 --- .../console/obmc-console/obmc-console@.service | 21 ------------------ .../console/obmc-console/sol-option-check.sh | 25 ---------------------- .../console/obmc-console_%.bbappend | 17 --------------- 4 files changed, 66 deletions(-) delete mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf delete mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service delete mode 100755 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh delete mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend (limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor/console') diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf deleted file mode 100644 index 1d332e2a2..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf +++ /dev/null @@ -1,3 +0,0 @@ -baud = 921600 -local-tty = ttyS3 -local-tty-baud = 921600 diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service deleted file mode 100644 index 7fb8f79d3..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Phosphor Console Muxer listening on device /dev/%I -BindsTo=dev-%i.device -After=dev-%i.device - -[Service] -ExecStartPre=/usr/bin/sol-option-check.sh -ExecStartPre=/bin/sh -c 'echo -n "uart3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' -ExecStartPre=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' -ExecStartPre=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' -ExecStartPre=/bin/sh -c 'echo -n "uart4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' -ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i -ExecStopPost=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' -ExecStopPost=/bin/sh -c 'echo -n "io3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' -ExecStopPost=/bin/sh -c 'echo -n "io4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' -ExecStopPost=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' -SyslogIdentifier=obmc-console-server -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh deleted file mode 100755 index ef32fcb9a..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# Copyright 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -if [ $(grep 192000000 /sys/class/tty/ttyS0/uartclk | wc -l) != 0 ]; then - echo "hs-uart" - sed -i -e 's/115200/921600/g' /etc/obmc-console.conf -else - echo "normal uart" - sed -i -e 's/921600/115200/g' /etc/obmc-console.conf -fi diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend deleted file mode 100644 index 7baf1cabc..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -FILESEXTRAPATHS_prepend_intel-ast2500 := "${THISDIR}/${PN}:" -OBMC_CONSOLE_HOST_TTY = "ttyS2" -SRC_URI += "file://sol-option-check.sh \ - file://obmc-console@.service \ - " -inherit obmc-phosphor-systemd - -SYSTEMD_SERVICE_${PN} += " \ - ${PN}@${OBMC_CONSOLE_HOST_TTY}.service \ - " - -do_install_append() { - rm -rf ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules - install -m 0644 ${WORKDIR}/${PN}@.service ${D}${systemd_system_unitdir} - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/sol-option-check.sh ${D}${bindir} -} -- cgit v1.2.3