diff options
Diffstat (limited to 'meta-facebook')
20 files changed, 306 insertions, 84 deletions
diff --git a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc index f472cfa47..e668d4bf9 100644 --- a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc +++ b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-compute.inc +MACHINEOVERRIDES =. "fb-compute-multihost:" -OVERRIDES .= ":fb-compute-multihost" +require conf/machine/include/facebook-compute.inc diff --git a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc index f6a868329..7b642c3c5 100644 --- a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc +++ b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-compute.inc +MACHINEOVERRIDES =. "fb-compute-singlehost:" -OVERRIDES .= ":fb-compute-singlehost" +require conf/machine/include/facebook-compute.inc diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc index 7d61f81e1..748a1feb4 100644 --- a/meta-facebook/conf/machine/include/facebook-compute.inc +++ b/meta-facebook/conf/machine/include/facebook-compute.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-withhost.inc +MACHINEOVERRIDES =. "fb-compute:" -OVERRIDES .= ":fb-compute" +require conf/machine/include/facebook-withhost.inc diff --git a/meta-facebook/conf/machine/include/facebook-nohost.inc b/meta-facebook/conf/machine/include/facebook-nohost.inc index e9af8e94d..a98da9979 100644 --- a/meta-facebook/conf/machine/include/facebook-nohost.inc +++ b/meta-facebook/conf/machine/include/facebook-nohost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook.inc +MACHINEOVERRIDES =. "fb-nohost:" -OVERRIDES .= ":fb-nohost" +require conf/machine/include/facebook.inc diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index ebe79d1a4..861d35f86 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -1,6 +1,8 @@ +MACHINEOVERRIDES =. "fb-withhost:" + require conf/machine/include/facebook.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-host-ipmi \ obmc-host-state-mgmt \ @@ -12,4 +14,3 @@ VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -OVERRIDES .= ":fb-withhost" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index d18a66bf5..47b641dfc 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,4 +1,6 @@ -OBMC_MACHINE_FEATURES += "\ +DISTROOVERRIDES .= ":facebook" + +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ @@ -14,4 +16,5 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" -OVERRIDES .= ":facebook" +# Most of our hardware uses the default ttyS4 but at 57600. +SERIAL_CONSOLES:facebook = "57600;ttyS4" diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index 03af91001..9427df28a 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -11,6 +11,4 @@ require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/facebook-tpm2.inc -SERIAL_CONSOLES = "57600;ttyS4" - FLASH_SIZE = "131072" diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf index 1e6ee084b..fce4b93f2 100644 --- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf +++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf @@ -7,7 +7,5 @@ require conf/machine/include/facebook-compute-singlehost.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -SERIAL_CONSOLES = "57600;ttyS4" - PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index d246cc9b3..f57383b8c 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -7,8 +7,6 @@ require conf/machine/include/facebook-compute-multihost.inc require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -SERIAL_CONSOLES = "57600;ttyS4" - PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" FLASH_SIZE = "32768" OBMC_HOST_INSTANCES = "1 2 3 4" diff --git a/meta-facebook/recipes-extended/timezone/tzdata.bbappend b/meta-facebook/recipes-extended/timezone/tzdata.bbappend new file mode 100644 index 000000000..9e6694239 --- /dev/null +++ b/meta-facebook/recipes-extended/timezone/tzdata.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +DEFAULT_TIMEZONE = "PST8PDT" diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util index 30fa34cc8..d00dfde7f 100755 --- a/meta-facebook/recipes-fb/fb-powerctrl/files/power-util +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util @@ -1,83 +1,83 @@ #!/bin/bash # Usage of this utility function usage() { - echo "usage: power-util mb [on|off|status|cycle|reset]"; - echo " power-util sled-cycle" + echo "usage: power-util mb [on|off|status|cycle|reset]"; + echo " power-util sled-cycle" } power_off() { - echo "Shutting down Server $2" - 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 + echo "Shutting down Server" + 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 } power_on() { - echo "Powering on Server $2" - 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 + echo "Powering on Server" + 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 } power_status() { - st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) - if [ "$st" == "On\"" ]; then - echo "on" - else - echo "off" - fi + st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) + if [ "$st" == "On\"" ]; then + echo "on" + else + echo "off" + fi } power_reset() { - echo "Reset on server $2" - 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 + echo "Reset on server" + 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 } sled_cycle() { - i2cset -y 7 0x45 0xd9 c + i2cset -y 7 0x45 0xd9 c } -if [ $1 == "sled-cycle" ]; then - echo "SLED_CYCLE starting at $(date)" - sled_cycle - exit 0; +if [ "$1" == "sled-cycle" ]; then + echo "SLED_CYCLE starting at $(date)" + sled_cycle + exit 0; fi if [ $# -lt 2 ]; then - echo "Total number of parameter=$#" - echo "Insufficient parameter" - usage; - exit 0; + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; fi -if [ $1 != "mb" ]; then - echo "Invalid parameter1=$1" - usage; - exit 0; +if [ "$1" != "mb" ]; then + echo "Invalid parameter1=$1" + usage; + exit 0; fi -if [ $2 = "on" ]; then - if [ $(power_status) == "off" ]; then - power_on +if [ "$2" = "on" ]; then + if [ "$(power_status)" == "off" ]; then + power_on fi -elif [ $2 = "off" ]; then - if [ $(power_status) == "on" ]; then - power_off +elif [ "$2" = "off" ]; then + if [ "$(power_status)" == "on" ]; then + power_off fi -elif [ $2 == "cycle" ]; then - if [ $(power_status) == "on" ]; then - power_off +elif [ "$2" == "cycle" ]; then + if [ "$(power_status)" == "on" ]; then + power_off else echo "WARNING: Powering on server" fi - power_on -elif [ $2 == "reset" ]; then - if [ $(power_status) == "on" ]; then - power_reset + power_on +elif [ "$2" == "reset" ]; then + if [ "$(power_status)" == "on" ]; then + power_reset else echo "ERROR: Server not powered on" fi -elif [ $2 == "status" ]; then - power_status +elif [ "$2" == "status" ]; then + power_status else - echo "Invalid parameter2=$2" - usage; + echo "Invalid parameter2=$2" + usage; fi exit 0; diff --git a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh index 2624abd0d..cac3b20c7 100755 --- a/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh @@ -7,16 +7,16 @@ function set_gpio_active_low() { return; fi - echo $1 > /sys/class/gpio/export - echo $2 > /sys/class/gpio/gpio$1/direction + echo "$1" > /sys/class/gpio/export + echo "$2" > "/sys/class/gpio/gpio$1/direction" } GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) # FM_BMC_READY_N, GPIO S1, active low -set_gpio_active_low $((${GPIO_BASE} + 144 +1)) low +set_gpio_active_low $((GPIO_BASE + 144 +1)) low # FP_PECI_MUX, active low -set_gpio_active_low $((${GPIO_BASE} + 212)) high +set_gpio_active_low $((GPIO_BASE + 212)) high exit 0; diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index ceade37d2..5dc4a60c7 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "485f9b31cbdc8e8aebdfb18729f541f41227522d" +SRCREV = "dd0415b50776fade388ac7523f8aabe6a8a9fb68" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index d9c2abd53..4b8704321 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -53,6 +53,7 @@ RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ + tzdata-core \ " SUMMARY:${PN}-system = "Facebook System" diff --git a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh index fd1c52b2a..4b99f0be4 100755 --- a/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh @@ -20,16 +20,16 @@ set_gpio_to_bmc() echo "switch bios GPIO to bmc" if [ ! -d /sys/class/gpio/gpio$GPIO ]; then cd /sys/class/gpio - echo $GPIO > export + echo $GPIO > "export" cd gpio$GPIO else cd /sys/class/gpio/gpio$GPIO fi - direc=`cat direction` - if [ $direc == "in" ]; then + direc=$(cat direction) + if [ "$direc" == "in" ]; then echo "out" > direction fi - data=`cat value` + data=$(cat value) if [ "$data" == "0" ]; then echo 1 > value fi @@ -41,16 +41,16 @@ set_gpio_to_pch() echo "switch bios GPIO to pch" if [ ! -d /sys/class/gpio/gpio$GPIO ]; then cd /sys/class/gpio - echo $GPIO > export + echo $GPIO > "export" cd gpio$GPIO else cd /sys/class/gpio/gpio$GPIO fi - direc=`cat direction` - if [ $direc == "in" ]; then + direc=$(cat direction) + if [ "$direc" == "in" ]; then echo "out" > direction fi - data=`cat value` + data=$(cat value) if [ "$data" == "1" ]; then echo 0 > value fi @@ -65,17 +65,18 @@ echo "Bios upgrade started at $(date)" echo "Power off host server" $POWER_CMD off sleep 15 -if [ $($POWER_CMD status) != "off" ]; +if [ "$($POWER_CMD status)" != "off" ]; then echo "Host server didn't power off" echo "Bios upgrade failed" - exit -1 + exit 1 fi echo "Host server powered off" #Set ME to recovery mode echo "Set ME to recovery mode" -busctl call $IPMB_OBJ $IPMB_PATH $IPMB_INTF $IPMB_CALL $ME_CMD_RECOVER +# shellcheck disable=SC2086 +busctl call "$IPMB_OBJ" "$IPMB_PATH" "$IPMB_INTF" $IPMB_CALL $ME_CMD_RECOVER sleep 5 #Flip GPIO to access SPI flash used by host. @@ -93,11 +94,10 @@ then echo "Bios image is $IMAGE_FILE" for d in mtd6 mtd7 ; do if [ -e "/dev/$d" ]; then - mtd=`cat /sys/class/mtd/$d/name` - if [ $mtd == "pnor" ]; then + mtd=$(cat /sys/class/mtd/$d/name) + if [ "$mtd" == "pnor" ]; then echo "Flashing bios image to $d..." - flashcp -v $IMAGE_FILE /dev/$d - if [ $? -eq 0 ]; then + if flashcp -v "$IMAGE_FILE" /dev/$d; then echo "bios updated successfully..." else echo "bios update failed..." @@ -125,7 +125,8 @@ sleep 5 #Reset ME to boot from new bios echo "Reset ME to boot from new bios" -busctl call $IPMB_OBJ $IPMB_PATH $IPMB_INTF $IPMB_CALL $ME_CMD_RESET +# shellcheck disable=SC2086 +busctl call "$IPMB_OBJ" "$IPMB_PATH" "$IPMB_INTF" $IPMB_CALL $ME_CMD_RESET sleep 10 #Power on server @@ -134,7 +135,7 @@ $POWER_CMD on sleep 5 # Retry to power on once again if server didn't powered on -if [ $($POWER_CMD status) != "on" ]; +if [ "$($POWER_CMD status)" != "on" ]; then sleep 5 echo "Powering on server again" diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json new file mode 100644 index 000000000..8c8379e1e --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/1_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json new file mode 100644 index 000000000..ebf7bf029 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/2_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json new file mode 100644 index 000000000..3631dc392 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/3_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json new file mode 100644 index 000000000..dac58ae34 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "SlotPower", + "LineName" : "SLOT1_POWER", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT1", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + + { + "Name" : "PowerOk", + "DbusName" : "xyz.openbmc_project.IpmbSensor", + "Path" : "/xyz/openbmc_project/gpio/volt/4_CPU_Good", + "Interface" : "xyz.openbmc_project.Chassis.Control.Power", + "Property" : "PGood", + "Type" : "DBUS" + } +], +"timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000, + "slotPowerCycleTimeMs": 200 +} +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend index c119baca9..862f2f179 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,2 +1,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON" + +SRC_URI:append:yosemitev2 = " file://power-config-host1.json" +SRC_URI:append:yosemitev2 = " file://power-config-host2.json" +SRC_URI:append:yosemitev2 = " file://power-config-host3.json" +SRC_URI:append:yosemitev2 = " file://power-config-host4.json" + +do_install:append:yosemitev2() { + install -m 0755 -d ${D}/${datadir}/${BPN} + install -m 0644 -D ${WORKDIR}/*.json \ + ${D}/${datadir}/${BPN}/ +} |