From 001348a18193180988f6d1715be66f98e71b7f62 Mon Sep 17 00:00:00 2001 From: Vijay Khemka Date: Wed, 4 Mar 2020 11:29:09 -0800 Subject: meta-facebook: Move recipes-phosphor to facebook layer Moved recipe-phosphor to meta-facebook to support multiple facebook platform and make use of common code across platforms. (From meta-facebook rev: 2b00ba0327fcef6ae98243bc48367b395460805f) Change-Id: If3b847b60c60d1d93c3c26be0018eb8408e4f93e Signed-off-by: Vijay Khemka Signed-off-by: Andrew Geissler --- .../console/obmc-console/obmc-console.conf | 2 -- .../console/obmc-console_%.bbappend | 2 -- .../fans/phosphor-pid-control_%.bbappend | 3 -- .../ipmi/phosphor-ipmi-config.bbappend | 1 - .../ipmi/phosphor-ipmi-config/channel_config.json | 38 ---------------------- .../ipmi/phosphor-ipmi-config/dev_id.json | 2 -- .../ipmi/phosphor-ipmi-ipmb/ipmb-channels.json | 16 --------- .../ipmi/phosphor-ipmi-ipmb_%.bbappend | 8 ----- .../sel-logger/phosphor-sel-logger_%.bbappend | 3 -- .../phosphor-watchdog-host-cycle.service | 12 ------- .../phosphor-watchdog-host-poweroff.service | 9 ----- .../phosphor-watchdog-host-reset.service | 10 ------ .../phosphor-watchdog/phosphor-watchdog.service | 16 --------- .../watchdog/phosphor-watchdog_%.bbappend | 5 --- 14 files changed, 127 deletions(-) delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console/obmc-console.conf delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console_%.bbappend delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service delete mode 100644 meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend (limited to 'meta-facebook/meta-tiogapass') diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console/obmc-console.conf deleted file mode 100644 index 94f1dff853..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console/obmc-console.conf +++ /dev/null @@ -1,2 +0,0 @@ -local-tty = ttyS2 -baud = 57600 diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console_%.bbappend deleted file mode 100644 index 24b52d7319..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" -OBMC_CONSOLE_HOST_TTY = "ttyS2" diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend deleted file mode 100644 index b70a42957d..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -EXTRA_OECONF_append_tiogapass = " --enable-configure-dbus=yes" diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend deleted file mode 100644 index 8a58a2da29..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json deleted file mode 100644 index eea3b4e208..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "0" : { - "name" : "IPMB", - "is_valid" : true, - "active_sessions" : 0, - "max_transfer_size" : 256, - "channel_info" : { - "medium_type" : "ipmb", - "protocol_type" : "ipmb-1.0", - "session_supported" : "session-less", - "is_ipmi" : true - } - }, - "1" : { - "name" : "eth0", - "is_valid" : true, - "active_sessions" : 0, - "max_transfer_size" : 256, - "channel_info" : { - "medium_type" : "lan-802.3", - "protocol_type" : "ipmb-1.0", - "session_supported" : "multi-session", - "is_ipmi" : true - } - }, - "8" : { - "name" : "INTRABMC", - "is_valid" : true, - "active_sessions" : 0, - "max_transfer_size" : 256, - "channel_info" : { - "medium_type" : "oem", - "protocol_type" : "oem", - "session_supported" : "session-less", - "is_ipmi" : true - } - } -} diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json deleted file mode 100644 index f079091d67..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json +++ /dev/null @@ -1,2 +0,0 @@ -{"id": 32, "revision": 129, "addn_dev_support": 191, - "manuf_id": 40981, "prod_id": 12614, "aux": 0} diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json deleted file mode 100644 index 690f9e733b..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "channels": [ - { - "type": "me", - "slave-path": "/dev/ipmb-4", - "bmc-addr": 32, - "remote-addr": 44 - }, - { - "type": "ipmb", - "slave-path": "/dev/ipmb-9", - "bmc-addr": 32, - "remote-addr": 96 - } - ] -} diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend deleted file mode 100644 index b3205affab..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" - -SRC_URI_append_tiogapass = " file://ipmb-channels.json" - -do_install_append_tiogapass(){ - install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ - ${D}/usr/share/ipmbbridge -} diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend deleted file mode 100644 index 4948cb4cb3..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Enable threshold monitoring -EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" -EXTRA_OECMAKE += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service deleted file mode 100644 index 3a22e56b9c..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Power Cycle Host Server -Requires=host-gpio.service -After=host-gpio.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-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service deleted file mode 100644 index ddcb9dc626..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Shutdown Host Server -Requires=host-gpio.service -After=host-gpio.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-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service deleted file mode 100644 index f0f03a1cc9..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Reset Host Server -Requires=host-gpio.service -After=host-gpio.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-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service deleted file mode 100644 index f7e93b82f2..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service +++ /dev/null @@ -1,16 +0,0 @@ -[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-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend deleted file mode 100644 index b0dcd093c6..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -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" -- cgit v1.2.3