diff options
| author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-06-16 03:14:05 +0300 |
|---|---|---|
| committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-06-16 03:14:05 +0300 |
| commit | 7f3171fcf898cdd84f617f4dd19b83d635f5693a (patch) | |
| tree | 2905ae2b030ad2c215c1dd25696bf0e51510e7c9 | |
| parent | d0cb92ba764c2fa9e41a50d0404041f591e7a924 (diff) | |
| download | openbmc-7f3171fcf898cdd84f617f4dd19b83d635f5693a.tar.xz | |
SILABMC-138: obmc-console-{server,client} implementation
3 files changed, 16 insertions, 2 deletions
diff --git a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts index 001ea77049..81a9be2513 100644 --- a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts +++ b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/aspeed-bmc-sila-cp2-5422.dts @@ -458,6 +458,16 @@ &vuart { status = "okay"; + + /* We enable the VUART here, but leave it in a state that does + * not interfere with the SuperIO. The goal is to have both the + * VUART and the SuperIO available and decide at runtime whether + * the VUART should actually be used. For that reason, configure + * an "invalid" IO address and an IRQ that is not used by the + * BMC. + */ + aspeed,lpc-io-reg = <0xffff>; + aspeed,lpc-interrupts = <15>; }; &pwm_tacho { diff --git a/meta-ibs/meta-common/recipes-ibs/images/obmc-phosphor-image.bbappend b/meta-ibs/meta-common/recipes-ibs/images/obmc-phosphor-image.bbappend index 5dad389c66..33c14834aa 100644 --- a/meta-ibs/meta-common/recipes-ibs/images/obmc-phosphor-image.bbappend +++ b/meta-ibs/meta-common/recipes-ibs/images/obmc-phosphor-image.bbappend @@ -21,14 +21,18 @@ disable_ttyS3_serial_getty() { rm -f ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@ttyS3.service } +remove_udev_vuart_rules() { + rm -f ${IMAGE_ROOTFS}/lib/udev/rules.d/61-aspeed-vuart.rules +} + bmcweb_certs_directory() { mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ssl/certs/https chmod 700 ${IMAGE_ROOTFS}${sysconfdir}/ssl/certs/https } - ROOTFS_POSTPROCESS_COMMAND += " \ fix_shadow_perms ; \ disable_ttyS3_serial_getty ; \ + remove_udev_vuart_rules ; \ bmcweb_certs_directory ; \ " diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/console/obmc-console_%.bbappend index d9ff90d9c6..9a0eae176e 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" -OBMC_CONSOLE_HOST_TTY = "ttyVUART0" +OBMC_CONSOLE_HOST_TTY = "ttyS2" SRC_URI += "file://sol-option-check.sh \ file://obmc-console@.service \ " |