From 710489e15735682bf0f6909417b3a7e815437b2d Mon Sep 17 00:00:00 2001 From: Joseph Liu Date: Fri, 20 Mar 2020 11:53:14 +0800 Subject: meta-quanta: olympus-nuvoton: console: add udev support Listing tty mapped to UART2 Tested: Verified for Olympus platform with ttyS2 (From meta-quanta rev: 7ce165698a6b60452c4d6cf2ac3079fdd2eb290a) Signed-off-by: Joseph Liu Change-Id: I1c314f83e2abfc911d32e62cb081aff558ee734c Signed-off-by: Andrew Geissler --- .../recipes-phosphor/console/files/obmc-console.conf | 1 - .../console/obmc-console/80-olympus-nuvoton-sol.rules | 1 + .../console/obmc-console/obmc-console.conf | 1 + .../recipes-phosphor/console/obmc-console_%.bbappend | 18 ++++++++++-------- 4 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/files/obmc-console.conf create mode 100644 meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/80-olympus-nuvoton-sol.rules create mode 100644 meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf (limited to 'meta-quanta') diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/files/obmc-console.conf b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/files/obmc-console.conf deleted file mode 100644 index f99eaff47..000000000 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/files/obmc-console.conf +++ /dev/null @@ -1 +0,0 @@ -baud = 57600 diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/80-olympus-nuvoton-sol.rules b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/80-olympus-nuvoton-sol.rules new file mode 100644 index 000000000..0a73f0cfc --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/80-olympus-nuvoton-sol.rules @@ -0,0 +1 @@ +SUBSYSTEM=="tty", ATTRS{iomem_base}=="0xF0003000", ENV{SYSTEMD_WANTS}="obmc-console@ttyS2" SYMLINK+="ttyS2", TAG+="systemd" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf new file mode 100644 index 000000000..f99eaff47 --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -0,0 +1 @@ +baud = 57600 diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend index 5967ce1bb..fe0e34672 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,12 +1,14 @@ -SUMMARY = "Nuvoton OpenBMC console daemon" -DESCRIPTION = "Nuvoton Daemon to handle UART console connections" -HOMEPAGE = "http://github.com/openbmc/obmc-console" -PR = "r1" +FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SRC_URI_append_olympus-nuvoton = " file://80-olympus-nuvoton-sol.rules" -OBMC_CONSOLE_HOST_TTY := "ttyS2" +do_install_append_olympus-nuvoton() { + install -m 0755 -d ${D}${sysconfdir}/${BPN} + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ + ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyS2.conf -do_build_append() { - install -m 0644 ${THISDIR}/files/${PN}.conf ${WORKDIR}/${PN}.conf + install -d ${D}/lib/udev/rules.d + rm -f ${D}/lib/udev/rules.d/80-obmc-console-uart.rules + install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/lib/udev/rules.d } -- cgit v1.2.3