96 files changed, 670 insertions, 101 deletions

diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 45339edf33..df9ce561aa 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.36"
+LINUX_VERSION ?= "6.6.39"
 
-SRCREV="57904291176fa16a981cefca5cbe1a0b50196792"
+SRCREV="ee1cd5048959de496cd005c50b137212a5b62062"
 
 require linux-aspeed.inc
diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch
deleted file mode 100644
index fb26499b51..0000000000
--- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6901c1fb9c8fbf33461811b9f1667bcaf876b747 Mon Sep 17 00:00:00 2001
-From: John Wang <wangzhiqiang.bj@bytedance.com>
-Date: Wed, 30 Sep 2020 13:02:22 +0800
-Subject: [PATCH 5/5] ARM: dts: aspeed: Enable g220a uart route
-
-Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com>
----
- arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
-index 2ae2684c115c..c18ca23f57ac 100644
---- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
-+++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
-@@ -929,3 +929,7 @@ &video {
- &vhub {
- 	status = "okay";
- };
-+
-+&uart_routing {
-+       status = "okay";
-+};
--- 
-2.25.1
-
diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend
index e962940a64..2b600b3abc 100644
--- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,5 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:g220a = " file://g220a.cfg \
-			 file://0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch \
-                       "
+SRC_URI:append:g220a = " file://g220a.cfg"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control/config.json
new file mode 100644
index 0000000000..8e741cb25c
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control/config.json
@@ -0,0 +1,545 @@
+{
+    "sensors": [
+        {
+            "name": "MB_CPU_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A0_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A0_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A10_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A10_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A1_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A1_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A2_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A2_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A4_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A4_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A6_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A6_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A7_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A7_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_DIMM_A8_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A8_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_VR_CPU_PDDIO_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_PDDIO_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_VR_CPU_PVDD11_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_PVDD11_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_VR_CPU_SOC_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_SOC_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_VR_CPU_VCORE0_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_VCORE0_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_VR_CPU_VCORE1_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_VCORE1_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_RETIMER0_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_RETIMER0_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "MB_RETIMER1_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/MB_RETIMER1_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "NIC_Temp_1",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/NIC_Temp_1",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "SCM_INLET_TEMP_C",
+            "type": "temp",
+            "readPath": "/xyz/openbmc_project/sensors/temperature/SCM_INLET_TEMP_C",
+            "timeout": 0,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN0_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN0_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN0_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN0_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN1_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN1_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN1_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN1_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN2_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN2_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN2_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN2_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN3_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN3_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP0_FAN3_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN3_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN0_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN0_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN0_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN0_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN1_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN1_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN1_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN1_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN2_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN2_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN2_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN2_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN3_TACH_IL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN3_TACH_IL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        },
+        {
+            "name": "FAN_BP1_FAN3_TACH_OL_SPEED_RPM",
+            "type": "fan",
+            "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN3_TACH_OL_SPEED_RPM",
+            "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM",
+            "min": 0,
+            "max": 255,
+            "ignoreDbusMinMax": true
+        }
+    ],
+
+    "zones": [
+        {
+            "id": 1,
+            "failsafePercent": 100.0,
+            "minThermalOutput": 0.0,
+            "cycleTimeBaseMS": 1000,
+            "updateThermalsTimeMS": 1000,
+            "accumulateSetPoint": true,
+            "pids": [
+                {
+                    "name": "All Fan",
+                    "type": "fan",
+                    "inputs": [
+                        "FAN_BP0_FAN0_TACH_IL_SPEED_RPM",
+                        "FAN_BP0_FAN0_TACH_OL_SPEED_RPM",
+                        "FAN_BP0_FAN1_TACH_IL_SPEED_RPM",
+                        "FAN_BP0_FAN1_TACH_OL_SPEED_RPM",
+                        "FAN_BP0_FAN2_TACH_IL_SPEED_RPM",
+                        "FAN_BP0_FAN2_TACH_OL_SPEED_RPM",
+                        "FAN_BP0_FAN3_TACH_IL_SPEED_RPM",
+                        "FAN_BP0_FAN3_TACH_OL_SPEED_RPM",
+                        "FAN_BP1_FAN0_TACH_IL_SPEED_RPM",
+                        "FAN_BP1_FAN0_TACH_OL_SPEED_RPM",
+                        "FAN_BP1_FAN1_TACH_IL_SPEED_RPM",
+                        "FAN_BP1_FAN1_TACH_OL_SPEED_RPM",
+                        "FAN_BP1_FAN2_TACH_IL_SPEED_RPM",
+                        "FAN_BP1_FAN2_TACH_OL_SPEED_RPM",
+                        "FAN_BP1_FAN3_TACH_IL_SPEED_RPM",
+                        "FAN_BP1_FAN3_TACH_OL_SPEED_RPM"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "proportionalCoeff": 0.0,
+                        "integralCoeff": 0.0,
+                        "derivativeCoeff": 0.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 1.0,
+                        "integralLimit_min": 0.0,
+                        "integralLimit_max": 0.0,
+                        "outLim_min": 0.0,
+                        "outLim_max": 100.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 0
+                    }
+                },
+                {
+                    "name": "Stepwise_MB_CPU",
+                    "type": "stepwise",
+                    "inputs": [
+                        "MB_CPU_TEMP_C"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 55,
+                            "1": 60,
+                            "2": 65,
+                            "3": 70,
+                            "4": 75
+                        },
+                        "output": {
+                            "0": 20,
+                            "1": 25,
+                            "2": 30,
+                            "3": 35,
+                            "4": 40
+                        },
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2
+                    }
+                },
+                {
+                    "name": "PID_MB_CPU",
+                    "type": "temp",
+                    "inputs": [
+                        "MB_CPU_TEMP_C"
+                    ],
+                    "setpoint": 79.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "proportionalCoeff": -3.0,
+                        "integralCoeff": -0.0035,
+                        "derivativeCoeff": 0.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 0.0,
+                        "integralLimit_min": -50.0,
+                        "integralLimit_max": 100.0,
+                        "outLim_min": 0.0,
+                        "outLim_max": 100.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2,
+                        "checkHysterWithSetpt": true
+                    }
+                },
+                {
+                    "name": "Stepwise_MB_DIMM",
+                    "type": "stepwise",
+                    "inputs": [
+                        "MB_DIMM_A0_TEMP_C",
+                        "MB_DIMM_A1_TEMP_C",
+                        "MB_DIMM_A2_TEMP_C",
+                        "MB_DIMM_A4_TEMP_C",
+                        "MB_DIMM_A6_TEMP_C",
+                        "MB_DIMM_A7_TEMP_C",
+                        "MB_DIMM_A8_TEMP_C",
+                        "MB_DIMM_A10_TEMP_C"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 60,
+                            "1": 70,
+                            "2": 75
+                        },
+                        "output": {
+                            "0": 20,
+                            "1": 25,
+                            "3": 30
+                        },
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2
+                    }
+                },
+                {
+                    "name": "PID_MB_DIMM",
+                    "type": "temp",
+                    "inputs": [
+                        "MB_DIMM_A0_TEMP_C",
+                        "MB_DIMM_A1_TEMP_C",
+                        "MB_DIMM_A2_TEMP_C",
+                        "MB_DIMM_A4_TEMP_C",
+                        "MB_DIMM_A6_TEMP_C",
+                        "MB_DIMM_A7_TEMP_C",
+                        "MB_DIMM_A8_TEMP_C",
+                        "MB_DIMM_A10_TEMP_C"
+                   ],
+                    "setpoint": 79.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "proportionalCoeff": -3.0,
+                        "integralCoeff": -0.0035,
+                        "derivativeCoeff": 0.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 0.0,
+                        "integralLimit_min": -50.0,
+                        "integralLimit_max": 100.0,
+                        "outLim_min": 0.0,
+                        "outLim_max": 100.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2,
+                        "checkHysterWithSetpt": true
+                    }
+                },
+                {
+                    "name": "Stepwise_MB_VR",
+                    "type": "stepwise",
+                    "inputs": [
+                        "MB_VR_CPU_VCORE0_TEMP_C",
+                        "MB_VR_CPU_VCORE1_TEMP_C",
+                        "MB_VR_CPU_PVDD11_TEMP_C",
+                        "MB_VR_CPU_PDDIO_TEMP_C",
+                        "MB_VR_CPU_SOC_TEMP_C"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 80,
+                            "1": 90,
+                            "2": 100
+                        },
+                        "output": {
+                            "0": 20,
+                            "1": 25,
+                            "2": 90
+                        },
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2
+                    }
+                },
+                {
+                    "name": "Stepwise_MB_RETIMER",
+                    "type": "stepwise",
+                    "inputs": [
+                        "MB_RETIMER0_TEMP_C",
+                        "MB_RETIMER1_TEMP_C"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 80,
+                            "1": 90,
+                            "2": 100
+                        },
+                        "output": {
+                            "0": 20,
+                            "1": 25,
+                            "2": 90
+                        },
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2
+                    }
+                },
+                {
+                    "name": "Stepwise_NIC",
+                    "type": "stepwise",
+                    "inputs": [
+                        "NIC_Temp_1"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 80,
+                            "1": 90,
+                            "2": 100
+                        },
+                        "output": {
+                            "0": 20,
+                            "1": 25,
+                            "2": 90
+                        },
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2
+                    }
+                },
+                {
+                    "name": "Stepwise_SCM_INLET",
+                    "type": "stepwise",
+                    "inputs": [
+                        "SCM_INLET_TEMP_C"
+                    ],
+                    "setpoint": 0.0,
+                    "pid": {
+                        "samplePeriod": 1,
+                        "isCeiling": false,
+                        "reading": {
+                            "0": 25,
+                            "1": 30,
+                            "2": 35,
+                            "3": 40
+                        },
+                        "output": {
+                            "0": 20,
+                            "1": 25,
+                            "2": 35,
+                            "3": 90
+                        },
+                        "positiveHysteresis": 0,
+                        "negativeHysteresis": 2
+                    }
+                }
+            ]
+        }
+    ]
+}
diff --git a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
new file mode 100644
index 0000000000..56632d8fd8
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:"
+SRC_URI:append = " file://config.json \
+                           "
+
+FILES:${PN}:append = " ${datadir}/swampd/config.json"
+
+do_install:append() {
+    install -d ${D}${datadir}/swampd
+    install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/config.json
+}
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 7402df4325..fa5af7db69 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
@@ -148,8 +148,8 @@
         "GpioNum": 92,
         "EventMon": "BOTH",
         "Targets": {
-            "RISING": ["deassert-gpio-log@leakage-detect-alert.service", "host-power-on.service"],
-            "FALLING": ["assert-gpio-log@leakage-detect-alert.service", "host-power-off.service"]
+            "RISING": ["deassert-gpio-log@leakage-detect-alert.service"],
+            "FALLING": ["assert-gpio-log@leakage-detect-alert.service"]
         },
         "Continue": true
     },
diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf
index d59ca0811c..a3651235e3 100644
--- a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf
+++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf
@@ -28,27 +28,11 @@ template(name="IPMISELTemplate" type="list") {
     constant(value="\n")
 }
 
-# Template for Redfish messages
-# "<timestamp> <MessageId>,<MessageArgs>"
-template(name="RedfishTemplate" type="list") {
-    property(name="timereported" dateFormat="rfc3339")
-    constant(value=" ")
-    property(name="$!REDFISH_MESSAGE_ID")
-    constant(value=",")
-    property(name="$!REDFISH_MESSAGE_ARGS")
-    constant(value="\n")
-}
-
 # If the journal entry has a IPMI SEL MESSAGE_ID, save as IPMI SEL
 if ($!IPMISEL_MESSAGE_ID != "") then {
    action(type="omfile" file="/var/log/ipmi_sel" template="IPMISELTemplate")
 }
 
-# If the journal entry has a Redfish MessageId, save as a Redfish event
-if ($!REDFISH_MESSAGE_ID != "") then {
-   action(type="omfile" file="/var/log/redfish" template="RedfishTemplate")
-}
-
 # At least one of the consoles will require streaming host console.
 module(load="imfile")
 
diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
index b564c3812e..02f80a9d28 100644
--- a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
+++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
@@ -10,14 +10,3 @@
         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-google/recipes-google/google-misc/google-misc.inc b/meta-google/recipes-google/google-misc/google-misc.inc
index 9870e97723..a630a60109 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 = "08988f3dd9b4e0eed788f029d380c876841c09eb"
+SRCREV = "177e7270dc45490ed9410c6f66363e4163278495"
 
 S = "${WORKDIR}/git/subprojects/${GOOGLE_MISC_PROJ}"
 inherit meson pkgconfig
diff --git a/meta-ieisystems/COPYING.MIT b/meta-ieisystem/COPYING.MIT
index 89de354795..89de354795 100644
--- a/meta-ieisystems/COPYING.MIT
+++ b/meta-ieisystem/COPYING.MIT
diff --git a/meta-ieisystems/COPYING.apache-2.0 b/meta-ieisystem/COPYING.apache-2.0
index 67db858821..67db858821 100644
--- a/meta-ieisystems/COPYING.apache-2.0
+++ b/meta-ieisystem/COPYING.apache-2.0
diff --git a/meta-ieisystems/LICENSE b/meta-ieisystem/LICENSE
index 1dab391387..b9d4f1e640 100644
--- a/meta-ieisystems/LICENSE
+++ b/meta-ieisystem/LICENSE
@@ -1,4 +1,4 @@
-Different components of meta-ieisystems are under different licenses
+Different components of meta-ieisystem are under different licenses
 (a mix of MIT and Apache-2.0). Please see:
 
 COPYING.Apache-2.0
diff --git a/meta-ieisystems/OWNERS b/meta-ieisystem/OWNERS
index 2df0440475..2df0440475 100644
--- a/meta-ieisystems/OWNERS
+++ b/meta-ieisystem/OWNERS
diff --git a/meta-ieisystems/conf/layer.conf b/meta-ieisystem/conf/layer.conf
index 60f56a95e0..1771003e5e 100644
--- a/meta-ieisystems/conf/layer.conf
+++ b/meta-ieisystem/conf/layer.conf
@@ -5,6 +5,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "ieisystems-layer"
-BBFILE_PATTERN_ieisystems-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ieisystems-layer = "nanbield scarthgap"
+BBFILE_COLLECTIONS += "ieisystem-layer"
+BBFILE_PATTERN_ieisystem-layer = "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_ieisystem-layer = "nanbield scarthgap"
diff --git a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
index 2570a9a199..2570a9a199 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
diff --git a/meta-ieisystems/meta-fp5280g3/conf/layer.conf b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
index 057258b0c0..057258b0c0 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/layer.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
diff --git a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
index 0e81ea0553..4c99703f78 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
@@ -1,11 +1,11 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = " \
-    aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \
+    aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \
 "
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
-#UBOOT_DEVICETREE = "ast2600-ieisystems-fp5280g3"
+#UBOOT_DEVICETREE = "ast2600-ieisystem-fp5280g3"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 require conf/distro/include/phosphor-mmc.inc
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
index 8b2699e383..d8485a5c17 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
@@ -14,6 +14,6 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ieisystems \
-  ##OEROOT##/meta-ieisystems/meta-fp5280g3 \
+  ##OEROOT##/meta-ieisystem \
+  ##OEROOT##/meta-ieisystem/meta-fp5280g3 \
   "
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt
index 9b3c01a556..9b3c01a556 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample
index 279569a9be..279569a9be 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
index 6c3da1a91b..6c3da1a91b 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
+++ b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
index 41a58934ce..41a58934ce 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
index cc872bd2de..cc872bd2de 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
index 8da9acad79..8da9acad79 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
index 745095e197..745095e197 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
index 4878d52977..4878d52977 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
index cfc14d02d7..cfc14d02d7 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
index 9dd7181d83..9dd7181d83 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
index 88b781911b..88b781911b 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index bf8e2bf5a0..bf8e2bf5a0 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 6689276c69..6689276c69 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
index cdeb23680e..cdeb23680e 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 1b6c91265f..1b6c91265f 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
index e77a553638..e77a553638 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
index 36d9babdb3..36d9babdb3 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
index eb5bc2a2ec..eb5bc2a2ec 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index f5a790801d..f5a790801d 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index d06de11c26..d06de11c26 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index f60fb6e161..f60fb6e161 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index a4a9551732..a4a9551732 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
index 6bf4409c78..6bf4409c78 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
index 04c1245801..04c1245801 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
index 92b8546806..92b8546806 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
index 6fc8a98fe7..6fc8a98fe7 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
index 8b6248a461..8b6248a461 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
index 136847d442..136847d442 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index e0bd907a4d..d166a012bd 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -12,10 +12,4 @@ RDEPENDS:${PN}-extras:append = " \
         phosphor-host-postd \
         phosphor-virtual-sensor \
         libmctp \
-        tzdata-core \
-        iei-ipmi-oem \
-        "
-
-RDEPENDS:${PN}-devtools:append = " \
-        ipmitool \
         "
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
index 0eb993d305..0eb993d305 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
index e790c639ad..e790c639ad 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 9bfbdcb934..9bfbdcb934 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
index c1dd14ba85..c1dd14ba85 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index e603990c2f..e603990c2f 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/conf/layer.conf b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
index f0f36da335..f0f36da335 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/layer.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
diff --git a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
index 2f020adde1..5a47f0e419 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
@@ -1,12 +1,12 @@
 # Add a device tree for nf5280m7
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = " \
-    aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \
+    aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \
 "
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
-# UBOOT_DEVICETREE = "${UMACHINE}-ieisystems-${MACHINE}"
+# UBOOT_DEVICETREE = "${UMACHINE}-ieisystem-${MACHINE}"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 require conf/machine/include/ast2600.inc
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
index 6297743d11..46100128ed 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-ieisystems \
-  ##OEROOT##/meta-ieisystems/meta-nf5280m7 \
+  ##OEROOT##/meta-ieisystem \
+  ##OEROOT##/meta-ieisystem/meta-nf5280m7 \
   "
 
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt
index 9b3c01a556..9b3c01a556 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample
index 033b6bbde2..033b6bbde2 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
index e1299422a2..e1299422a2 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
+++ b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
index 6a0c70228b..6a0c70228b 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
index bde5908e62..bde5908e62 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
index d9edbf3996..d9edbf3996 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
index 95088ed99c..95088ed99c 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
index 388f9c50d3..388f9c50d3 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
index d40de52b1b..d40de52b1b 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 1b6c91265f..1b6c91265f 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
new file mode 100644
index 0000000000..c4fba64f67
--- /dev/null
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
@@ -0,0 +1,38 @@
+{
+    "inlet": [
+        {
+            "instance": 0,
+            "dbus": "/xyz/openbmc_project/sensors/temperature/Inlet_Temp",
+            "record_id": 1
+        }
+    ],
+    "baseboard": [
+        {
+            "instance": 0,
+            "dbus": "/xyz/openbmc_project/sensors/temperature/Outlet_Temp",
+            "record_id": 2
+        }
+    ],
+    "cpu": [
+        {
+            "instance": 1,
+            "dbus": "/xyz/openbmc_project/sensors/temperature/CPU0_Temp",
+            "record_id": 3
+        },
+        {
+            "instance": 1,
+            "dbus": "/xyz/openbmc_project/sensors/temperature/CPU1_Temp",
+            "record_id": 4
+        },
+        {
+            "instance": 1,
+            "dbus": "/xyz/openbmc_project/sensors/temperature/CPU0_DTS_Margin",
+            "record_id": 234
+        },
+        {
+            "instance": 1,
+            "dbus": "/xyz/openbmc_project/sensors/temperature/CPU1_DTS_Margin",
+            "record_id": 235
+        }
+    ]
+}
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
index a9aedf15fc..a9aedf15fc 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 8bc2c548a9..8bc2c548a9 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index e16e2bb079..e16e2bb079 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index eef9cf4a46..eef9cf4a46 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 6b12a398f7..6b12a398f7 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 3586206559..fe702d1bd2 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -37,6 +37,4 @@ RDEPENDS:${PN}-flash = " \
 SUMMARY:${PN}-system = "IEI System"
 RDEPENDS:${PN}-system = " \
         entity-manager \
-        iei-ipmi-oem \
-        ipmitool \
         "
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend b/meta-ieisystem/recipes-extended/timezone/tzdata.bbappend
index 0bcd774c58..0bcd774c58 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
+++ b/meta-ieisystem/recipes-extended/timezone/tzdata.bbappend
diff --git a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb
index 4e0f8af8f3..4e0f8af8f3 100644
--- a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb
+++ b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb
diff --git a/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend
new file mode 100644
index 0000000000..e3c7b8e0b7
--- /dev/null
+++ b/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend
@@ -0,0 +1,9 @@
+RDEPENDS:${PN}-extras:append = " \
+        iei-ipmi-oem \
+        tzdata-core \
+        "
+
+RDEPENDS:${PN}-devtools:append = " \
+        ipmitool \
+        "
+
diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
index 2953b73ca6..1aa7fc9b9c 100755
--- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b"
 
 SRC_URI = "git://github.com/openbmc/intel-ipmi-oem;branch=master;protocol=https"
-SRCREV = "4c0424026539c153b1b63648adfd306580a96d40"
+SRCREV = "ee27fe0973115e8b93a782fcdd956f468e99b107"
 
 S = "${WORKDIR}/git"
 PV = "0.1+git${SRCPV}"
diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
index 78f8e092e6..2f17d29e7a 100644
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 
 UBRANCH = "npcm-v2023.10"
 SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https"
-SRCREV = "fb62cf0fb4b97420ca20e9ccb0e12fa8e59213d3"
+SRCREV = "8fc8e75a0680a59bf4d13109309ee6b2d28ba747"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
index ffdd235f5b..37eab0dac4 100644
--- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-6.1"
-LINUX_VERSION ?= "6.1.29"
+KBRANCH ?= "dev-6.6"
+LINUX_VERSION ?= "6.6.39"
 
-SRCREV="1ac953dfce37295181915ee4974511a814756e37"
+SRCREV="ee1cd5048959de496cd005c50b137212a5b62062"
 
 require linux-nuvoton.inc
diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb
index 7af2351bea..3fdc21ed2d 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 = "0a78b90d2fce79b205a18da80d2a10998599ff15"
+SRCREV = "91aef996b31ee23e49aa507e16206d72c145136d"
 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/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
index 2dbb92ad54..c615826501 100644
--- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
+++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
@@ -4,13 +4,15 @@ HOMEPAGE = "http://github.com/openbmc/obmc-console"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 DEPENDS += "autoconf-archive-native \
+            iniparser \
             systemd \
            "
-SRCREV = "6925740d318e6c305463f3d430d2064da6102752"
+SRCREV = "e3f1aa1ec8cecd58aa8f67702bd587c2989f787e"
 PACKAGECONFIG ??= "udev ssh"
 PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev"
 PACKAGECONFIG[concurrent-servers] = "-Dconcurrent-servers=true,-Dconcurrent-servers=false,"
 PACKAGECONFIG[ssh] = "-Dssh=enabled,-Dssh=disabled"
+EXTRA_OEMESON = "-Dtests=false"
 PV = "1.0+git${SRCPV}"
 PR = "r1"
 
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
index c6b5bf2cd9..f125ac68c0 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt;branch=master;protocol=https"
-SRCREV = "91b4c0ed0675b207e6cdee7893099aa9c0d1b1e6"
+SRCREV = "5cac406aca63a6c5cc68d95fb26f8dbc67327581"
diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb
index 7665929b04..ec7316eb44 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 = "478c5a57ac1143d689f3d3670092c2eb75e0f0c4"
+SRCREV = "ac1e1246464e28fe4313ba936a6b8f64ec65bb12"
 PV = "1.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
index 54f4876cdd..afc3b4f95e 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid;branch=master;protocol=https"
-SRCREV = "73d077787ac22dcd67d0bb53591457d8871982bb"
+SRCREV = "e4b6ffde75a6f685fcd5de8ca6649e903858f22f"
diff --git a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb
index 2a7973988f..561664333d 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 = "e4240679bf28e6268c9bbebb32c51b9a2235621e"
+SRCREV = "e5469f54a182917205f11d647e8defabcebec914"
 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 891d96e8b1..6578d98f7d 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 = "49bcbe92f06e5d02c6c668184b0180056ae745ef"
+SRCREV = "479834888b6654e3bc12dcfb5ef17f01764f440c"
 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 734c8b342b..1528ba1e60 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 = "aa1efa490c23b4e51ea192ef91f8deb58dc1c201"
+SRCREV = "478e71db0832ccb253cae53c2bcfe8f1fd254fd4"
 
 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 30a758962e..b62e4005da 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 = "9e706622b470aa112758729b8db0747f0000a01b"
+SRCREV = "768d22693b116f343a476d3f4f9a1dca86555d6e"
diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
index 4a1cae8f04..32689020be 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 = "e8a14e91eefb21dc4bfa754c57212504f7fddb09"
+SRCREV = "457715b6fea6bde388a557f03fd91ff96292e14a"
 PACKAGECONFIG ??= " \
     adcsensor \
     intelcpusensor \
diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb
index 910e66adda..dcac89e962 100644
--- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "sdeventplus"
 DEPENDS += "phosphor-logging"
 DEPENDS += "nlohmann-json"
-SRCREV = "3b2e5a9b2f56e37982add882c208e50a9d41d080"
+SRCREV = "81b2e2204a268b84df37bd1ea6d44dbc0bcfa171"
 PV = "0.1+git${SRCPV}"
 PR = "r1"
 
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index 970eab4978..58ec1ae2ba 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -266,6 +266,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OB
 SYSTEMD_LINK[vardeps] += "OBMC_CHASSIS_INSTANCES OBMC_HOST_INSTANCES"
 
 SRC_URI = "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https"
-SRCREV = "3c1351cc2b63178876ef68f4107c9804d2e17dcc"
+SRCREV = "d7a15cb133501eea0d76c66ffa83c987c3e7adb0"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb
index 92f6586e96..86906033f2 100644
--- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb
+++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb
@@ -9,7 +9,7 @@ DEPENDS = "boost \
            phosphor-logging \
            sdbusplus \
            systemd"
-SRCREV = "4444a13c9af8d581797bd43f378be51a614d60f5"
+SRCREV = "b3e03d2d6b42298411d29329b5456d62da289461"
 PV = "1.0+git${SRCPV}"
 
 SRC_URI = "git://github.com/openbmc/telemetry;branch=master;protocol=https"
diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb
index 0de894cdc4..9d28682bad 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 = "8841b7d463a5272a87faaa14cb103f778a772770"
+SRCREV = "8e1ed7953f802c318eeb38830fe9be1167e4f26f"
 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/scripts/run-repotest b/meta-phosphor/scripts/run-repotest
index 6cd0db2726..dee4439664 100755
--- a/meta-phosphor/scripts/run-repotest
+++ b/meta-phosphor/scripts/run-repotest
@@ -36,7 +36,6 @@ git ls-files -- \
 echo "\
 meta-aspeed/recipes-aspeed/python/socsec/0001-otptool-Define-value_start-in-rev_id-path.patch
 meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
-meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch
 meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-board-aspeed-Add-Mux-for-yosemitev2.patch
 meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0002-spl-host-console-handle.patch
 meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index d77ee5055c..029cd301cd 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -1,5 +1,5 @@
 KMACHINE = "nuvoton"
-KERNEL_DEVICETREE = "${KMACHINE}-npcm730-gbs.dtb"
+KERNEL_DEVICETREE = "nuvoton/${KMACHINE}-npcm730-gbs.dtb"
 
 UBOOT_MACHINE = "PolegSVB_spinor_minimal_config"
 UBOOT_DEVICETREE = "nuvoton-npcm730-gbs"
diff --git a/poky/meta/recipes-connectivity/openssh/openssh/CVE-2024-6387.patch b/poky/meta/recipes-connectivity/openssh/openssh/CVE-2024-6387.patch
new file mode 100644
index 0000000000..3e7c707100
--- /dev/null
+++ b/poky/meta/recipes-connectivity/openssh/openssh/CVE-2024-6387.patch
@@ -0,0 +1,27 @@
+Description: fix signal handler race condition
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/2070497
+
+CVE: CVE-2024-6387
+
+Upstream-Status: Backport
+https://git.launchpad.net/ubuntu/+source/openssh/commit/?h=applied/ubuntu/jammy-devel&id=b059bcfa928df4ff2d103ae2e8f4e3136ee03efc
+
+Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
+
+--- a/log.c
++++ b/log.c
+@@ -452,12 +452,14 @@ void
+ sshsigdie(const char *file, const char *func, int line, int showfunc,
+     LogLevel level, const char *suffix, const char *fmt, ...)
+ {
++#if 0
+ 	va_list args;
+ 
+ 	va_start(args, fmt);
+ 	sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL,
+ 	    suffix, fmt, args);
+ 	va_end(args);
++#endif
+ 	_exit(1);
+ }
+ 
diff --git a/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb b/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb
index d1468c59fc..e2c8ed6606 100644
--- a/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb
+++ b/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb
@@ -27,6 +27,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
            file://add-test-support-for-busybox.patch \
            file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \
            file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \
+           file://CVE-2024-6387.patch \
            "
 SRC_URI[sha256sum] = "490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd"