diff options
80 files changed, 481 insertions, 136 deletions
diff --git a/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb index a6291376e0..833c15ec7a 100644 --- a/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -53,4 +53,5 @@ RDEPENDS_PN_SYSTEM_EXTRAS = "" RDEPENDS_PN_SYSTEM_EXTRAS:amd-withhost = " \ amd-fpga \ phosphor-hostlogger \ + phosphor-watchdog \ " diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service new file mode 100644 index 0000000000..92c0395014 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service @@ -0,0 +1,12 @@ +[Unit] +Description=Power Cycle Host Server +Requires=xyz.openbmc_project.Chassis.Control.Power.service +After=xyz.openbmc_project.Chassis.Control.Power.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=sleep 6 +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On +SyslogIdentifier=phosphor-watchdog diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service new file mode 100644 index 0000000000..3c87131716 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -0,0 +1,9 @@ +[Unit] +Description=Shutdown Host Server +Requires=xyz.openbmc_project.Chassis.Control.Power.service +After=xyz.openbmc_project.Chassis.Control.Power.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +SyslogIdentifier=phosphor-watchdog diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service new file mode 100644 index 0000000000..671fde6ff7 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -0,0 +1,10 @@ +[Unit] +Description=Reset Host Server +Requires=xyz.openbmc_project.Chassis.Control.Power.service +After=xyz.openbmc_project.Chassis.Control.Power.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +SyslogIdentifier=phosphor-watchdog diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service new file mode 100644 index 0000000000..f7e93b82f2 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service @@ -0,0 +1,16 @@ +[Unit] +Description=Phosphor Watchdog + +[Service] +ExecStart=/usr/bin/env phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog \ + --path=/xyz/openbmc_project/watchdog/host0 \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=phosphor-watchdog-host-reset.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=host-phosphor-watchdog-host-poweroff.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=phosphor-watchdog-host-cycle.service \ + +SyslogIdentifier=phosphor-watchdog +BusName =xyz.openbmc_project.Watchdog +Type=dbus + +[Install] +WantedBy=basic.target diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend new file mode 100644 index 0000000000..7cada9029d --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" + +# Remove the override to keep service running after DC cycle +SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE_${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 137969eccf..47702d59ac 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-6.6" -LINUX_VERSION ?= "6.6.30" +LINUX_VERSION ?= "6.6.32" -SRCREV="f013890407d8911c210e91bd9404c25c89d57021" +SRCREV="b217945eab7a0c37738cf37b89fdcc5b17d64c40" require linux-aspeed.inc diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf index cedd5c4c99..9e4070df6a 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf +++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf @@ -1,4 +1,3 @@ -local-tty = ttyUSB1 baud = 57600 console-id = usb1 logfile = /var/log/obmc-console-usb1.log diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-hsc-good b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-hsc-good new file mode 100644 index 0000000000..ad9fc7c98a --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-hsc-good @@ -0,0 +1,6 @@ +#!/bin/bash + +# Set Host Power On +obmcutil poweron + +exit 0 diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-hsc-good.service b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-hsc-good.service new file mode 100644 index 0000000000..9c5aee1d26 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-hsc-good.service @@ -0,0 +1,8 @@ +[Unit] +Description=Deassert Power HSC Good Status + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/deassert-power-hsc-good + +SyslogIdentifier=deassert-power-hsc-good diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init index 05bc10393d..4e7dd65a67 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init @@ -3,18 +3,16 @@ # shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions source /usr/libexec/fb-common-functions -power_good_init() { +host_led_init() { if [ "$(get_gpio power-host-good)" -eq 1 ]; then - busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 \ - xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Running; + systemctl start obmc-led-group-start@power_on.service else - busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 \ - xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Off; + systemctl start obmc-led-group-stop@power_on.service fi } post_end_init() { - if [ "$(get_gpio host-ready-n)" -eq 0 ]; then + if [ "$(get_gpio post-end-n)" -eq 0 ]; then busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 \ xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s \ xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Standby; @@ -147,5 +145,5 @@ fi devmem 0x1e6e251c 32 0 # Initial Power status. -power_good_init +host_led_init post_end_init diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json index 18593a0b1c..8d14905570 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json @@ -141,13 +141,13 @@ "Continue": true }, { - "Name": "host-ready-n", + "Name": "post-end-n", "ChipId": "2", "GpioNum": 66, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-post-end.service","deassert-gpio-log@host-ready-n.service"], - "FALLING": ["assert-post-end.service","assert-gpio-log@host-ready-n.service"] + "RISING": ["deassert-post-end.service"], + "FALLING": ["assert-post-end.service"] }, "Continue": true @@ -162,5 +162,15 @@ "FALLING": ["assert-gpio-log@leakage-detect-alert.service"] }, "Continue": true + }, + { + "Name": "power-hsc-good", + "ChipId": "2", + "GpioNum": 10, + "EventMon": "RISING", + "Targets": { + "RISING": ["deassert-power-hsc-good.service"] + }, + "Continue": true } -]
\ No newline at end of file +] diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 46b9d2d4c7..19bb06fa58 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -2,25 +2,27 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd systemd -SRC_URI += "file://plat-phosphor-multi-gpio-monitor.json \ - file://plat-phosphor-multi-gpio-presence.json \ - file://assert-reset-button.service \ - file://assert-power-good.service \ +SRC_URI += "file://assert-gpio-log@.service \ + file://assert-post-end \ file://assert-post-end.service \ - file://deassert-reset-button.service \ - file://deassert-power-good.service \ - file://deassert-post-end.service \ - file://multi-gpios-sys-init.service \ - file://multi-gpios-sys-init \ file://assert-power-good \ - file://deassert-power-good \ - file://assert-post-end \ - file://deassert-post-end \ + file://assert-power-good.service \ file://assert-reset-button \ - file://deassert-reset-button \ - file://assert-gpio-log@.service \ + file://assert-reset-button.service \ file://deassert-gpio-log@.service \ + file://deassert-post-end \ + file://deassert-post-end.service \ + file://deassert-power-good \ + file://deassert-power-good.service \ + file://deassert-power-hsc-good \ + file://deassert-power-hsc-good.service \ + file://deassert-reset-button \ + file://deassert-reset-button.service \ file://logging \ + file://multi-gpios-sys-init \ + file://multi-gpios-sys-init.service \ + file://plat-phosphor-multi-gpio-monitor.json \ + file://plat-phosphor-multi-gpio-presence.json \ " RDEPENDS:${PN}:append = " bash" @@ -28,12 +30,12 @@ RDEPENDS:${PN}:append = " bash" FILES:${PN} += "${systemd_system_unitdir}/*" SYSTEMD_SERVICE:${PN} += " \ - assert-reset-button.service \ assert-power-good.service \ assert-post-end.service \ - deassert-reset-button.service \ + assert-reset-button.service \ deassert-power-good.service \ deassert-post-end.service \ + deassert-reset-button.service \ multi-gpios-sys-init.service \ " @@ -41,6 +43,9 @@ SYSTEMD_AUTO_ENABLE = "enable" do_install:append:() { install -d ${D}${datadir}/phosphor-gpio-monitor + install -d ${D}${systemd_system_unitdir}/ + install -d ${D}${libexecdir}/${PN} + install -m 0644 ${WORKDIR}/plat-phosphor-multi-gpio-monitor.json \ ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json install -m 0644 ${WORKDIR}/plat-phosphor-multi-gpio-presence.json \ @@ -61,6 +66,8 @@ do_install:append:() { install -m 0755 ${WORKDIR}/assert-power-good ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/ + + install -m 0755 ${WORKDIR}/deassert-power-hsc-good ${D}${libexecdir}/${PN}/ } SYSTEMD_OVERRIDE:${PN}-monitor += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf" diff --git a/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc b/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc index 2f63dba18c..3e6728f263 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc +++ b/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc @@ -5,6 +5,16 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-gpio-monitor \ " +# Monitor gpio presence status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-gpio-monitor-presence \ +" + +# Monitor Chassis power status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-power-control \ +" + # It is for lsusb app. OBMC_IMAGE_EXTRA_INSTALL:append = " \ usbutils \ @@ -20,8 +30,3 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ obmc-phosphor-buttons-signals \ obmc-phosphor-buttons-handler \ " - -# Monitor gpio status -OBMC_IMAGE_EXTRA_INSTALL:append = " \ - phosphor-gpio-monitor-presence \ -"
\ No newline at end of file diff --git a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg index 7672eb67af..02ce902d34 100644 --- a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg +++ b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg @@ -33,3 +33,8 @@ CONFIG_SPI_GPIO=y # RTC CONFIG_RTC_DRV_PCF8563=y + +# USB UART +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y diff --git a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init index 411cff19bf..de609ee56b 100644 --- a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init +++ b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init @@ -2,6 +2,10 @@ # shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions source /usr/libexec/minerva-common-functions +power_on_led_init() { + systemctl start obmc-led-group-start@power_on.service +} + # set initial value for GPIO output pins set_gpio PWREN_MTIA_BLADE0_EN_N 0 set_gpio PWREN_MTIA_BLADE1_EN_N 0 @@ -91,4 +95,7 @@ set_gpio RST_I2CRST_FCB_T_R_N 1 set_gpio wFM_88E6393X_BIN_UPDATE_EN_N 1 set_gpio WATER_VALVE_CLOSED_N 0 set_gpio BMC_READY 1 + +power_on_led_init + exit 0 diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules index 2b236f7be6..9f39f460c8 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules @@ -1 +1,5 @@ SUBSYSTEM=="tty", ATTRS{iomem_base}=="0x1E790000", ENV{SYSTEMD_WANTS}="obmc-console@ttyS5", TAG+="systemd" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011" +SUBSYSTEM=="tty", ATTRS{bInterfaceNumber}=="03", SYMLINK+="ttyPOE" +SUBSYSTEM=="tty", ATTRS{bInterfaceNumber}=="02", SYMLINK+="ttyRS485-1" +SUBSYSTEM=="tty", ATTRS{bInterfaceNumber}=="01", SYMLINK+="ttyRS485-0" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf index 85cb7a43e0..6622dd6367 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf @@ -1,4 +1,3 @@ -local-tty = ttyS5 baud = 57600 console-id = compute-blade logfile = /var/log/obmc-console-compute-blade.log diff --git a/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc b/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc index fa5266988d..58c3a46db6 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc +++ b/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc @@ -31,3 +31,13 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-state-manager \ " + +# Enable mdio-tools for communication with the PHY chip +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + mdio-tools \ +" + +# Monitor the chassis power status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-power-control \ +" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init b/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init index d9def86a2a..c40e6475bd 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init +++ b/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init @@ -20,4 +20,39 @@ else echo "0" > "$SLOT_FILE" fi +# Below is the diagram of the smart valve implemtation on the CMM. +# There are two end-device for smart valve and two communication interfaces. +# One is Modbus (RS485) interface connected to FT4232H channel 1, 2. +# Anorther is by ethernet interface which is connected to Marvell 88E6369X switch. +# The PoE interface is connected to STM32F + BCM59011 PoE controller (Broadcom solution) for PoE power supply. +# BMC can control the PoE power supply by sending command to STM32F via RS232. +# +# Diagram: +# D_485_x = End device for smart valve x via RS485 +# D_POE_x = End device for smart valve x via PoE +# +# +----------+ +-------------+ +# | FT4232H | <----- USB ----> | BMC | +# +----------+ +-------------+ +# / | \ \ | +# ch0 ch1 ch2 ch3 RMII +# | | | \ | +# X (RS485) RS232 +-------------+ +# / \ \ | Marvell | +# / \ \ | 88E6369X | +#|D_485_0| |D_485_1| |STM32F| +-------------+ +# | | | +# i2c | | +# | | | +# |BCM59011| 1000 Base-T +# | | | +# |(power |(data |(data +# | | | +# P54 POE----->|D_POE_0| |D_POE_1| +POE_DEV="/dev/ttyPOE" +# Set baud rate to 19200 and raw mode +stty -F $POE_DEV 19200 raw +# Send Power Source Configuration Command (0x18) to STM32F for enable PoE +echo -e '\x18\x00\x00\x2c\x01\x00\x00\xff\xff\xff\xff\x41' > $POE_DEV + exit 0 diff --git a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle index deaa7afe5a..ce6e6833d0 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle +++ b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle @@ -6,8 +6,6 @@ source /usr/libexec/minerva-common-functions # Minerva CMM Sled Power Cycle and Chassis Power Cycle cmm-hsc-power-cycle() { - #TBD: Since there has a 2nd HSC, it is necessary to determine which HSC it is now. - # LTC4287 MFR_REBOOT_CONTROL (FDh) Read/Write # [3]: # REBOOT 0 Write a 1 to reboot. @@ -22,21 +20,49 @@ cmm-hsc-power-cycle() { # 101 18.6 s # 110 37.1 s # 111 74.2 s - i2cset -y -f 0 0x44 0xfd 0x00 - i2cset -y -f 0 0x44 0xfd 0x0b + ret1=$(i2cset -y -f 0 0x44 0xfd 0x00) + ret2=$(i2cset -y -f 0 0x44 0xfd 0x0b) + + # XDP710 RESTART command (0xEC) + ret3=$(i2cset -f -y 0 0x43 0xec) + + if [ "$ret3" -ne 0 ] && { [ "$ret1" -ne 0 ] || [ "$ret2" -ne 0 ]; }; then + return 1 + else + return 0 + fi + } -compute-blade-hsc-power-off() { +compute-blade-hsc-power-control() { + + if [ "$1" == "on" ];then + val=0 + elif [ "$1" == "off" ]; then + val=1 + else + return 1 + fi + for i in {0..15} do - set_gpio "PWREN_MTIA_BLADE${i}_HSC_EN_N" 1 + set_gpio "PWREN_MTIA_BLADE${i}_HSC_EN_N" $val done } -network-blade-hsc-power-off() { - for i in {0..15} +network-blade-hsc-power-control() { + + if [ "$1" == "on" ];then + val=0 + elif [ "$1" == "off" ]; then + val=1 + else + return 1 + fi + + for i in {0..5} do - set_gpio "PWREN_MTIA_BLADE${i}_HSC_EN_N" 1 + set_gpio "PWREN_NW_BLADE${i}_HSC_EN_N" $val done } @@ -50,8 +76,11 @@ elif [ "$1" == 1 ] then echo "Staring CMM Chassis Power Cycle" - compute-blade-hsc-power-off - network-blade-hsc-power-off + compute-blade-hsc-power-control "off" + network-blade-hsc-power-control "off" + sleep 0.2 # 200ms + compute-blade-hsc-power-control "on" + network-blade-hsc-power-control "on" cmm-hsc-power-cycle else echo "Invalid CMM Cycle" diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..bf843a530d --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" +SRC_URI +="file://yosemite4.cfg" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index 860e605e9c..34c8160fa0 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -1 +1 @@ -PHOSPHOR_DBUS_MONITOR_CONFIGS:append = " power-saving-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append = " " diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend deleted file mode 100644 index 4da9e510bd..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -inherit obmc-phosphor-systemd - -SRC_URI:append = " \ - file://switch-nic-main-or-aux-mode \ -" - -SYSTEMD_SERVICE:${PN}:append = " \ - switch-nic-to-aux-mode@.service \ - switch-nic-to-main-mode@.service \ -" - -do_install:append() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/switch-nic-main-or-aux-mode ${D}${bindir}/switch-nic-main-or-aux-mode -} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface new file mode 100644 index 0000000000..b3582301ec --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface @@ -0,0 +1,23 @@ +#!/bin/bash + +to_local_admin_mac() { + # Set sencond bit of first byte + modified_byte=$((16#${1:0:2} | 0x02)) + modified_mac="$(printf "%02X" "$modified_byte")${1:2}" + echo "$modified_mac" +} + +INTF=$1 + +networkctl down "$INTF" + +# Set interface to local Admin MAC +local_mac=$(to_local_admin_mac "$(cat /sys/class/net/"$INTF"/address)") +ip link set dev "$INTF" address "$local_mac" + +networkctl up "$INTF" + +# wait getting address from NC-SI +systemctl restart network-wait-ipv6-ll@"$INTF".service + +networkctl reconfigure "$INTF" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface@.service new file mode 100644 index 0000000000..2ddf62bbe7 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Reconfigure network interface %i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/reconfig-net-interface %i +SyslogIdentifier=reconfig-net-interface-%i
\ No newline at end of file diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json index bfa7ea758e..ab898a9028 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json @@ -122,7 +122,8 @@ "FALLING": [ "obmc-chassis-powercycle@3.target", "obmc-chassis-powercycle@4.target", - "setup-nic-endpoint-slot@1.service" + "setup-nic-endpoint-slot@1.service", + "reconfig-net-interface@eth0.service" ] }, "Continue": true @@ -137,7 +138,8 @@ "FALLING": [ "obmc-chassis-powercycle@5.target", "obmc-chassis-powercycle@6.target", - "setup-nic-endpoint-slot@2.service" + "setup-nic-endpoint-slot@2.service", + "reconfig-net-interface@eth1.service" ] }, "Continue": true diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 14057f6b95..112b3424ac 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -9,6 +9,8 @@ SRC_URI += "file://yosemite4-phosphor-multi-gpio-monitor.json \ file://set-button-sled.service \ file://probe-slot-device@.service \ file://probe-slot-device \ + file://reconfig-net-interface@.service \ + file://reconfig-net-interface \ file://rescan-fru-device@.service \ file://rescan-fru-device \ file://slot-hot-plug@.service \ @@ -28,6 +30,7 @@ SYSTEMD_SERVICE:${PN} += " \ setup-nic-endpoint-slot@.service \ remove-nic-endpoint-slot@.service \ rescan-wf-bic@.service \ + reconfig-net-interface@.service \ " SYSTEMD_AUTO_ENABLE = "enable" @@ -41,10 +44,12 @@ do_install:append:() { install -m 0644 ${WORKDIR}/rescan-fru-device@.service ${D}${systemd_system_unitdir}/rescan-fru-device@.service install -m 0644 ${WORKDIR}/slot-hot-plug@.service ${D}${systemd_system_unitdir}/slot-hot-plug@.service install -m 0644 ${WORKDIR}/setup-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/reconfig-net-interface@.service ${D}${systemd_system_unitdir}/reconfig-net-interface@.service install -m 0644 ${WORKDIR}/remove-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/rescan-wf-bic@.service ${D}${systemd_system_unitdir}/ install -d ${D}${libexecdir}/${PN} install -m 0755 ${WORKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/reconfig-net-interface ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/rescan-fru-device ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/rescan-wf-bic ${D}${libexecdir}/${PN}/ install -d ${D}/${bindir} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem new file mode 100644 index 0000000000..86313aba6e --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem @@ -0,0 +1,5 @@ +#!/bin/bash + +# clean up /var/log/redfish and files in /home/root/ which are not necessary +rm -rf /var/log/redfish* +rm -rf /home/root/* diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem.service b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem.service new file mode 100644 index 0000000000..4ae3779d76 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem.service @@ -0,0 +1,7 @@ +[Unit] +Description=Clean up files that might full up filesystem + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-health-monitor/clean-up-filesystem +SyslogIdentifier=clean-up-filesystem diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend index f99f1b8db9..74b3b6ed61 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend @@ -1,2 +1,26 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd systemd + +SRC_URI += "file://clean-up-filesystem \ + file://clean-up-filesystem.service \ + " CPU_CRIT_TGT = "" -MEM_CRIT_TGT = ""
\ No newline at end of file +MEM_CRIT_TGT = "" +STORAGE_CRIT_TGT = "clean-up-filesystem.service" + +RDEPENDS:${PN}:append = " bash" + +FILES:${PN} += "${systemd_system_unitdir}/*" + +SYSTEMD_SERVICE:${PN} += " \ + clean-up-filesystem.service \ + " +SYSTEMD_AUTO_ENABLE = "enable" + +do_install:append:() { + install -d ${D}${datadir}/phosphor-health-monitor + install -m 0644 ${WORKDIR}/clean-up-filesystem.service ${D}${systemd_system_unitdir}/clean-up-filesystem.service + install -d ${D}${libexecdir}/${PN} + install -m 0755 ${WORKDIR}/clean-up-filesystem ${D}${libexecdir}/${PN}/ +} diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 9eddafa137..b564c3812e 100644 --- a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -7,6 +7,17 @@ size 64k missingok postrotate - systemctl reload rsyslog 2> /dev/null || true + systemctl restart rsyslog 2> /dev/null || true + endscript +} + +# Keep up to four 64k files for redfish (256k total) +/var/log/redfish +{ + rotate 3 + size 64k + missingok + postrotate + systemctl restart rsyslog 2> /dev/null || true endscript } diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf index 80227cd2ab..596a35f98f 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf @@ -1,4 +1,3 @@ -local-tty = ttyS0 baud = 57600 console-id = host1 logfile = /var/log/obmc-console-host1.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf index 12380f9497..80cfea2e25 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf @@ -1,4 +1,3 @@ -local-tty = ttyS1 baud = 57600 console-id = host2 logfile = /var/log/obmc-console-host2.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf index 0e93cab8c6..827fe7999a 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf @@ -1,4 +1,3 @@ -local-tty = ttyS2 baud = 57600 console-id = host3 logfile = /var/log/obmc-console-host3.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf index 4eb9e8f6f6..36af7face5 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf @@ -1,4 +1,3 @@ -local-tty = ttyS3 baud = 57600 console-id = host4 logfile = /var/log/obmc-console-host4.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf index 9b838e8308..65885079bf 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf @@ -1,4 +1,3 @@ -local-tty = ttyS5 baud = 57600 console-id = host5 logfile = /var/log/obmc-console-host5.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf index 162bf7825d..122f66ba24 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf @@ -1,4 +1,3 @@ -local-tty = ttyS6 baud = 57600 console-id = host6 logfile = /var/log/obmc-console-host6.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf index 2b6474baf7..6dcf970550 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf @@ -1,4 +1,3 @@ -local-tty = ttyS7 baud = 57600 console-id = host7 logfile = /var/log/obmc-console-host7.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf index ea820710c9..bd6404d050 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf @@ -1,4 +1,3 @@ -local-tty = ttyS8 baud = 57600 console-id = host8 logfile = /var/log/obmc-console-host8.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf index 90891d45ab..f9326c8507 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf @@ -1,4 +1,3 @@ -local-tty = ttyS2 baud = 57600 console-id = host0 logfile = /var/log/obmc-console-host0.log diff --git a/meta-google/classes/image_types_hoth.bbclass b/meta-google/classes/image_types_hoth.bbclass index f01ed90ddc..00e9c4c1ff 100644 --- a/meta-google/classes/image_types_hoth.bbclass +++ b/meta-google/classes/image_types_hoth.bbclass @@ -9,9 +9,14 @@ FLASH_HOTH_SECONDARY_OFFSET:hoth = "${@61376 if FLASH_SIZE == '65536' else 7296} FLASH_IMAGE_DESC_OFFSET:hoth:aarch64 = "${@61312 if FLASH_SIZE == '65536' else 7232}" FLASH_HOTH_UPDATE_OFFSET:hoth:aarch64 = "${@61376 if FLASH_SIZE == '65536' else 31744}" +FLASH_IMAGE_DESC_OFFSET:hoth:aarch64:flash-131072 = "126848" +FLASH_HOTH_UPDATE_OFFSET:hoth:aarch64:flash-131072 = "126912" +FLASH_HOTH_MAILBOX_OFFSET:hoth:aarch64:flash-131072 = "131008" + # Leave a zero-size u-boot env partition. FLASH_UBOOT_ENV_OFFSET = "${FLASH_KERNEL_OFFSET}" FLASH_UBOOT_ENV_OFFSET:flash-65536 = "${FLASH_KERNEL_OFFSET:flash-65536}" +FLASH_UBOOT_ENV_OFFSET:flash-131072 = "${FLASH_KERNEL_OFFSET:flash-131072}" # Support BMC image to have secondary hoth firmware ENABLE_HOTH_SECONDARY ?= "no" diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf index 1311aa7529..89efcdc452 100644 --- a/meta-google/conf/distro/gbmc.conf +++ b/meta-google/conf/distro/gbmc.conf @@ -46,3 +46,6 @@ PACKAGECONFIG:remove:pn-nftables = "python" # Do not configure TPM layer SKIP_META_TPM_SANITY_CHECK = "1" + +# Set /var/log directory to be volatile +VOLATILE_LOG_DIR = "yes" diff --git a/meta-google/recipes-google/google-misc/google-misc.inc b/meta-google/recipes-google/google-misc/google-misc.inc index 477009357d..50b53fb038 100644 --- a/meta-google/recipes-google/google-misc/google-misc.inc +++ b/meta-google/recipes-google/google-misc/google-misc.inc @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../../LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "git://github.com/openbmc/google-misc;branch=master;protocol=https" -SRCREV = "4dba220d361271859f824aaa2c7861ceb63ca2dd" +SRCREV = "b47ca0dfa347a3a425081047fc60aaa35345c328" S = "${WORKDIR}/git/subprojects/${GOOGLE_MISC_PROJ}" inherit meson pkgconfig diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index 850d9b4715..383d9ad978 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -23,7 +23,7 @@ RDEPENDS:${PN} += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys;branch=master;protocol=https" -SRCREV = "9846023c7e811d6f831941d37270b10046916fef" +SRCREV = "56b2d9f30b05a0471fec58adbba666bfe31032f3" FILES:${PN} += "${libdir}/ipmid-providers" diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c118d925e8..e0bd907a4d 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -13,6 +13,7 @@ RDEPENDS:${PN}-extras:append = " \ phosphor-virtual-sensor \ libmctp \ tzdata-core \ + iei-ipmi-oem \ " RDEPENDS:${PN}-devtools:append = " \ diff --git a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb b/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb new file mode 100644 index 0000000000..7e6fde47c9 --- /dev/null +++ b/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "IEISystems OEM IPMI commands" +DESCRIPTION = "IEISystems OEM IPMI commands" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +SRC_URI = "git://github.com/openbmc/iei-ipmi-oem;branch=master;protocol=https" +SRCREV = "b4396f2321f9420b190fdd4438bb5503a9b5b7de" + +S = "${WORKDIR}/git" +PV = "0.1+git${SRCPV}" + +DEPENDS += "phosphor-ipmi-host" +DEPENDS += "phosphor-logging" + +inherit meson pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink + +PACKAGECONFIG ??= "" + +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc index 71e22251b4..5948d3cec9 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc @@ -4,25 +4,36 @@ HOMEPAGE = "https://github.com/Nuvoton-Israel/npcm8xx-bootblock" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -BB_TIP = "arbel_a35_bootblock.bin" -BB_NO_TIP = "arbel_a35_bootblock_no_tip.bin" - -OUTPUT_BB_TIP_BIN = "Images/tip" -OUTPUT_BB_NO_TIP_BIN = "Images/no_tip" +PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git" - +B = "${S}/Sources" +BB_BRANCH ?= "main" SRC_URI = " \ - git://github.com/Nuvoton-Israel/npcm8xx-bootblock;branch=main;protocol=https" + git://github.com/Nuvoton-Israel/npcm8xx-bootblock;branch=${BB_BRANCH};protocol=https" -inherit deploy +export CROSS_COMPILE="${TARGET_PREFIX}" +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" +do_configure[noexec] = "1" + +EXTRA_OEMAKE += "CROSS_COMPILER_INC=${STAGING_DIR_HOST}${includedir}" -do_deploy () { - if [ "${TIP_IMAGE}" = "True" ] ; then - install -D -m 644 ${OUTPUT_BB_TIP_BIN}/${BB_TIP} ${DEPLOYDIR}/${BB_TIP} - else - install -D -m 644 ${OUTPUT_BB_NO_TIP_BIN}/${BB_NO_TIP} ${DEPLOYDIR}/${BB_NO_TIP} - fi +TIP = "${@'tip' if d.getVar("TIP_IMAGE") == 'True' else 'no_tip'}" +BOOTBLOCK = "arbel_a35_bootblock" +BOOTBLOCK .= "${@'_no_tip' if d.getVar("TIP_IMAGE") != 'True' else ''}" + +do_compile() { + oe_runmake "${BOOTBLOCK}" ENCLAVE="${TIP}" +} +do_compile[cleandirs] = "${B}/Images" + +inherit deploy +do_deploy() { + install -d ${DEPLOYDIR} + install -m 644 "${B}/Images/${TIP}/${BOOTBLOCK}.bin" "${DEPLOYDIR}/${BOOTBLOCK}.bin" } addtask deploy before do_build after do_compile diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.6.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.6.bb deleted file mode 100644 index 61de1333e7..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRCREV = "b45a45bce6e557af49b43492904579edb5f084a3" - -require npcm8xx-bootblock.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb new file mode 100644 index 0000000000..17a94bef91 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb @@ -0,0 +1,3 @@ +SRCREV = "e18737d17d4cf5e7768598a291a7ef2b8a07a776" + +require npcm8xx-bootblock.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.00.08.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.00.08.bb deleted file mode 100644 index 37b21cdcb5..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.00.08.bb +++ /dev/null @@ -1,4 +0,0 @@ -# tag IGPS_04.00.08 -SRCREV = "7e009f77dcc5b4cde80f1ba47b1cf5a010d7e197" - -require npcm8xx-igps.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb new file mode 100644 index 0000000000..78210af9d3 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb @@ -0,0 +1,4 @@ +# tag IGPS_04.01.03 +SRCREV = "ae5ddb6c8ff350835d411b9e3bfb4443db596067" + +require npcm8xx-igps.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.7.0.5.6.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.9.0.5.8.bb index 3275ec7091..66b5b123ac 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.7.0.5.6.bb +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.9.0.5.8.bb @@ -1,4 +1,4 @@ -SRCREV = "65c421f6bd7efb96c1d95fcaaf13425129fba2c0" +SRCREV = "0f7e299e0ab4153cd7ecdb511c1afd95c67fee47" OUTPUT_BIN = "output_binaries_${DEVICE_GEN}_${IGPS_MACHINE}" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2021.04.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2021.04.inc new file mode 100644 index 0000000000..07919f114b --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2021.04.inc @@ -0,0 +1,14 @@ +HOMEPAGE = "https://github.com/Nuvoton-Israel/u-boot" +SECTION = "bootloaders" +DEPENDS += "flex-native bison-native" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" + +UBRANCH = "npcm-v2021.04" +SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https" +SRCREV = "1501268746d3f0c538908ddb7a1b901864dbfcff" + +S = "${WORKDIR}/git" + +PV .= "+${UBRANCH}+" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb new file mode 100644 index 0000000000..4f06ecf2a0 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb @@ -0,0 +1,42 @@ +require u-boot-common-nuvoton_${PV}.inc + +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +DEPENDS = "mtd-utils bison-native" +RDEPENDS:${PN} = "udev-nuvoton-mtd-partitions" + +PROVIDES += "u-boot-fw-utils" +SRC_URI += "file://fw_env.config" + +INSANE_SKIP:${PN} = "already-stripped" + +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" HOSTCC="${BUILD_CC} ${BUILD_FLAGS} ${BUILD_LDFLAGS}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake envtools +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install:class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_PREPROCESS_FUNCS:class-cross = "uboot_fw_utils_cross" +uboot_fw_utils_cross() { + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2021.04.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2021.04.bb new file mode 100644 index 0000000000..6ad140eeec --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2021.04.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "U-boot for Nuvoton NPCM7xx/NPCM8xx Baseboard Management Controller" + +require u-boot-common-nuvoton_${PV}.inc +require u-boot-nuvoton.inc + +PROVIDES += "u-boot" + +DEPENDS += "dtc-native" + +SRC_URI:append:df-phosphor-mmc = " file://u-boot-emmc.cfg" diff --git a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb index ebdf6a25c4..fc25fb1d3a 100644 --- a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb +++ b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb @@ -10,7 +10,7 @@ inherit meson inherit pkgconfig SRC_URI = "git://git@github.com/open-power/ecmd-pdbg.git;branch=master;protocol=https" -SRCREV = "7a5fc053a17691a959296bc092f24153ceeeb136" +SRCREV = "0362725415c9529c20ada661c92b2dcfc514006e" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 32e3655ed5..cf555d4692 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -11,7 +11,7 @@ inherit pkgconfig meson S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/guard;branch="main";protocol=https" -SRCREV = "e000b571c82e854180ddcbda3b76754341c72618" +SRCREV = "b4c8eaa3dd5d02083a2c954c103cfda39fa87d4c" DEPENDS = "cli11" diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 8dd17dafcb..59cb749a2b 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main";protocol=https" -SRCREV = "da64b07adeb2a234c47343642c43f8aab96904a2" +SRCREV = "d6c5ff27426b2cedc7c2d29c6888b40ad96ef381" DEPENDS = " \ libekb pdbg autoconf-archive guard pdata \ diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb index 9a614290ac..79d46b7e29 100644 --- a/meta-openpower/recipes-bsp/pdata/pdata_git.bb +++ b/meta-openpower/recipes-bsp/pdata/pdata_git.bb @@ -13,7 +13,7 @@ inherit autotools \ perlnative SRC_URI = "git://git@github.com/open-power/pdata;branch="main";protocol=https" -SRCREV = "298b7970fb2268ea1e2de7bfc7db338243dc7fc3" +SRCREV = "1c25e47b7d6ef2aa40c93c038a4360bf00d78086" DEPENDS = "pdbg \ libxml-simple-perl-native \ diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb index b92dc9e53e..306798374e 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/open-power/pdbg.git;branch=master;protocol=https" -SRCREV = "e81f3f66684aa1f8a7d843528e6353751a3a223e" +SRCREV = "f429a97edc64114ffe18530a338682b6e5928195" DEPENDS += "dtc-native" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index 675cbb82fa..dc25af9a2a 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector;branch=master;protocol=https" -SRCREV = "ef64604bc773cc537f37a3274787baadbadabd48" +SRCREV = "778d1db372561811de43b7954542a4eae1183f04" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index aa24f814eb..46aefc7ec7 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control;branch=master;protocol=https" -SRCREV = "7651c06bc9ed170b6d0934fb2266dbf6fa8a6fed" +SRCREV = "32f2af0add85e2ebd4fca1606d0b6fa8afd15223" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 55c207d384..4b96916e85 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser;branch=master;protocol=https" -SRCREV = "7ef9c8cda7c4c1315706c71c703a47ead57f2d23" +SRCREV = "f842bc569162d6f38d9a7e8defccbfd024844e0f" DEPENDS += "\ nlohmann-json \ cli11 \ diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 51f0b696e6..94d9c56e86 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "obmc-ikvm is a vncserver for JPEG-serving V4L2 devices to allow i LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" -SRCREV = "033b18e03fec76a026df1b71fbc2e00f2ee6fece" +SRCREV = "1ece8e3c72c256af0b921ce0eed296b00364d79d" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index af8434fede..3a22b05519 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -9,7 +9,7 @@ DEPENDS = "boost \ sdbusplus \ valijson \ " -SRCREV = "513976bed89432f4c24a40c7ba768f023dc280cd" +SRCREV = "d96439a2924cea381af731ba1f251219a70fc9e5" PACKAGECONFIG ??= "ipmi-fru" PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," PACKAGECONFIG[validate-json] = "-Dvalidate-json=true, \ diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index c351fa6b49..ecb43eaecd 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -7,7 +7,7 @@ DEPENDS += " \ sdbusplus \ systemd \ " -SRCREV = "b77f80647113037e831d5aa488ed333d508ae0b6" +SRCREV = "70d227b6aa1549fe4c532a5f7299571659582aff" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb index 063a2eb534..0a2f77ccb1 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb @@ -9,7 +9,7 @@ DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "cli11" -SRCREV = "883d91d7d8f9a0f2bcf150990f75073cad21d94c" +SRCREV = "fb853663a2e3ca3366bf96a21a0a045f69d7ed2a" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 7a1827ef5b..cf9c867361 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector;branch=master;protocol=https" -SRCREV = "8f3f94da33eefc7a78f58c9a9260299ecaac3eaa" +SRCREV = "fa5459871335906fc1cd21037ac74aca155a991d" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 2cea421f9b..c3930713eb 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ DEPENDS = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " -SRCREV = "c8491cb0b416637f1c1119c3f0d95500a4bd9c29" +SRCREV = "049079f651fbfc465f136c8e9fe6acbd67f0434a" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 87e01a7ace..8df06ee33d 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager;branch=master;protocol=https" -SRCREV = "31424485624109a9c1e6e79e2c1e043afbfedcaa" +SRCREV = "58a0c359fb9984698a702a3580ddee0a848c05e3" diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 4de7cca645..50d4762eeb 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" DEPENDS += "autoconf-archive-native \ systemd \ " -SRCREV = "1fe5899eacb2f736766be07fe1a053784ed016b3" +SRCREV = "b3de343e8b8952d337102df130a02dd13cce5b83" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} pcap" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ --without-systemdsystemunitdir,systemd" diff --git a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb index 24e778bd4e..9ea1446220 100644 --- a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb +++ b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "PLDM library implementing various PLDM specifications" HOMEPAGE = "https://github.com/openbmc/libpldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "458475a912c81f46a292a63753015ce6081061cc" +SRCREV = "2222595d61b1c90d3f97a432d8ad55c3934c4272" LIBPLDM_ABI_DEVELOPMENT = "deprecated,stable,testing" LIBPLDM_ABI_MAINTENANCE = "stable,testing" LIBPLDM_ABI_PRODUCTION = "deprecated,stable" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 4e500f1515..1792e9339b 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -16,7 +16,7 @@ DEPENDS += "libcereal" DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" DEPENDS += "dbus" -SRCREV = "e8026679f89642e3336b8c5e495f6ab694988e7a" +SRCREV = "1537029237c18405388fabc43d29cc70d69143ab" PACKAGECONFIG ??= "" PACKAGECONFIG[openpower-pels] = " \ -Dopenpower-pel-extension=enabled, \ diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index e1176e4202..7704656ec6 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm;branch=master;protocol=https" -SRCREV = "15ce5a18e226e8495ddc9467c56eedaa6c9df618" +SRCREV = "d06de1cbf8d8a08e3cb2ed64284e54fca911515f" SUMMARY = "PLDM Stack" DESCRIPTION = "Implementation of the PLDM specifications" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 24749a7f4f..a7d0dd3fab 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power;branch=master;protocol=https" -SRCREV = "2d068dc70d1ab893315edaaaffd84160cd90c9fd" +SRCREV = "452de22e740204862cba946470a244878e614f54" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 389f20f8cd..16e5c0697a 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ phosphor-logging \ sdbusplus \ " -SRCREV = "394f0c525355fead2f997c6d9a2096d1fb88b1f0" +SRCREV = "40c4d6856ffefb5c1e8a8d4eac9b4889bc5854d1" PACKAGECONFIG ??= " \ adcsensor \ intelcpusensor \ diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index a453391213..1c006ae97b 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS:prepend = "nodejs-native " -SRCREV = "07368136b6578638f04f961b3842e93d57e41397" +SRCREV = "b325541c0a76e04eff8d48e2dce1b0592e2632bc" PV = "1.0+git${SRCPV}" # This recipe requires online access to build, as it uses NPM for dependency # management and resolution. diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 32ad115d24..2a1fb062b5 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "58232256fdd892e0a6193c5dd3a0dc5aab2b6477" +SRCREV = "edc86f3524e9e6fe7bdd64a88886be003e24090b" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https;branch=master" @@ -40,15 +40,15 @@ machine() { local cfg name tmpl local configs - # zsh requires wordsplit so that variable expansion behaves like bash - if [ -n "$ZSH_NAME" ]; then - setopt local_options shwordsplit - fi - if which find > /dev/null 2>&1; then + # zsh requires wordsplit so that variable expansion behaves like bash + if [ -n "$ZSH_NAME" ]; then + setopt local_options shwordsplit + fi + if which find > /dev/null 2>&1; then configs="$(find meta-* -path "*/conf/machine/*.conf")" - else - configs=$(ls -1 meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf) - fi + else + configs=$(ls -1 meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf) + fi # Add qemu machines. configs="$configs $(ls -1 poky/meta/conf/machine/qemu*.conf)" @@ -94,9 +94,9 @@ machine() { } if [ -z "$1" ]; then - echo Target machine must be specified. Use one of: - echo - machine | sort | sed "s/qemu[^[:space:]]*//" | "${COLUMN[@]}" + echo Target machine must be specified. Use one of: + echo + machine | sort | sed "s/qemu[^[:space:]]*//" | "${COLUMN[@]}" else bld_dir=$2 if [ -z "$2" ]; then |