diff options
Diffstat (limited to 'meta-facebook')
17 files changed, 180 insertions, 4 deletions
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index aa0e82f55..c0ca08f37 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "dunfell gatesgarth" +LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott" diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample index a452dd666..d8d02ae93 100644 --- a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample @@ -13,6 +13,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-facebook \ @@ -26,6 +27,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-facebook \ diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index 1ef53dbe9..94db7e114 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "tiogapass-layer" BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "dunfell gatesgarth" +LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott" diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample index 30d405903..18dc94472 100644 --- a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample @@ -13,6 +13,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-facebook \ @@ -26,6 +27,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-facebook \ diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 4db441577..977d5df67 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yosemitev2-layer" BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_yosemitev2-layer := "dunfell gatesgarth" +LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott" 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 6cc2450c5..28586a989 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 = "c723d6a5917cde0808713bc57934eb503fa20b8a" +SRCREV = "58c1ca2f7cc58eacc059486bacb66d152de0631c" 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 86fac887c..b2ec84b65 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -52,4 +52,5 @@ RDEPENDS_${PN}-system = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ + phosphor-virtual-sensor \ " diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/tiogapass/ttyS2.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/tiogapass/ttyS2.conf new file mode 100644 index 000000000..5716c4a60 --- /dev/null +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/tiogapass/ttyS2.conf @@ -0,0 +1,7 @@ +SOCKET_ID= +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host0 +OUT_DIR=/var/lib/obmc/hostlogs/host0 +MAX_FILES=10 diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS0.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS0.conf new file mode 100644 index 000000000..a9e5e4429 --- /dev/null +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS0.conf @@ -0,0 +1,7 @@ +SOCKET_ID=host0 +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host1 +OUT_DIR=/var/lib/obmc/hostlogs/host1 +MAX_FILES=10 diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS1.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS1.conf new file mode 100644 index 000000000..78ea5bfa0 --- /dev/null +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS1.conf @@ -0,0 +1,7 @@ +SOCKET_ID=host1 +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host2 +OUT_DIR=/var/lib/obmc/hostlogs/host2 +MAX_FILES=10 diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS2.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS2.conf new file mode 100644 index 000000000..2bcc641a4 --- /dev/null +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS2.conf @@ -0,0 +1,7 @@ +SOCKET_ID=host2 +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host3 +OUT_DIR=/var/lib/obmc/hostlogs/host3 +MAX_FILES=10 diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS3.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS3.conf new file mode 100644 index 000000000..59bdb866e --- /dev/null +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/yosemitev2/ttyS3.conf @@ -0,0 +1,7 @@ +SOCKET_ID=host3 +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host4 +OUT_DIR=/var/lib/obmc/hostlogs/host4 +MAX_FILES=10 diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend new file mode 100644 index 000000000..3c280ceba --- /dev/null +++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://ttyS2.conf" + +SRC_URI_append_yosemitev2 += "file://ttyS0.conf" +SRC_URI_append_yosemitev2 += "file://ttyS1.conf" +SRC_URI_append_yosemitev2 += "file://ttyS3.conf" + +do_install_append() { + + # Install the configurations + install -m 0755 -d ${D}${sysconfdir}/${BPN} + install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ + + # Remove upstream-provided default configuration + rm -f ${D}${sysconfdir}/${BPN}/ttyVUART0.conf +} diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json new file mode 100644 index 000000000..a394faef8 --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json @@ -0,0 +1,46 @@ +[ + { + "Desc" : + { + "Name" : "Virtual_Inlet_Temp", + "SensorType" : "temperature" + }, + "Threshold" : + { + "CriticalHigh": 90, + "CriticalLow": 20, + "WarningHigh": 70, + "WarningLow": 30 + }, + "Params": + { + "ConstParam" : + [ + { + "ParamName" : "P1", + "Value" : 1.1 + } + ], + "DbusParam" : + [ + { + "ParamName" : "P2", + "Desc" : + { + "Name" : "MB_INLET_TEMP", + "SensorType" : "temperature" + } + }, + { + "ParamName" : "P3", + "Desc" : + { + "Name" : "MB_FAN0_TACH", + "SensorType" : "fan_tach" + } + } + ] + }, + "Expression" : "P1 * (P2 + 5 - P3 * 0.01)" + } +] diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json new file mode 100644 index 000000000..c56712dbd --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json @@ -0,0 +1,51 @@ +[ + { + "Desc" : + { + "Name" : "Virtual_CFM_Sensor", + "SensorType" : "airflow" + }, + "Threshold" : + { + "CriticalHigh": 40, + "CriticalLow": 10, + "WarningHigh": 30, + "WarningLow": 15 + }, + "Params": + { + "ConstParam" : + [ + { + "ParamName" : "P1", + "Value" : 0.00565 + }, + { + "ParamName" : "P2", + "Value" : 3.7427 + } + ], + "DbusParam" : + [ + { + "ParamName" : "P3", + "Desc" : + { + "Name" : "SP_FAN0_TACH", + "SensorType" : "fan_tach" + } + }, + { + "ParamName" : "P4", + "Desc" : + { + "Name" : "SP_FAN1_TACH", + "SensorType" : "fan_tach" + } + } + ] + }, + "Expression" : "(P3 * P1) + (P4 * P1) - P2" + } +] + diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 000000000..94650bab6 --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" + +SRC_URI_append = " file://${MACHINE}_sensor_config.json" + +do_install_append() { + + install -d ${D}/usr/share/phosphor-virtual-sensor + + install -m 0644 -D ${WORKDIR}/${MACHINE}_sensor_config.json \ + ${D}/usr/share/phosphor-virtual-sensor/virtual_sensor_config.json +} diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/chassis-system-reset.service b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/chassis-system-reset.service new file mode 100644 index 000000000..91cbc90df --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/chassis-system-reset.service @@ -0,0 +1,11 @@ +[Unit] +Description=System unit to hard reset or system reset chassis for yosemitev2 + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=i2cset -f -y 10 0x40 0xd9 c + +[Install] +WantedBy=chassis-system-reset.target + |