diff options
Diffstat (limited to 'meta-openbmc-mods/meta-ast2600/recipes-phosphor')
4 files changed, 54 insertions, 6 deletions
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json index dd1c4d21a..6e1b3a22b 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json @@ -1151,7 +1151,7 @@ "OutLimitMax": 100.0, "OutLimitMin": 30.0, "Outputs": [ - "Pwm 12" + "Pwm 13" ], "PCoefficient": 0.0, "PositiveHysteresis": 0.0, @@ -1177,7 +1177,7 @@ "OutLimitMax": 100.0, "OutLimitMin": 30.0, "Outputs": [ - "Pwm 13" + "Pwm 14" ], "PCoefficient": 0.0, "PositiveHysteresis": 0.0, @@ -1203,7 +1203,7 @@ "OutLimitMax": 100.0, "OutLimitMin": 30.0, "Outputs": [ - "Pwm 14" + "Pwm 15" ], "PCoefficient": 0.0, "PositiveHysteresis": 0.0, @@ -1229,7 +1229,7 @@ "OutLimitMax": 100.0, "OutLimitMin": 30.0, "Outputs": [ - "Pwm 15" + "Pwm 16" ], "PCoefficient": 0.0, "PositiveHysteresis": 0.0, @@ -2031,6 +2031,25 @@ ], "Type": "XeonCPU", "UseWA": 1 + }, + { + "Name": "ASD", + "BMC_RSMRST_B": { + "PinType": "PIN_NONE" + }, + "BMC_SYSPWROK": { + "PinType": "PIN_NONE" + }, + "BMC_PWR_DEBUG_N": { + "PinName": "FM_BMC_CPU_FBRK_OUT_R_N" + }, + "BMC_DEBUG_EN_N": { + "PinType": "PIN_NONE" + }, + "BMC_XDP_PRST_IN": { + "PinName": "DBP_PRESENT_IN_R2_N" + }, + "Type": "ASD" } ], "Name": "AC Baseboard", diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf index 748a26544..8491f5365 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,3 @@ baud = 115200 -local-tty = ttyS2 +local-tty = ttyS3 local-tty-baud = 115200 diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console@.service new file mode 100644 index 000000000..7fb8f79d3 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console@.service @@ -0,0 +1,21 @@ +[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-ast2600/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend index dee302fd7..7b6a47dac 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,8 +1,16 @@ FILESEXTRAPATHS_prepend_intel-ast2600 := "${THISDIR}/${PN}:" OBMC_CONSOLE_HOST_TTY = "ttyS2" -SRC_URI += "file://sol-option-check.sh" +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} } |