Update to internal 0.66

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
author: Jason M. Bills <jason.m.bills@linux.intel.com> 2020-07-10 01:11:22 +0300
committer: Jason M. Bills <jason.m.bills@linux.intel.com> 2020-07-10 20:11:31 +0300
commit: d071adf43ac87f21dde2f84287120960c723962c (patch)
tree: 05a1d365e0faa6ce8570b2d0c2d0f100dc8df1d4
parent: f24c1e9afc47a421831278b57377951e71494d92 (diff)
download: openbmc-d071adf43ac87f21dde2f84287120960c723962c.tar.xz
81 files changed, 1191 insertions, 372 deletions
diff --git a/meta-openbmc-mods/conf/layer.conf b/meta-openbmc-mods/conf/layer.conf
index 71d23a2ba..74814fc36 100644
--- a/meta-openbmc-mods/conf/layer.conf
+++ b/meta-openbmc-mods/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "intel-openbmc"
 BBFILE_PATTERN_intel-openbmc = "^${LAYERDIR}/"
 BBFILE_PRIORITY_intel-openbmc = "5"
-LAYERSERIES_COMPAT_intel-openbmc = "warrior zeus"
+LAYERSERIES_COMPAT_intel-openbmc = "zeus dunfell"
 
 IMAGE_FEATURES[validitems] += "tools-sdk tools-debug validation-unsecure"
 
@@ -17,6 +17,6 @@ USERADDEXTENSION = "useradd-staticids"
 USERADD_UID_TABLES = "files/passwd"
 USERADD_GID_TABLES = "files/group"
 
-LAYER_CONF_VERSION = "11"
+LAYER_CONF_VERSION = "12"
 
 INTELBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-openbmc-mods/meta-ast2500/conf/layer.conf b/meta-openbmc-mods/meta-ast2500/conf/layer.conf
index 85a83d411..5a5051d2e 100644
--- a/meta-openbmc-mods/meta-ast2500/conf/layer.conf
+++ b/meta-openbmc-mods/meta-ast2500/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "ast2500"
 BBFILE_PATTERN_ast2500 = ""
 BBFILE_PRIORITY_ast2500 = "4"
-LAYERSERIES_COMPAT_ast2500 = "warrior zeus"
+LAYERSERIES_COMPAT_ast2500 = "zeus dunfell"
 
 INHERIT += "extrausers"
 #INHERIT += " cve-check"
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch
new file mode 100644
index 000000000..b70d3be50
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch
@@ -0,0 +1,40 @@
+From 06039a941d59f265385c5b4a19231fbd55a05b26 Mon Sep 17 00:00:00 2001
+From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+Date: Fri, 5 Jun 2020 15:14:50 -0700
+Subject: [PATCH] net: phy: realtek: Change LED configuration
+
+This commit changes Realtek NIC port LED configuration like below:
+LED0 (Right Green): Link 10/100/1000
+LED1 (Left Orange): Link 10/100 + Blink on Tx/Rx
+LED2 (Left Green): Link 1000 + Blink on Tx/Rx
+
+Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+---
+ drivers/net/phy/realtek.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index 7a99cb023401..c15280259c35 100644
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -92,10 +92,15 @@ static int rtl8211f_config(struct phy_device *phydev)
+ 			  MIIM_RTL8211F_PAGE_SELECT, 0x0);
+ 	}
+ 
+-	/* Set green LED for Link, yellow LED for Active */
++	/*
++	 * Set LED configuration
++	 * LED0 (Right Grean): Link 10/100/1000
++	 * LED1 (Left Orange): Link 10/100 + Active
++	 * LED2 (Left Green): Link 1000 + Active
++	 */
+ 	phy_write(phydev, MDIO_DEVAD_NONE,
+ 		  MIIM_RTL8211F_PAGE_SELECT, 0xd04);
+-	phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x617f);
++	phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x626b);
+ 	phy_write(phydev, MDIO_DEVAD_NONE,
+ 		  MIIM_RTL8211F_PAGE_SELECT, 0x0);
+ 
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 4183df7ef..5be160cb1 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -40,6 +40,7 @@ SRC_URI_append_intel-ast2500 = " \
     file://0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch \
     file://0038-Increase-default-fan-speed-for-cooper-city.patch \
     file://0040-Initialize-the-BMC-host-mailbox-at-reset-time.patch \
+    file://0044-net-phy-realtek-Change-LED-configuration.patch \
     "
 PFR_SRC_URI = " \
     file://0022-u-boot-env-change-for-PFR-image.patch \
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
index bfcec8c9f..041787147 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
@@ -2072,9 +2072,9 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "Left Rear Temp"
+                "Left Rear Board Temp"
             ],
-            "Name": "Left Rear Temp",
+            "Name": "Left Rear Board Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
@@ -2098,9 +2098,9 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "Right Rear Board"
+                "Right Rear Board Temp"
             ],
-            "Name": "Right Rear Board",
+            "Name": "Right Rear Board Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
diff --git a/meta-openbmc-mods/meta-ast2600/conf/layer.conf b/meta-openbmc-mods/meta-ast2600/conf/layer.conf
index 9c44d9b48..5faa28b7e 100644
--- a/meta-openbmc-mods/meta-ast2600/conf/layer.conf
+++ b/meta-openbmc-mods/meta-ast2600/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "ast2600"
 BBFILE_PATTERN_ast2600 = ""
 BBFILE_PRIORITY_ast2600 = "4"
-LAYERSERIES_COMPAT_ast2600 = "warrior zeus"
+LAYERSERIES_COMPAT_ast2600 = "zeus dunfell"
 
 INHERIT += "extrausers"
 #INHERIT += " cve-check"
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
index 1b2cc83a1..8659e4bfc 100644
--- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
+++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
@@ -1,27 +1,30 @@
-From b6bce26bf19e74863e145e6e6e1f6e458077a31a Mon Sep 17 00:00:00 2001
+From 0381bd2a345dade03721a1244fa30eed4fade9fa Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Fri, 3 Jan 2020 15:14:09 -0800
 Subject: [PATCH] AST2600: Adjust default GPIO settings
 
-- Disable GPIOC3 to prevent unexpected host failures.
+- Disabled GPIOC3 to prevent unexpected host failures.
 - Fixed GPIOC5, GPIOG6, GPIOI0~7 and GPIOL6~7 directions and
   default values.
 - Disabled internal pull-down of GPIOB6.
+- Disabled HBLED.
 
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 ---
- board/aspeed/ast2600_intel/intel.c | 50 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
+ board/aspeed/ast2600_intel/intel.c | 56 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 56 insertions(+)
 
 diff --git a/board/aspeed/ast2600_intel/intel.c b/board/aspeed/ast2600_intel/intel.c
-index d1ac8651ac6c..b1a08db91bec 100644
+index d1ac8651ac6c..45f01a095340 100644
 --- a/board/aspeed/ast2600_intel/intel.c
 +++ b/board/aspeed/ast2600_intel/intel.c
-@@ -162,6 +162,54 @@ static void sgpio_init(void)
+@@ -162,6 +162,60 @@ static void sgpio_init(void)
  	       SCU_BASE | SCU_414);
  }
  
 +#define SCU_410			0x410 /* Multi-function Pin Control #4 */
++#define SCU_69C			0x69C /* Multi-function Pin Control #27 */
++#define SCU_69C_HBLED_EN	BIT(31)
 +#define GPIO_000		0x000 /* GPIO A/B/C/D Value */
 +#define GPIO_004		0x004 /* GPIO A/B/C/D Direction */
 +#define GPIO_020		0x020 /* GPIO E/F/G/H Value */
@@ -31,6 +34,10 @@ index d1ac8651ac6c..b1a08db91bec 100644
 +
 +static void set_gpio_default_state(void)
 +{
++	/* Default setting of Y23 pad in AST2600 A1 is HBLED so disable it. */
++	writel(readl(SCU_BASE | SCU_69C) & ~SCU_69C_HBLED_EN,
++	       SCU_BASE | SCU_69C);
++
 +#define SCU_410_RGMII3TXD1	BIT(19)
 +#define GPIO_C3			BIT(19)
 +
@@ -72,7 +79,7 @@ index d1ac8651ac6c..b1a08db91bec 100644
  static void timer_handler(void *regs)
  {
  	printf("+");
-@@ -175,6 +223,8 @@ int board_early_init_f(void)
+@@ -175,6 +229,8 @@ int board_early_init_f(void)
  	 * I am not sure if it actually does anything... */
  	arch_interrupt_init_early();
  
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0015-net-phy-realtek-Change-LED-configuration.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0015-net-phy-realtek-Change-LED-configuration.patch
new file mode 100644
index 000000000..d701d5a27
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0015-net-phy-realtek-Change-LED-configuration.patch
@@ -0,0 +1,40 @@
+From 144b845cd597cb93e4a6143a194e5018f2176f23 Mon Sep 17 00:00:00 2001
+From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+Date: Fri, 5 Jun 2020 14:08:20 -0700
+Subject: [PATCH] net: phy: realtek: Change LED configuration
+
+This commit changes Realtek NIC port LED configuration like below:
+LED0 (Right Green): Link 10/100/1000
+LED1 (Left Orange): Link 10/100 + Blink on Tx/Rx
+LED2 (Left Green): Link 1000 + Blink on Tx/Rx
+
+Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+---
+ drivers/net/phy/realtek.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
+index dd45e11b3ad9..167b34b2b2c9 100644
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -169,10 +169,15 @@ static int rtl8211f_config(struct phy_device *phydev)
+ 	phy_write(phydev, MDIO_DEVAD_NONE,
+ 		  MIIM_RTL8211F_PAGE_SELECT, 0x0);
+ 
+-	/* Set green LED for Link, yellow LED for Active */
++	/*
++	 * Set LED configuration
++	 * LED0 (Right Grean): Link 10/100/1000
++	 * LED1 (Left Orange): Link 10/100 + Active
++	 * LED2 (Left Green): Link 1000 + Active
++	 */
+ 	phy_write(phydev, MDIO_DEVAD_NONE,
+ 		  MIIM_RTL8211F_PAGE_SELECT, 0xd04);
+-	phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x617f);
++	phy_write(phydev, MDIO_DEVAD_NONE, 0x10, 0x626b);
+ 	phy_write(phydev, MDIO_DEVAD_NONE,
+ 		  MIIM_RTL8211F_PAGE_SELECT, 0x0);
+ 
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
index ae56f11eb..01f904a13 100644
--- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
@@ -20,6 +20,7 @@ SRC_URI_append_intel-ast2600 = " \
     file://0012-IPMI-command-handler-implementation-in-uboot.patch \
     file://0013-Add-a-workaround-to-cover-UART-interrupt-bug-in-AST2.patch \
     file://0014-Add-a-workaround-to-cover-eSPI-OOB-free-bug-in-AST26.patch \
+    file://0015-net-phy-realtek-Change-LED-configuration.patch \
     "
 
 PFR_SRC_URI = " \
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json
index dd1c4d21a..6e1b3a22b 100644
--- a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/configuration/entity-manager/AC-Baseboard.json
@@ -1151,7 +1151,7 @@
             "OutLimitMax": 100.0,
             "OutLimitMin": 30.0,
             "Outputs": [
-                "Pwm 12"
+                "Pwm 13"
             ],
             "PCoefficient": 0.0,
             "PositiveHysteresis": 0.0,
@@ -1177,7 +1177,7 @@
             "OutLimitMax": 100.0,
             "OutLimitMin": 30.0,
             "Outputs": [
-                "Pwm 13"
+                "Pwm 14"
             ],
             "PCoefficient": 0.0,
             "PositiveHysteresis": 0.0,
@@ -1203,7 +1203,7 @@
             "OutLimitMax": 100.0,
             "OutLimitMin": 30.0,
             "Outputs": [
-                "Pwm 14"
+                "Pwm 15"
             ],
             "PCoefficient": 0.0,
             "PositiveHysteresis": 0.0,
@@ -1229,7 +1229,7 @@
             "OutLimitMax": 100.0,
             "OutLimitMin": 30.0,
             "Outputs": [
-                "Pwm 15"
+                "Pwm 16"
             ],
             "PCoefficient": 0.0,
             "PositiveHysteresis": 0.0,
@@ -2031,6 +2031,25 @@
             ],
             "Type": "XeonCPU",
             "UseWA": 1
+        },
+        {
+            "Name": "ASD",
+            "BMC_RSMRST_B": {
+                "PinType": "PIN_NONE"
+            },
+            "BMC_SYSPWROK": {
+                "PinType": "PIN_NONE"
+            },
+            "BMC_PWR_DEBUG_N": {
+                "PinName": "FM_BMC_CPU_FBRK_OUT_R_N"
+            },
+            "BMC_DEBUG_EN_N": {
+                "PinType": "PIN_NONE"
+            },
+            "BMC_XDP_PRST_IN": {
+                "PinName": "DBP_PRESENT_IN_R2_N"
+            },
+            "Type": "ASD"
         }
     ],
     "Name": "AC Baseboard",
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf
index 748a26544..8491f5365 100644
--- a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console.conf
@@ -1,3 +1,3 @@
 baud = 115200
-local-tty = ttyS2
+local-tty = ttyS3
 local-tty-baud = 115200
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console@.service
new file mode 100644
index 000000000..7fb8f79d3
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console/obmc-console@.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Phosphor Console Muxer listening on device /dev/%I
+BindsTo=dev-%i.device
+After=dev-%i.device
+
+[Service]
+ExecStartPre=/usr/bin/sol-option-check.sh
+ExecStartPre=/bin/sh -c 'echo -n "uart3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1'
+ExecStartPre=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3'
+ExecStartPre=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4'
+ExecStartPre=/bin/sh -c 'echo -n "uart4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1'
+ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i
+ExecStopPost=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1'
+ExecStopPost=/bin/sh -c 'echo -n "io3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3'
+ExecStopPost=/bin/sh -c 'echo -n "io4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4'
+ExecStopPost=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1'
+SyslogIdentifier=obmc-console-server
+Restart=always
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend
index dee302fd7..7b6a47dac 100644
--- a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,8 +1,16 @@
 FILESEXTRAPATHS_prepend_intel-ast2600 := "${THISDIR}/${PN}:"
 OBMC_CONSOLE_HOST_TTY = "ttyS2"
-SRC_URI += "file://sol-option-check.sh"
+SRC_URI += "file://sol-option-check.sh \
+            file://obmc-console@.service \
+           "
+inherit obmc-phosphor-systemd
 
+SYSTEMD_SERVICE_${PN} += " \
+        ${PN}@${OBMC_CONSOLE_HOST_TTY}.service \
+        "
 do_install_append() {
+        rm -rf ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules
+        install -m 0644 ${WORKDIR}/${PN}@.service ${D}${systemd_system_unitdir}
         install -d ${D}${bindir}
         install -m 0755 ${WORKDIR}/sol-option-check.sh ${D}${bindir}
 }
diff --git a/meta-openbmc-mods/meta-common-small/conf/layer.conf b/meta-openbmc-mods/meta-common-small/conf/layer.conf
index 65569b5b2..a3c2fb4e7 100644
--- a/meta-openbmc-mods/meta-common-small/conf/layer.conf
+++ b/meta-openbmc-mods/meta-common-small/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "common-small"
 BBFILE_PATTERN_common-small = "^${LAYERDIR}/"
 BBFILE_PRIORITY_common-small = "10"
-LAYERSERIES_COMPAT_common-small = "warrior zeus"
+LAYERSERIES_COMPAT_common-small = "zeus dunfell"
diff --git a/meta-openbmc-mods/meta-common-small/recipes-devtools/python/python-pycryptodomex.inc b/meta-openbmc-mods/meta-common-small/recipes-devtools/python/python-pycryptodomex.inc
new file mode 100644
index 000000000..fa88defc1
--- /dev/null
+++ b/meta-openbmc-mods/meta-common-small/recipes-devtools/python/python-pycryptodomex.inc
@@ -0,0 +1,28 @@
+SUMMARY = "Cryptographic library for Python"
+DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\
+ cryptographic primitives."
+HOMEPAGE = "http://www.pycryptodome.org"
+LICENSE = "PD & BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba"
+
+SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b"
+SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"
+
+inherit pypi
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-io \
+    ${PYTHON_PN}-math \
+"
+
+RDEPENDS_${PN}-tests += " \
+    ${PYTHON_PN}-unittest \
+"
+
+PACKAGES =+ "${PN}-tests"
+
+FILES_${PN}-tests += " \
+    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
+    ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \
+"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openbmc-mods/meta-common-small/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-openbmc-mods/meta-common-small/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
new file mode 100644
index 000000000..be66430e1
--- /dev/null
+++ b/meta-openbmc-mods/meta-common-small/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb
@@ -0,0 +1,2 @@
+require python-pycryptodomex.inc
+inherit setuptools3
diff --git a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend
index d2855db1b..d9fed5138 100644
--- a/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend
+++ b/meta-openbmc-mods/meta-common-small/recipes-devtools/qemu/qemu-native_%.bbappend
@@ -6,3 +6,4 @@ QEMU_TARGETS = "arm"
 
 S = "${WORKDIR}/git"
 SRCREV = "8ab0db0624b454bd69a04ca0010f165cb7119100"
+PACKAGECONFIG[libudev] = ""
diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass
index 1e6bc05af..3bbed738a 100644
--- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass
+++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass
@@ -20,7 +20,7 @@ IMAGE_INSTALL_append = " \
         obmc-ikvm \
         system-watchdog \
         frb2-watchdog \
-        srvcfg-manager \
+        service-config-manager \
         callback-manager \
         phosphor-post-code-manager \
         preinit-mounts \
@@ -47,7 +47,7 @@ IMAGE_INSTALL_append = " \
         host-misc-comm-manager \
         "
 
-IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'intel-pfr-manager', '', d)}"
+IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'pfr-manager', '', d)}"
 
 # this package was flagged as a security risk
 IMAGE_INSTALL_remove += " lrzsz"
diff --git a/meta-openbmc-mods/meta-common/conf/layer.conf b/meta-openbmc-mods/meta-common/conf/layer.conf
index 4c640e868..b1b7642ed 100644
--- a/meta-openbmc-mods/meta-common/conf/layer.conf
+++ b/meta-openbmc-mods/meta-common/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "common"
 BBFILE_PATTERN_common = "^${LAYERDIR}/"
 BBFILE_PRIORITY_common = "10"
-LAYERSERIES_COMPAT_common = "warrior zeus"
+LAYERSERIES_COMPAT_common = "zeus dunfell"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
new file mode 100644
index 000000000..6bb6d9c82
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
@@ -0,0 +1,104 @@
+From b8f84bd39485d3977625c9a8b8e8cff5d23be56f Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+Date: Thu, 27 Feb 2014 09:05:02 +0800
+Subject: [PATCH] dbus: clear guid_from_server if send_negotiate_unix_fd
+ failed
+
+Upstream-Status: Submitted
+
+bus-test dispatch test failed with below information:
+    ./bus/bus-test: Running message dispatch test
+    Activating service name='org.freedesktop.DBus.TestSuiteEchoService'
+    Successfully activated service 'org.freedesktop.DBus.TestSuiteEchoService'
+    6363: assertion failed "_dbus_string_get_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server) == 0" file "dbus-auth.c" line 1545 function process_ok
+      ./bus/bus-test(_dbus_print_backtrace+0x29) [0x80cb969]
+      ./bus/bus-test(_dbus_abort+0x14) [0x80cfb44]
+      ./bus/bus-test(_dbus_real_assert+0x53) [0x80b52c3]
+      ./bus/bus-test() [0x80e24da]
+      ./bus/bus-test(_dbus_auth_do_work+0x388) [0x80e3848]
+      ./bus/bus-test() [0x80aea49]
+      ./bus/bus-test() [0x80affde]
+      ./bus/bus-test(_dbus_transport_handle_watch+0xb1) [0x80ad841]
+      ./bus/bus-test(_dbus_connection_handle_watch+0x104) [0x8089174]
+      ./bus/bus-test(dbus_watch_handle+0xd8) [0x80b15e8]
+      ./bus/bus-test(_dbus_loop_iterate+0x4a9) [0x80d1509]
+      ./bus/bus-test(bus_test_run_clients_loop+0x5d) [0x808129d]
+      ./bus/bus-test() [0x806cab0]
+      ./bus/bus-test() [0x806e0ca]
+      ./bus/bus-test() [0x806da6f]
+      ./bus/bus-test(_dbus_test_oom_handling+0x18c) [0x80b5c8c]
+      ./bus/bus-test() [0x806f723]
+      ./bus/bus-test(bus_dispatch_test+0x3c) [0x8071aac]
+      ./bus/bus-test(main+0x1b7) [0x805acc7]
+      /lib/libc.so.6(__libc_start_main+0xf3) [0x45f919b3]
+      ./bus/bus-test() [0x805ae39]
+
+The stack is below:
+    #0  0xffffe425 in __kernel_vsyscall ()
+    #1  0x45fa62d6 in raise () from /lib/libc.so.6
+    #2  0x45fa9653 in abort () from /lib/libc.so.6
+    #3  0x080cfb65 in _dbus_abort () at dbus-sysdeps.c:94
+    #4  0x080b52c3 in _dbus_real_assert (condition=0,
+        condition_text=condition_text@entry=0x8117a38 "_dbus_string_get_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server) == 0",
+        file=file@entry=0x8117273 "dbus-auth.c", line=line@entry=1545,
+        func=func@entry=0x8117f8e <__FUNCTION__.3492> "process_ok")
+        data=0x8157290) at dbus-connection.c:1515
+    #0  0x00000033fee353e9 in raise () from /lib64/libc.so.6
+    #1  0x00000033fee38508 in abort () from /lib64/libc.so.6
+    #2  0x000000000047d585 in _dbus_abort () at dbus-sysdeps.c:94
+    #3  0x0000000000466486 in _dbus_real_assert (condition=<optimized out>,
+        condition_text=condition_text@entry=0x4c2988 "_dbus_string_get_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server) == 0",
+        file=file@entry=0x4c21a5 "dbus-auth.c", line=line@entry=1546,
+        func=func@entry=0x4c2fce <__FUNCTION__.3845> "process_ok")
+        at dbus-internals.c:931
+    #4  0x000000000048d424 in process_ok (args_from_ok=0x7fffffffe480,
+        auth=0x6ff340) at dbus-auth.c:1546
+    #5  handle_client_state_waiting_for_data (auth=0x6ff340,
+        command=<optimized out>, args=0x7fffffffe480) at dbus-auth.c:1996
+    #6  0x000000000048e789 in process_command (auth=0x6ff340) at dbus-auth.c:2208
+    #7  _dbus_auth_do_work (auth=0x6ff340) at dbus-auth.c:2458
+    #8  0x000000000046091d in do_authentication (
+        transport=transport@entry=0x6ffaa0, do_reading=do_reading@entry=1,
+        do_writing=do_writing@entry=0,
+        auth_completed=auth_completed@entry=0x7fffffffe55c)
+        at dbus-transport-socket.c:442
+    #9  0x0000000000461d08 in socket_handle_watch (transport=0x6ffaa0,
+        watch=0x6f4190, flags=1) at dbus-transport-socket.c:921
+    #10 0x000000000045fa3a in _dbus_transport_handle_watch (transport=0x6ffaa0,
+
+Once send_negotiate_unix_fd failed, this failure will happen, since
+auth->guid_from_server has been set to some value before
+send_negotiate_unix_fd. send_negotiate_unix_fd failure will lead to
+this auth be handled by process_ok again, but this auth->guid_from_server
+is not zero.
+
+So we should clear auth->guid_from_server if send_negotiate_unix_fd failed
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ dbus/dbus-auth.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
+index d2c37a7..37b45c6 100644
+--- a/dbus/dbus-auth.c
++++ b/dbus/dbus-auth.c
+@@ -1571,8 +1571,13 @@ process_ok(DBusAuth *auth,
+   _dbus_verbose ("Got GUID '%s' from the server\n",
+                  _dbus_string_get_const_data (& DBUS_AUTH_CLIENT (auth)->guid_from_server));
+ 
+-  if (auth->unix_fd_possible)
+-    return send_negotiate_unix_fd(auth);
++  if (auth->unix_fd_possible) {
++     if (!send_negotiate_unix_fd(auth)) {
++         _dbus_string_set_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server, 0);
++         return FALSE;
++     }
++     return TRUE;
++  }
+ 
+   _dbus_verbose("Not negotiating unix fd passing, since not possible\n");
+   return send_begin (auth);
+-- 
+1.7.10.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/dbus-1.init b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/dbus-1.init
new file mode 100644
index 000000000..90e167e57
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/dbus-1.init
@@ -0,0 +1,123 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          dbus
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: D-Bus systemwide message bus
+# Description:       D-Bus is a simple interprocess messaging system, used
+#                    for sending messages between applications.
+### END INIT INFO
+#
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+# set -e
+
+# Source function library.
+. /etc/init.d/functions
+
+DAEMON=@bindir@/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus           # must match /usr/share/dbus-1/system.conf
+PIDFILE=/var/run/dbus/pid # must match /usr/share/dbus-1/system.conf
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  mkdir -p "`dirname $PIDFILE`"
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon -o --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      # TODO: --reverse when busybox supports it
+      run-parts --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon -o --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  status)
+    status $DAEMON
+    exit $?
+  ;;
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|status|restart|reload|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/tmpdir.patch b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/tmpdir.patch
new file mode 100644
index 000000000..bf086e178
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus/tmpdir.patch
@@ -0,0 +1,44 @@
+From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 23 Jun 2011 13:52:09 +0200
+Subject: [PATCH] buildsys: hardcode socketdir to /tmp
+
+the TMPDIR env var isn't always pointing to the right target path
+
+Upstream-Status: Inappropriate [embedded]
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+
+Original comment:
+
+	avoid to check tmp dir at build time. instead uses hard coded /tmp here
+	comment added by Kevin Tian <kevin.tian@intel.com>
+---
+ configure.ac |   11 +----------
+ 1 files changed, 1 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 408054b..6d26180 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY)
+ AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY",
+                    [Full path to the launch helper test program in the builddir])
+ 
+-#### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+-   DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+-   DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+-   DEFAULT_SOCKET_DIR=$TMP
+-else
+-   DEFAULT_SOCKET_DIR=/tmp
+-fi
++DEFAULT_SOCKET_DIR=/tmp
+ 
+ DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'`
+ 
+-- 
+1.6.6.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus_%.bbappend
new file mode 100644
index 000000000..288c80f06
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/dbus/dbus_%.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PV = "1.12.18"
+
+SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+           file://tmpdir.patch \
+           file://dbus-1.init \
+           file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
+          "
+SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242"
+SRC_URI[sha256sum] = "64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
index 81462b2d3..cd42c9933 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_%.bbappend
@@ -1,3 +1,5 @@
 # Enable downstream autobump
 SRC_URI = "git://github.com/openbmc/host-error-monitor"
-SRCREV = "53099c49b89c22cfe09c7217679ae1fb20e019eb"
+SRCREV = "5287c02c5f96b40f0941c9c72ab29d2c7ac44a96"
+
+EXTRA_OECMAKE = "-DYOCTO=1"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
index 2f3b48cb3..aa5a8e8b7 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "libmctp"
 DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)"
 
 SRC_URI = "git://github.com/openbmc/libmctp.git"
-SRCREV = "f5afcd7e6597dcdeaa475aa7194ecfae2e82d114"
+SRCREV = "8d53b1c368b5d498c4f241b2b492210780010bb9"
 
 PV = "0.1+git${SRCPV}"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
index de57d5e19..f49f33873 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend
@@ -2,4 +2,4 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PF
 EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}"
 EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF"
 SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git"
-SRCREV = "358e7dfa41d4f297d33670c5caceda3629748cfe"
+SRCREV = "fcd2d3a943c4fb518d399d8a0addd1cc661e5628"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/libxcrypt/libxcrypt_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/libxcrypt/libxcrypt_%.bbappend
index ee414efb8..f47a3c866 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/libxcrypt/libxcrypt_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/libxcrypt/libxcrypt_%.bbappend
@@ -1,5 +1,5 @@
 # libxcrypt fails to compile under gcc with the -Os flag.  Because we want to
 # be able to compile the rest of the system with -Os, override the global
 # setting here to fall back to -O3
-CFLAGS_append = "--param max-inline-insns-single=1000"
+CFLAGS_append = " --param max-inline-insns-single=1000"
 FULL_OPTIMIZATION = "-O3 -pipe ${DEBUG_FLAGS}"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb
index 4bf1c9548..469fb5f57 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb
@@ -15,10 +15,3 @@ SRCREV = "98c33cdb7d704a387edee4ac8f0ef98ea771b222"
 S = "${WORKDIR}/git/peci_pcie"
 
 SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.PCIe.service"
-
-# linux-libc-headers guides this way to include custom uapi headers
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/rest-dbus/rest-dbus-static.bb b/meta-openbmc-mods/meta-common/recipes-core/rest-dbus/rest-dbus-static.bb
deleted file mode 100644
index 429d5b4b4..000000000
--- a/meta-openbmc-mods/meta-common/recipes-core/rest-dbus/rest-dbus-static.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Phosphor OpenBMC REST framework"
-DESCRIPTION = "Phosphor OpenBMC REST to DBUS daemon."
-HOMEPAGE = "http://github.com/openbmc/rest-dbus"
-PR = "r1"
-
-inherit allarch
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-SRC_URI += "git://github.com/openbmc/rest-dbus.git"
-
-SRCREV = "9273a302e8f2b3c3e939dff77758e90f163bf6a1"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/www/rest-dbus/*"
-
-do_install () {
-      install -d ${D}${datadir}/www/rest-dbus/res
-      install -m 644 ${S}/resources/** ${D}${datadir}/www/rest-dbus/res
-      install -m 644 ${S}/resources/index.html  ${D}${datadir}/www/rest-dbus/index.html
-}
-
diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
index 17f423dc3..985a9e5ba 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend
@@ -12,5 +12,8 @@ SRC_URI += "file://0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch \
 USERADD_PACKAGES_remove = "${PN}-journal-gateway ${PN}-journal-upload ${PN}-journal-remote"
 
 do_install_append(){
+    rm -rf ${D}/lib/udev/rules.d/80-drivers.rules
     cp -f ${WORKDIR}/systemd-time-wait-sync.service ${D}/lib/systemd/system/
 }
+
+PACKAGECONFIG_remove = " kmod"
diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/cjson/cjson_%.bbappend b/meta-openbmc-mods/meta-common/recipes-devtools/cjson/cjson_%.bbappend
new file mode 100644
index 000000000..666bc5991
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-devtools/cjson/cjson_%.bbappend
@@ -0,0 +1,3 @@
+FILES_${PN}-dev += "${libdir}/cmake/cJSON/*"
+
+EXTRA_OECMAKE += " -DENABLE_CUSTOM_COMPILER_FLAGS=OFF -DENABLE_TARGET_EXPORT=OFF"
diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/python/python_%.bbappend b/meta-openbmc-mods/meta-common/recipes-devtools/python/python_%.bbappend
deleted file mode 100644
index 00815c173..000000000
--- a/meta-openbmc-mods/meta-common/recipes-devtools/python/python_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-# This commit pulls in the python world, and adds a very large chunk to our
-# image size.  I suspect we can make most of our things rely on python-core
-# instead of full python, but this is a temporary fix.
-# https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f384e39ad1ca1514fb7b5d7fa0d63e0c863761ca
-
-RPROVIDES_${PN}-core = "${PN}"
-RPROVIDES_${PN}-modules = ""
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
deleted file mode 100644
index 8f3a2bc31..000000000
--- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Rotate the event logs
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rotate-event-logs.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
deleted file mode 100644
index 5a8c5cc10..000000000
--- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-while true; do
-    sleep 60
-    /usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog
-    ec=$?
-    if [ $ec -ne 0 ] ; then
-        echo "logrotate failed ($ec)"
-    fi
-done
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
deleted file mode 100644
index 78c3b31af..000000000
--- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://rotate-event-logs.service \
-            file://rotate-event-logs.sh \
-"
-
-do_install_append() {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/rotate-event-logs.sh ${D}/${bindir}/rotate-event-logs.sh
-        rm ${D}${systemd_system_unitdir}/rotate-event-logs.timer
-}
-
-SYSTEMD_SERVICE_${PN}_remove = "rotate-event-logs.timer"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb
index 47e2d7c46..a83a2c5f9 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "HSBP Manager"
 DESCRIPTION = "HSBP Manager monitors HSBPs through SMBUS"
 
 SRC_URI = "git://github.com/openbmc/s2600wf-misc.git"
-SRCREV = "d86629cedb04607301eef6220688c53f0b29ea0e"
+SRCREV = "b688f3f460b78643b95dd80de3100f2373793200"
 PV = "0.1+git${SRCPV}"
 
 LICENSE = "Apache-2.0"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb b/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb
index 71245ac50..086832b9e 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/images/intel-platforms.bb
@@ -6,7 +6,7 @@ inherit obmc-phosphor-image-dev
 inherit ${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'image_types_intel_pfr', '', d)}
 
 DEPENDS += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'obmc-intel-pfr-image-native', '', d)}"
-DEPENDS += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'intel-pfr-manager', '', d)}"
+DEPENDS += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'pfr-manager', '', d)}"
 
 FEATURE_PACKAGES_obmc-sensors = ""
 FEATURE_PACKAGES_obmc-debug-collector = ""
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb
deleted file mode 100644
index d48ffb1a5..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Intel PFR Manager Service"
-DESCRIPTION = "Daemon to handle all PFR functionalities"
-
-PV = "1.0+git${SRCPV}"
-
-S = "${WORKDIR}/git/intel-pfr-manager"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh"
-SRCREV = "bee56d62b209088454d166d1efae4825a2b175df"
-
-inherit cmake systemd
-SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.PFR.Manager.service"
-
-DEPENDS += " \
-    sdbusplus \
-    phosphor-logging \
-    boost \
-    i2c-tools \
-    "
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend
new file mode 100644
index 000000000..e91a996b5
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend
@@ -0,0 +1,3 @@
+# Enable downstream autobump
+SRC_URI = "git://github.com/openbmc/pfr-manager"
+SRCREV = "deab6540336c8f37f076d709d77dd41456ab1605"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb
index 97866ba4e..9c0b00714 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb
@@ -11,7 +11,7 @@ PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-inherit cmake pkgconfig pythonnative
+inherit cmake pkgconfig
 inherit obmc-phosphor-systemd
 
 SYSTEMD_SERVICE_${PN} += "smbios-mdrv1.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb
index f921704f6..46f14d3ed 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb
@@ -2,7 +2,7 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform"
 DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom"
 
 SRC_URI = "git://github.com/Intel-BMC/mdrv2.git;protocol=ssh"
-SRCREV = "e1d574504a16282fe86a0ca02a821ebdcd220774"
+SRCREV = "5ae0c19064f010c9981cc90f4ddb2031887de4dc"
 
 S = "${WORKDIR}/git"
 
@@ -11,7 +11,7 @@ PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-inherit cmake pkgconfig pythonnative
+inherit cmake pkgconfig
 inherit obmc-phosphor-systemd
 
 SYSTEMD_SERVICE_${PN} += "smbios-mdrv2.service"
@@ -27,4 +27,5 @@ DEPENDS += " \
     phosphor-logging \
     "
 
-EXTRA_OECMAKE += "-DDIMM_DBUS=OFF"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'smbios-no-dimm', d)}"
+PACKAGECONFIG[smbios-no-dimm] = "-DDIMM_DBUS=OFF, -DDIMM_DBUS=ON"
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch
index 8ad7b3c0a..a077e7cdb 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch
@@ -1,4 +1,4 @@
-From 498b7829800ec27c7787b3ae77ee59e7b10ec40e Mon Sep 17 00:00:00 2001
+From 20c08d8ba976f43ebb98fbbe8f27dff352d41c40 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Tue, 19 Sep 2017 15:55:39 +0800
 Subject: [PATCH] arm: dts: add DTS for Intel ast2600 platforms
@@ -14,16 +14,16 @@ Signed-off-by: Ayushi Smriti <smriti.ayushi@intel.com>
 Signed-off-by: Arun P. Mohanan <arun.p.m@linux.intel.com>
 Signed-off-by: Iwona Winiarska <iwona.winiarska@intel.com>
 ---
- arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts | 528 +++++++++++++++++++++++++
- 1 file changed, 528 insertions(+)
+ arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts | 530 +++++++++++++++++++++++++
+ 1 file changed, 530 insertions(+)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts b/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts
 new file mode 100644
-index 000000000000..c68314d3901b
+index 000000000000..b7f47623c021
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts
-@@ -0,0 +1,528 @@
+@@ -0,0 +1,530 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/dts-v1/;
 +
@@ -246,23 +246,25 @@ index 000000000000..c68314d3901b
 +	/*DUMMY*/	"","","","","","","","",
 +
 +	/* SGPIO input lines */
-+  /* Some lines have been renamed from the net names:
-+  CPU1_PRESENCE -> FM_CPU0_SKTOCC_LVT3_N
-+  CPU1_THERMTRIP -> H_CPU0_THERMTRIP_LVC1_N
-+  CPU1_VRHOT -> IRQ_CPU0_VRHOT_N
-+  CPU1_FIVR_FAULT -> H_CPU0_MON_FAIL_PLD_LVC1_N
-+  CPU1_MEM_ABCD_VRHOT -> ??
-+  CPU1_MEM_EFGH_VRHOT -> ??
-+  CPU2_PRESENCE -> FM_CPU1_SKTOCC_LVT3_N
-+  CPU2_THERMTRIP -> H_CPU1_THERMTRIP_LVC1_N
-+  CPU2_VRHOT -> IRQ_CPU1_VRHOT_N
-+  CPU2_FIVR_FAULT -> H_CPU1_MON_FAIL_PLD_LVC1_N
-+  CPU2_MEM_ABCD_VRHOT -> ??
-+  CPU2_MEM_EFGH_VRHOT -> ??
-+
-+	/*IA0-IA7*/	"CPU1_PRESENCE","CPU1_THERMTRIP","CPU1_VRHOT","CPU1_FIVR_FAULT","IRQ_CPU0_MEM_VRHOT_N","H_CPU0_MEMHOT_OUT_LVC1_N","FM_CPU0_PROC_ID0","FM_CPU0_PROC_ID1",
-+	/*IB0-IB7*/	"WCPU_MISMATCH","IRQ_PSYS_CRIT_N","CPU2_PRESENCE","CPU2_THERMTRIP","CPU2_VRHOT","CPU2_FIVR_FAULT","IRQ_CPU1_MEM_VRHOT_N","H_CPU1_MEMHOT_OUT_LVC1_N",
-+	/*IC0-IC7*/	"FM_CPU1_PROC_ID0","FM_CPU1_PROC_ID1","","","","","","",
++/* SGPIO Alias: (runtime alias -> net name)
++	CPU1_PRESENCE -> FM_CPU0_SKTOCC_LVT3_N
++	CPU1_THERMTRIP -> H_CPU0_THERMTRIP_LVC1_N
++	CPU1_VRHOT -> IRQ_CPU0_VRHOT_N
++	CPU1_FIVR_FAULT -> EV_MON_FAIL_CPU0_N
++	CPU1_MEM_VRHOT -> IRQ_CPU0_MEM_VRHOT_N
++	CPU1_MEM_THERM_EVENT -> H_CPU0_MEMHOT_OUT_LVC1_N
++	CPU1_MISMATCH -> FM_CPU0_MISMATCH
++	CPU2_PRESENCE -> FM_CPU1_SKTOCC_LVT3_N
++	CPU2_THERMTRIP -> H_CPU1_THERMTRIP_LVC1_N
++	CPU2_VRHOT -> IRQ_CPU1_VRHOT_N
++	CPU2_FIVR_FAULT -> EV_MON_FAIL_CPU1_N
++	CPU2_MEM_VRHOT -> IRQ_CPU1_MEM_VRHOT_N
++	CPU2_MEM_THERM_EVENT -> H_CPU1_MEMHOT_OUT_LVC1_N
++	CPU2_MISMATCH -> FM_CPU1_MISMATCH
++*/
++	/*IA0-IA7*/	"CPU1_PRESENCE","CPU1_THERMTRIP","CPU1_VRHOT","CPU1_FIVR_FAULT","CPU1_MEM_VRHOT","CPU1_MEM_THERM_EVENT","FM_CPU0_PROC_ID0","FM_CPU0_PROC_ID1",
++	/*IB0-IB7*/	"CPU1_MISMATCH","IRQ_PSYS_CRIT_N","CPU2_PRESENCE","CPU2_THERMTRIP","CPU2_VRHOT","CPU2_FIVR_FAULT","CPU1_MEM_VRHOT","CPU2_MEM_THERM_EVENT",
++	/*IC0-IC7*/	"FM_CPU1_PROC_ID0","FM_CPU1_PROC_ID1","CPU2_MISMATCH","","","","","",
 +	/*ID0-ID7*/	"","","","","","","","",
 +	/*IE0-IE7*/	"","","","","","","","",
 +	/*IF0-IF7*/	"FPGA_REV_TEST_0","FPGA_REV_TEST_1","FPGA_REV_TEST_2","FPGA_REV_TEST_3","FPGA_REV_TEST_4","FPGA_REV_TEST_5","FPGA_REV_TEST_6","FPGA_REV_TEST_7",
@@ -485,7 +487,7 @@ index 000000000000..c68314d3901b
 +};
 +
 +&pwm_tacho {
-+	status = "disabled";
++	status = "okay";
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_tach0_default
 +			&pinctrl_pwm1_default &pinctrl_tach1_default
@@ -504,7 +506,7 @@ index 000000000000..c68314d3901b
 +	};
 +	fan@1 {
 +		reg = <0x01>;
-+		 aspeed,fan-tach-ch = /bits/ 8 <0x01>;
++		aspeed,fan-tach-ch = /bits/ 8 <0x01>;
 +	};
 +	fan@2 {
 +		reg = <0x02>;
@@ -523,19 +525,19 @@ index 000000000000..c68314d3901b
 +		aspeed,fan-tach-ch = /bits/ 8 <0x05>;
 +	};
 +	fan@6 {
-+		reg = <0x06>;
++		reg = <0x0c>;
 +		aspeed,fan-tach-ch = /bits/ 8 <0x06>;
 +	};
 +	fan@7 {
-+		reg = <0x07>;
++		reg = <0x0d>;
 +		aspeed,fan-tach-ch = /bits/ 8 <0x07>;
 +	};
 +	fan@8 {
-+		reg = <0x08>;
++		reg = <0x0e>;
 +		aspeed,fan-tach-ch = /bits/ 8 <0x08>;
 +	};
 +	fan@9 {
-+		reg = <0x09>;
++		reg = <0x0f>;
 +		aspeed,fan-tach-ch = /bits/ 8 <0x09>;
 +	};
 +};
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch
index 89e7b894f..d8e911a54 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch
@@ -1,4 +1,4 @@
-From a90b8f7dfcfcab2d40d1a575e3948ef3a34f643f Mon Sep 17 00:00:00 2001
+From 063957ca24903e7cbebcaa11bde4cc1cc3cbb6a1 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Fri, 8 Nov 2019 15:57:27 -0800
 Subject: [PATCH] i2c: aspeed: filter garbage interrupts out
@@ -12,7 +12,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
  1 file changed, 14 insertions(+)
 
 diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
-index 62b803e15ce2..c24cecdcfe89 100644
+index 24850fb78ee1..d5a8da4a9009 100644
 --- a/drivers/i2c/busses/i2c-aspeed.c
 +++ b/drivers/i2c/busses/i2c-aspeed.c
 @@ -87,7 +87,11 @@
@@ -39,10 +39,10 @@ index 62b803e15ce2..c24cecdcfe89 100644
  
  /* 0x14 : I2CD Command/Status Register   */
  #define ASPEED_I2CD_SCL_LINE_STS			BIT(18)
-@@ -1021,6 +1030,11 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
- 	/* Ack all interrupts except for Rx done */
+@@ -1065,6 +1074,11 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
  	writel(irq_received & ~ASPEED_I2CD_INTR_RX_DONE,
  	       bus->base + ASPEED_I2C_INTR_STS_REG);
+ 	readl(bus->base + ASPEED_I2C_INTR_STS_REG);
 +	/*
 +	 * AST2600 makes a garbage interrupt which is decribed as 'reserved'
 +         * in datasheet so filter them out.
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0095-pwm-and-tach-driver-changes-for-ast2600.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0095-pwm-and-tach-driver-changes-for-ast2600.patch
index 377ec2b36..2d624d10f 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0095-pwm-and-tach-driver-changes-for-ast2600.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0095-pwm-and-tach-driver-changes-for-ast2600.patch
@@ -1,4 +1,4 @@
-From 0301f9b2bc948069aaad2899e15e6c94a07ca818 Mon Sep 17 00:00:00 2001
+From ffa6dd9617c65d6387bea50827a2843925aedde9 Mon Sep 17 00:00:00 2001
 From: Ayushi Smriti <smriti.ayushi@intel.com>
 Date: Mon, 2 Mar 2020 22:51:46 +0530
 Subject: [PATCH] pwm and tach driver changes for ast2600
@@ -9,23 +9,24 @@ ast2600
 
 Signed-off-by: Ayushi Smriti <smriti.ayushi@intel.com>
 ---
- drivers/hwmon/aspeed-g6-pwm-tacho.c | 328 +++++++++++++++-------------
+ drivers/hwmon/aspeed-g6-pwm-tacho.c | 328 +++++++++++++++++++-----------------
  1 file changed, 171 insertions(+), 157 deletions(-)
 
 diff --git a/drivers/hwmon/aspeed-g6-pwm-tacho.c b/drivers/hwmon/aspeed-g6-pwm-tacho.c
-index 1894f6ad5edb..1ff788bf1133 100644
+index 1894f6ad5edb..9551a17e7f55 100644
 --- a/drivers/hwmon/aspeed-g6-pwm-tacho.c
 +++ b/drivers/hwmon/aspeed-g6-pwm-tacho.c
-@@ -64,6 +64,8 @@
+@@ -64,6 +64,9 @@
  #define  PWM_RISING_FALLING_BIT			(8)	//pwm falling point bit [7:0]
  #define  PWM_RISING_RISING_BIT			(0)	//pwm rising point bit [7:0]
  
-+#define  DEF_PWM_PERIOD	0xff
++#define  PWM_PERIOD_MAX			255
++#define  PWM_FALLING_DEFAULT		150 /* 58% */
 +
  #define ASPEED_TACHO_CTRL		0x08	//TACH0 General Register
  #define ASPEED_TACHO_CTRL_CH(x)			((x * 0x10) + 0x08)
  #define  TACHO_IER						BIT(31)	//enable tacho interrupt
-@@ -72,8 +74,7 @@
+@@ -72,8 +75,7 @@
  #define  TACHO_ENABLE					BIT(28)	//{enable tacho}
  #define  TACHO_DEBOUNCE_BIT				(26) //{tacho de-bounce}
  #define  TACHO_DEBOUNCE_MASK			(0x3 << 26) //{tacho de-bounce}
@@ -35,15 +36,13 @@ index 1894f6ad5edb..1ff788bf1133 100644
  #define  TACHO_CLK_DIV_T_MASK			(0xf << 20)
  #define  TACHO_CLK_DIV_BIT				(20)
  #define  TACHO_THRESHOLD_MASK			(0xfffff)	//tacho threshold bit
-@@ -102,211 +103,183 @@
+@@ -102,211 +104,181 @@
  
  #define MAX_CDEV_NAME_LEN 16
  
 +#define DEFAULT_TARGET_PWM_FREQ	25000
 +#define DEFAULT_MIN_RPM	2900
 +
-+#define PWM_FALLING_VALUE	0xff
-+
  struct aspeed_pwm_channel_params {
 +	int target_freq;
 +	int pwm_freq;
@@ -72,7 +71,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[1] = {
 +		.target_freq = 25000,
@@ -86,7 +85,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[2] = {
 +		.target_freq = 25000,
@@ -100,7 +99,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[3] = {
 +		.target_freq = 25000,
@@ -114,7 +113,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[4] = {
 +		.target_freq = 25000,
@@ -128,7 +127,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[5] = {
 +		.target_freq = 25000,
@@ -142,7 +141,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[6] = {
 +		.target_freq = 25000,
@@ -156,7 +155,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[7] = {
 +		.target_freq = 25000,
@@ -170,7 +169,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[8] = {
 +		.target_freq = 25000,
@@ -184,7 +183,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[9] = {
 +		.target_freq = 25000,
@@ -198,7 +197,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[10] = {
 +		.target_freq = 25000,
@@ -212,7 +211,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[11] = {
 +		.target_freq = 25000,
@@ -226,7 +225,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[12] = {
 +		.target_freq = 25000,
@@ -240,7 +239,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[13] = {
 +		.target_freq = 25000,
@@ -254,7 +253,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[14] = {
 +		.target_freq = 25000,
@@ -268,7 +267,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  	[15] = {
 +		.target_freq = 25000,
@@ -282,11 +281,11 @@ index 1894f6ad5edb..1ff788bf1133 100644
 -		.period = 0x13,	//5% ~~
  		.rising = 0x00,
 -		.falling = 0x0a,
-+		.falling = PWM_FALLING_VALUE,
++		.falling = PWM_FALLING_DEFAULT,
  	},
  };
  
-@@ -318,125 +291,146 @@ static struct aspeed_pwm_channel_params default_pwm_params[] = {
+@@ -318,125 +290,146 @@ static struct aspeed_pwm_channel_params default_pwm_params[] = {
   * 11: reserved.
   */
  
@@ -450,7 +449,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
  		.tacho_debounce = 0,
  		.divide = 8,
  	},
-@@ -501,29 +495,28 @@ static void aspeed_set_pwm_channel_enable(struct regmap *regmap, u8 pwm_channel,
+@@ -501,29 +494,29 @@ static void aspeed_set_pwm_channel_enable(struct regmap *regmap, u8 pwm_channel,
  static void aspeed_set_fan_tach_ch_enable(struct aspeed_pwm_tachometer_data *priv, u8 fan_tach_ch,
  					  bool enable)
  {
@@ -473,6 +472,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
 +					break;
 +			}
 +		} else {
++			i = 0;
  			divide_val = 1;
 -			for (j = 1; j <= i; j++)
 -				divide_val *= 4;
@@ -505,7 +505,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
  	} else {
 -		duty_value = (priv->pwm_channel[index].period << PWM_PERIOD_BIT) |
 -					(0 << PWM_RISING_RISING_BIT) | (fan_ctrl << PWM_RISING_FALLING_BIT);
-+		cal_freq = priv->clk_freq / (DEF_PWM_PERIOD + 1);
++		cal_freq = priv->clk_freq / (PWM_PERIOD_MAX + 1);
 +		/*calculate for target frequence*/
 +		for (div_l = 0; div_l < 0x100; div_l++) {
 +			for (div_h = 0; div_h < 0x10; div_h++) {
@@ -515,13 +515,13 @@ index 1894f6ad5edb..1ff788bf1133 100644
 +			if ((cal_freq / (BIT(div_h) * (div_l + 1))) < priv->pwm_channel[index].target_freq)
 +				break;
 +		}
-+
-+		priv->pwm_channel[index].pwm_freq = cal_freq / (BIT(div_h) * (div_l + 1));
  
 -		ctrl_value = (priv->pwm_channel[index].divide_h << 8) | priv->pwm_channel[index].divide_l;
++		priv->pwm_channel[index].pwm_freq = cal_freq / (BIT(div_h) * (div_l + 1));
++
 +		ctrl_value = (div_h << 8) | div_l;
 +
-+		duty_value = (DEF_PWM_PERIOD << PWM_PERIOD_BIT) |
++		duty_value = (PWM_PERIOD_MAX << PWM_PERIOD_BIT) |
 +					(0 << PWM_RISING_RISING_BIT) | (fan_ctrl << PWM_RISING_FALLING_BIT);
  
  		if (priv->pwm_channel[index].load_wdt_enable) {
@@ -578,7 +578,7 @@ index 1894f6ad5edb..1ff788bf1133 100644
  		return ret;
  
 -	if (fan_ctrl < 0 || fan_ctrl > priv->pwm_channel[index].period)
-+	if (fan_ctrl < 0 || fan_ctrl > DEF_PWM_PERIOD)
++	if (fan_ctrl < 0 || fan_ctrl > PWM_PERIOD_MAX)
  		return -EINVAL;
  
  	if (priv->pwm_channel[index].falling == fan_ctrl)
@@ -779,5 +779,5 @@ index 1894f6ad5edb..1ff788bf1133 100644
  }
  
 -- 
-2.17.1
+2.7.4
 
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0106-enable-AST2600-I3C.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0106-enable-AST2600-I3C.patch
index 7eac39e5b..4cc88cbeb 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0106-enable-AST2600-I3C.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0106-enable-AST2600-I3C.patch
@@ -1,4 +1,4 @@
-From ec463c332c3b954a5a0ef4ceb253701b8190bbb9 Mon Sep 17 00:00:00 2001
+From c3be31a18ef1755c86c169b9d0e54bdbbea99d8a Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Wed, 6 May 2020 18:11:29 -0700
 Subject: [PATCH] enable AST2600 I3C
@@ -20,10 +20,10 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
  drivers/i3c/master.c                      |  39 ++-
  drivers/i3c/master/Kconfig                |   5 +
  drivers/i3c/master/Makefile               |   1 +
- drivers/i3c/master/aspeed-i3c-global.c    |  89 +++++++
+ drivers/i3c/master/aspeed-i3c-global.c    |  77 ++++++
  include/dt-bindings/clock/ast2600-clock.h |   3 +-
  include/uapi/linux/i3c/i3cdev.h           |  38 +++
- 12 files changed, 646 insertions(+), 24 deletions(-)
+ 12 files changed, 634 insertions(+), 24 deletions(-)
  create mode 100644 drivers/i3c/i3cdev.c
  create mode 100644 drivers/i3c/master/aspeed-i3c-global.c
  create mode 100644 include/uapi/linux/i3c/i3cdev.h
@@ -756,31 +756,23 @@ index 4e80a1fcbf91..693f9aba2b17 100644
 +	depends on I3C
 +	depends on MACH_ASPEED_G6
 diff --git a/drivers/i3c/master/Makefile b/drivers/i3c/master/Makefile
-index 7eea9e086144..09057d1432cc 100644
+index 7eea9e086144..b5ec8e8dd622 100644
 --- a/drivers/i3c/master/Makefile
 +++ b/drivers/i3c/master/Makefile
 @@ -1,3 +1,4 @@
  # SPDX-License-Identifier: GPL-2.0-only
++obj-$(CONFIG_ASPEED_I3C_GLOBAL)		+= aspeed-i3c-global.o
  obj-$(CONFIG_CDNS_I3C_MASTER)		+= i3c-master-cdns.o
  obj-$(CONFIG_DW_I3C_MASTER)		+= dw-i3c-master.o
-+obj-$(CONFIG_ASPEED_I3C_GLOBAL)		+= aspeed-i3c-global.o
 diff --git a/drivers/i3c/master/aspeed-i3c-global.c b/drivers/i3c/master/aspeed-i3c-global.c
 new file mode 100644
-index 000000000000..9c3e58794a3e
+index 000000000000..8db6c1397a6c
 --- /dev/null
 +++ b/drivers/i3c/master/aspeed-i3c-global.c
-@@ -0,0 +1,89 @@
-+/*
-+ *  Aspeed I2C Interrupt Controller.
-+ *
-+ *  Copyright (C) 2012-2017 ASPEED Technology Inc.
-+ *  Copyright 2017 IBM Corporation
-+ *  Copyright 2017 Google, Inc.
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
+@@ -0,0 +1,77 @@
++// SPDX-License-Identifier: GPL-2.0
++// Copyright (C) 2019 ASPEED Technology Inc.
++
 +#include <linux/clk.h>
 +#include <linux/irq.h>
 +#include <linux/irqchip.h>
@@ -803,11 +795,6 @@ index 000000000000..9c3e58794a3e
 +	struct reset_control	*rst;
 +};
 +
-+static const struct of_device_id aspeed_i3c_of_match[] = {
-+	{ .compatible = "aspeed,ast2600-i3c-global", },
-+	{},
-+};
-+
 +static int aspeed_i3c_global_probe(struct platform_device *pdev)
 +{
 +	struct aspeed_i3c_global *i3c_global;
@@ -826,8 +813,8 @@ index 000000000000..9c3e58794a3e
 +	i3c_global->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
 +
 +	if (IS_ERR(i3c_global->rst)) {
-+		dev_err(&pdev->dev,
-+			"missing or invalid reset controller device tree entry");
++		if (PTR_ERR(i3c_global->rst) != -EPROBE_DEFER)
++			dev_err(&pdev->dev, "missing or invalid reset controller device tree entry\n");
 +		return PTR_ERR(i3c_global->rst);
 +	}
 +
@@ -842,6 +829,12 @@ index 000000000000..9c3e58794a3e
 +	return 0;
 +}
 +
++static const struct of_device_id aspeed_i3c_of_match[] = {
++	{ .compatible = "aspeed,ast2600-i3c-global", },
++	{ },
++};
++MODULE_DEVICE_TABLE(of, aspeed_i3c_of_match);
++
 +static struct platform_driver aspeed_i3c_driver = {
 +	.probe  = aspeed_i3c_global_probe,
 +	.driver = {
@@ -849,12 +842,7 @@ index 000000000000..9c3e58794a3e
 +		.of_match_table = aspeed_i3c_of_match,
 +	},
 +};
-+
-+static int __init aspeed_i3c_global_init(void)
-+{
-+	return platform_driver_register(&aspeed_i3c_driver);
-+}
-+postcore_initcall(aspeed_i3c_global_init);
++module_platform_driver(aspeed_i3c_driver);
 +
 +MODULE_AUTHOR("Ryan Chen");
 +MODULE_DESCRIPTION("ASPEED I3C Global Driver");
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0109-signal-Extend-exec_id-to-64bits.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0109-signal-Extend-exec_id-to-64bits.patch
deleted file mode 100644
index 7d879ab82..000000000
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0109-signal-Extend-exec_id-to-64bits.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 5f2d04139aa5ed04eab54b84e8a25bab87a2449c Mon Sep 17 00:00:00 2001
-From: "Eric W. Biederman" <ebiederm@xmission.com>
-Date: Mon, 30 Mar 2020 19:01:04 -0500
-Subject: [PATCH] signal: Extend exec_id to 64bits
-
-commit d1e7fd6462ca9fc76650fbe6ca800e35b24267da upstream.
-
-Replace the 32bit exec_id with a 64bit exec_id to make it impossible
-to wrap the exec_id counter.  With care an attacker can cause exec_id
-wrap and send arbitrary signals to a newly exec'd parent.  This
-bypasses the signal sending checks if the parent changes their
-credentials during exec.
-
-The severity of this problem can been seen that in my limited testing
-of a 32bit exec_id it can take as little as 19s to exec 65536 times.
-Which means that it can take as little as 14 days to wrap a 32bit
-exec_id.  Adam Zabrocki has succeeded wrapping the self_exe_id in 7
-days.  Even my slower timing is in the uptime of a typical server.
-Which means self_exec_id is simply a speed bump today, and if exec
-gets noticably faster self_exec_id won't even be a speed bump.
-
-Extending self_exec_id to 64bits introduces a problem on 32bit
-architectures where reading self_exec_id is no longer atomic and can
-take two read instructions.  Which means that is is possible to hit
-a window where the read value of exec_id does not match the written
-value.  So with very lucky timing after this change this still
-remains expoiltable.
-
-I have updated the update of exec_id on exec to use WRITE_ONCE
-and the read of exec_id in do_notify_parent to use READ_ONCE
-to make it clear that there is no locking between these two
-locations.
-
-Link: https://lore.kernel.org/kernel-hardening/20200324215049.GA3710@pi3.com.pl
-Fixes: 2.3.23pre2
-Cc: stable@vger.kernel.org
-Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/exec.c             | 2 +-
- include/linux/sched.h | 4 ++--
- kernel/signal.c       | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/fs/exec.c b/fs/exec.c
-index c27231234764..fc2870f2aca9 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1383,7 +1383,7 @@ void setup_new_exec(struct linux_binprm * bprm)
- 
- 	/* An exec changes our domain. We are no longer part of the thread
- 	   group */
--	current->self_exec_id++;
-+	WRITE_ONCE(current->self_exec_id, current->self_exec_id + 1);
- 	flush_signal_handlers(current, 0);
- }
- EXPORT_SYMBOL(setup_new_exec);
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index b968d736833b..5710b80f8050 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -934,8 +934,8 @@ struct task_struct {
- 	struct seccomp			seccomp;
- 
- 	/* Thread group tracking: */
--	u32				parent_exec_id;
--	u32				self_exec_id;
-+	u64				parent_exec_id;
-+	u64				self_exec_id;
- 
- 	/* Protection against (de-)allocation: mm, files, fs, tty, keyrings, mems_allowed, mempolicy: */
- 	spinlock_t			alloc_lock;
-diff --git a/kernel/signal.c b/kernel/signal.c
-index eea748174ade..7d3d35eb7a0b 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -1931,7 +1931,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
- 		 * This is only possible if parent == real_parent.
- 		 * Check if it has changed security domain.
- 		 */
--		if (tsk->parent_exec_id != tsk->parent->self_exec_id)
-+		if (tsk->parent_exec_id != READ_ONCE(tsk->parent->self_exec_id))
- 			sig = SIGCHLD;
- 	}
- 
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0111-Unconditionally-calculate-the-PECI-AW-FCS.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0111-Unconditionally-calculate-the-PECI-AW-FCS.patch
new file mode 100644
index 000000000..9b68f8036
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0111-Unconditionally-calculate-the-PECI-AW-FCS.patch
@@ -0,0 +1,73 @@
+From e985c1cbb4cf6971c82afacb16737749a2d25452 Mon Sep 17 00:00:00 2001
+From: Johnathan Mantey <johnathanx.mantey@intel.com>
+Date: Tue, 19 May 2020 11:39:00 -0700
+Subject: [PATCH] Unconditionally calculate the PECI AW FCS
+
+The PECI write commands that include the AW FCS byte were failing due
+to the way AW FCS bytes were being managed. The current paradigm
+permitted in the Redfish interface was to allow the AW FCS byte to be
+omitted. The peci-core logic attempted to create the AW FCS byte. The
+algorithm being used left the possibility of a bad FCS byte being
+appended to the PECI command.
+
+This change manages the issue by always overwriting the AW FCS byte
+with a value freshly calculated from the write payload. The user
+supplying the AW FCS byte no longer matters.
+
+Tested:
+Submitted this PECI sequence:
+48 10 1 165 0 26 0 0 223 134 21 0
+
+The sequence was sent from Redfish, and a return code of 0x40
+resulted.
+Prior to this the sequence would report 0x90.
+
+Supplied the same sequence to "peci_cmds raw" in the console.
+It failed because the number of bytes did not include the AW FCS
+byte. Adding any additional byte allows the command to succeed.
+
+Change-Id: I217a8f136b48282634a7c8fdde7b440720c010c6
+Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>
+---
+ drivers/peci/peci-core.c | 21 ++++++---------------
+ 1 file changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/peci/peci-core.c b/drivers/peci/peci-core.c
+index efb73b09a9c0..426ee2be3271 100644
+--- a/drivers/peci/peci-core.c
++++ b/drivers/peci/peci-core.c
+@@ -397,25 +397,16 @@ static int peci_cmd_xfer(struct peci_adapter *adapter, void *vmsg)
+ 		case PECI_WRPCICFG_CMD:
+ 		case PECI_WRPCICFGLOCAL_CMD:
+ 		case PECI_WRENDPTCFG_CMD:
+-			/* Check if the AW FCS byte is already provided */
++			/*
++			 * The sender may not have supplied the AW FCS byte.
++			 * Unconditionally add an Assured Write Frame Check
++			 * Sequence byte
++			 */
+ 			ret = peci_aw_fcs(msg, 2 + msg->tx_len, &aw_fcs);
+ 			if (ret)
+ 				break;
+ 
+-			if (msg->tx_buf[msg->tx_len - 1] != (0x80 ^ aw_fcs)) {
+-				/*
+-				 * Add an Assured Write Frame Check Sequence
+-				 * byte and increment the tx_len to include
+-				 * the new byte.
+-				 */
+-				msg->tx_len++;
+-				ret = peci_aw_fcs(msg, 2 + msg->tx_len,
+-						  &aw_fcs);
+-				if (ret)
+-					break;
+-
+-				msg->tx_buf[msg->tx_len - 1] = 0x80 ^ aw_fcs;
+-			}
++			msg->tx_buf[msg->tx_len - 1] = 0x80 ^ aw_fcs;
+ 
+ 			ret = peci_xfer_with_retries(adapter, msg, true);
+ 			break;
+-- 
+2.26.2
+
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0112-AST2600-enable-UART-routing.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0112-AST2600-enable-UART-routing.patch
new file mode 100644
index 000000000..7d14f9e91
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0112-AST2600-enable-UART-routing.patch
@@ -0,0 +1,45 @@
+From 47bb1475893aab85067b286fee7f6b126ea2b633 Mon Sep 17 00:00:00 2001
+From: Kuiying Wang <kuiying.wang@intel.com>
+Date: Wed, 10 Jun 2020 13:07:59 +0800
+Subject: [PATCH] AST2600: enable UART routing.
+
+Enable UART routing.
+
+Signed-off-by: Kuiying Wang <kuiying.wang@intel.com>
+---
+ arch/arm/boot/dts/aspeed-g6.dtsi | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
+index 90a060db20c7..0361a7ee6e14 100644
+--- a/arch/arm/boot/dts/aspeed-g6.dtsi
++++ b/arch/arm/boot/dts/aspeed-g6.dtsi
+@@ -331,12 +331,6 @@
+ 					compatible = "aspeed,ast2600-pinctrl";
+ 				};
+ 
+-				uart_routing: uart_routing@9c {
+-					compatible = "aspeed,ast2500-uart-routing";
+-					reg = <0x9c 0x4>;
+-					status = "disabled";
+-				};
+-
+ 				smp-memram@180 {
+ 					compatible = "aspeed,ast2600-smpmem";
+ 					reg = <0x180 0x40>;
+@@ -688,6 +682,12 @@
+ 						clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
+ 					};
+ 				};
++
++				uart_routing: uart_routing@9c {
++					compatible = "aspeed,ast2500-uart-routing";
++					reg = <0x9c 0x4>;
++					status = "disabled";
++				};
+ 			};
+ 
+ 			sdc: sdc@1e740000 {
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend
index f1d781f6f..1c6a307ff 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -79,8 +79,9 @@ SRC_URI += " \
         file://0106-enable-AST2600-I3C.patch \
         file://0107-arm-dts-aspeed-g6-Add-ast2600-mctp-node.patch \
         file://0108-soc-aspeed-mctp-Add-initial-driver-for-ast2600-mctp.patch \
-        file://0109-signal-Extend-exec_id-to-64bits.patch \
         file://0110-USB-gadget-fix-illegal-array-access-in-binding-with-.patch \
+        file://0111-Unconditionally-calculate-the-PECI-AW-FCS.patch \
+        file://0112-AST2600-enable-UART-routing.patch \
         "
 
 SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
index 577e5aaaa..813561384 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,6 +1,6 @@
 # this is here just to bump faster than upstream
 SRC_URI = "git://github.com/openbmc/entity-manager.git"
-SRCREV = "fa8d322d08743b3ca0e6f575011814058e18f011"
+SRCREV = "8c505da0ffd8709f3c799a855ff921cfbd446201"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch
new file mode 100644
index 000000000..3d2cc43e2
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch
@@ -0,0 +1,47 @@
+From 153b125043c28f933579330727d82658979caef3 Mon Sep 17 00:00:00 2001
+From: Vikram Bodireddy <vikram.bodireddy@intel.com>
+Date: Mon, 18 May 2020 20:16:04 +0530
+Subject: [PATCH] Apply Options interface for Software
+
+Apply Options interface is used to pass the settings related to
+firmware image activation such as ClearConfig.
+ClearConfig property is used to denote whether to clear firmware
+configurations along with firmware image activation or not.
+
+Example case:
+BIOS usually requires its NVRAM configuration to be updated or
+erased for certain BIOS firmware updates. Current implementation
+doesn't support to take this option and provide interface to do
+the necessary actions.
+
+Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+---
+ .../Software/ApplyOptions.interface.yaml         | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+ create mode 100644 xyz/openbmc_project/Software/ApplyOptions.interface.yaml
+
+diff --git a/xyz/openbmc_project/Software/ApplyOptions.interface.yaml b/xyz/openbmc_project/Software/ApplyOptions.interface.yaml
+new file mode 100644
+index 0000000..45a68ab
+--- /dev/null
++++ b/xyz/openbmc_project/Software/ApplyOptions.interface.yaml
+@@ -0,0 +1,16 @@
++description: >
++    To implement the Activation apply options for a newly uploaded firmware
++    image. The apply options property is global and is specifically used with
++    each firmware update and is used during firmware activation.
++    ApplyOptions usage during firmware activation is implementation specific,
++    not all firmware targets need ApplyOptions.
++    The default value of this property is false.
++properties:
++    - name: ClearConfig
++      type: boolean
++      default: false
++      description: >
++        This property indicates whether to clear the software configurations
++        when the firmware image update is getting applied. A value of true
++        indicates the firmware configurations should be cleared along with
++        firmware image activation.
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch
index fba025207..dc44d7a0d 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch
@@ -1,4 +1,4 @@
-From 7a3fc3a969d2a187be20a972a5a7209944731bea Mon Sep 17 00:00:00 2001
+From 9bcc45f1a4d872e9968fdebf675c5fff6921c2f3 Mon Sep 17 00:00:00 2001
 From: "Kowalski, Mariusz" <mariusz.kowalski@intel.com>
 Date: Thu, 27 Feb 2020 15:48:56 +0100
 Subject: [PATCH] MCTP Daemon D-Bus interface definition.
@@ -7,6 +7,7 @@ This interface definition was created on base of the MCTP design
 proposed in this document:
 https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/28424/9/designs/mctp.md
 
+Signed-off-by: Arun P. Mohanan <arun.p.m@linux.intel.com>
 Signed-off-by: Mariusz Kowalski <mariusz.kowalski@intel.com>
 Signed-off-by: Karol Wachowski <karol.wachowski@intel.com>
 Change-Id: Ida66f8ffcf00003655edcb0fb0112202797b8e1a
@@ -14,11 +15,11 @@ Change-Id: Ida66f8ffcf00003655edcb0fb0112202797b8e1a
  xyz/openbmc_project/MCTP/Base.interface.yaml  | 231 ++++++++++++++++++
  .../MCTP/Binding/PCIe.interface.yaml          |  29 +++
  .../MCTP/Binding/SMBus.interface.yaml         |  17 ++
- .../MCTP/BusOwner.interface.yaml              |  15 ++
+ .../MCTP/BusOwner.interface.yaml              |  17 ++
  .../MCTP/Endpoint.interface.yaml              |  19 ++
  xyz/openbmc_project/MCTP/README.md            |  38 +++
  .../MCTP/SupportedMessageTypes.interface.yaml |  36 +++
- 7 files changed, 385 insertions(+)
+ 7 files changed, 387 insertions(+)
  create mode 100644 xyz/openbmc_project/MCTP/Base.interface.yaml
  create mode 100644 xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml
  create mode 100644 xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml
@@ -29,7 +30,7 @@ Change-Id: Ida66f8ffcf00003655edcb0fb0112202797b8e1a
 
 diff --git a/xyz/openbmc_project/MCTP/Base.interface.yaml b/xyz/openbmc_project/MCTP/Base.interface.yaml
 new file mode 100644
-index 0000000..9a649a5
+index 0000000..f27c1c7
 --- /dev/null
 +++ b/xyz/openbmc_project/MCTP/Base.interface.yaml
 @@ -0,0 +1,231 @@
@@ -324,17 +325,19 @@ index 0000000..9219ad0
 +      description: Slave address to be used for this medium
 diff --git a/xyz/openbmc_project/MCTP/BusOwner.interface.yaml b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml
 new file mode 100644
-index 0000000..0853381
+index 0000000..d46298e
 --- /dev/null
 +++ b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,17 @@
 +description: >
 +    Interface exposed by MCTP root object, when executing in Bus Owner mode.
 +
 +properties:
 +    - name: EidPool
 +      type: array[struct[byte, byte]]
-+      description: Pool of allowed EIDs to be used
++      description: >
++        Pool of allowed EIDs to be used.
++        EID pool of 10-100 can be specified as {{10,100}}.
 +
 +    - name: TopMostBusOwner
 +      type: boolean
@@ -370,7 +373,7 @@ index 0000000..b7f9a67
 +        MCTP network within a platform.
 diff --git a/xyz/openbmc_project/MCTP/README.md b/xyz/openbmc_project/MCTP/README.md
 new file mode 100644
-index 0000000..1c3b4aa
+index 0000000..3255ef2
 --- /dev/null
 +++ b/xyz/openbmc_project/MCTP/README.md
 @@ -0,0 +1,38 @@
@@ -408,7 +411,7 @@ index 0000000..1c3b4aa
 +following interfaces.
 +1. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes supported MCTP
 +message types for the discovered MCTP Endpoint.
-+2. `xyz.openbmc_project.MCTP.Enpoint` which exposes properties like UUID and endpoint
++2. `xyz.openbmc_project.MCTP.Endpoint` which exposes properties like UUID and endpoint
 +mode (to identify Bus Owner or Bridge or Endpoint) for the discovered MCTP Endpoint.
 +3. `xyz.openbmc_project.MCTP.Bridge` available only for discovered MCTP Bridges to
 +expose properties like EID pool. (TBD)
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
index 762efe2b4..adebde874 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend
@@ -1,5 +1,7 @@
-SRC_URI =  "git://github.com/openbmc/phosphor-dbus-interfaces.git"
-SRCREV = "fdd88281dd243b3b9e6140b3f7b59aaaa188f37e"
+SRC_URI =  "git://github.com/openbmc/phosphor-dbus-interfaces.git;nobranch=1"
+
+# todo(Johnathan) fix nobranch
+SRCREV = "26ff1c84469e470e28257f3584e1b1126d4783f0"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -12,5 +14,6 @@ SRC_URI += "file://0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch
             file://0025-Add-PreInterruptFlag-properity-in-DBUS.patch \
             file://0001-Reapply-Enhance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch \
             file://0026-Add-StandbySpare-support-for-software-inventory.patch \
+            file://0027-Apply-Options-interface-for-Software.patch \
             file://0028-MCTP-Daemon-D-Bus-interface-definition.patch \
             "
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 2026a13b0..e6c993658 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -5,6 +5,6 @@ SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service"
 EXTRA_OECONF = "--enable-configure-dbus=yes"
 
 SRC_URI = "git://github.com/openbmc/phosphor-pid-control.git"
-SRCREV = "298a95cbb192ecc678b1a496acc954a3b2adf450"
+SRCREV = "e30916c9ef6d363328b95c9947ac95d94a2b6a24"
 
 FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0009-Add-ApplyOptions-D-bus-property-under-Software.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0009-Add-ApplyOptions-D-bus-property-under-Software.patch
new file mode 100644
index 000000000..3fa6a9a79
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0009-Add-ApplyOptions-D-bus-property-under-Software.patch
@@ -0,0 +1,44 @@
+From 76f169e71be10b50b9617e606c38aff9553e6de8 Mon Sep 17 00:00:00 2001
+From: Vikram Bodireddy <vikram.bodireddy@intel.com>
+Date: Fri, 15 May 2020 21:17:08 +0530
+Subject: [PATCH] Add ApplyOptions D-bus property under Software
+
+This change adds the ApplyOptions D-bus property
+under xyz.openbmc_project.Software.BMC.Updater.
+ApplyOptions is needed for BIOS NVRAM clear during
+BIOS firmware update. ClearConfig attribute is passed
+from RF to fwupd script.
+
+Tested: Set and Get of ClearConfig from fwupd.sh works
+        fine.
+
+Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+---
+ item_updater.hpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/item_updater.hpp b/item_updater.hpp
+index 3f0530f..5c1a779 100644
+--- a/item_updater.hpp
++++ b/item_updater.hpp
+@@ -9,6 +9,7 @@
+ #include <xyz/openbmc_project/Association/Definitions/server.hpp>
+ #include <xyz/openbmc_project/Common/FactoryReset/server.hpp>
+ #include <xyz/openbmc_project/Control/FieldMode/server.hpp>
++#include <xyz/openbmc_project/Software/ApplyOptions/server.hpp>
+ 
+ namespace phosphor
+ {
+@@ -21,7 +22,8 @@ using ItemUpdaterInherit = sdbusplus::server::object::object<
+     sdbusplus::xyz::openbmc_project::Common::server::FactoryReset,
+     sdbusplus::xyz::openbmc_project::Control::server::FieldMode,
+     sdbusplus::xyz::openbmc_project::Association::server::Definitions,
+-    sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll>;
++    sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll,
++    sdbusplus::xyz::openbmc_project::Software::server::ApplyOptions>;
+ 
+ namespace MatchRules = sdbusplus::bus::match::rules;
+ using VersionClass = phosphor::software::manager::Version;
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index edd4254ce..f72c18cd0 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -15,6 +15,7 @@ SRC_URI += "file://0002-Redfish-firmware-activation.patch \
 
 SRC_URI_PFR = "file://0007-PFR-images-support.patch \
                file://0008-PFR-image-HASH-verification.patch \
+               file://0009-Add-ApplyOptions-D-bus-property-under-Software.patch \
               "
 
 SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', SRC_URI_PFR, '', d)}"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend
new file mode 100644
index 000000000..08d867de4
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend
@@ -0,0 +1 @@
+DEPENDS += " gtest"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Temporarily-disable-EventService-log-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Temporarily-disable-EventService-log-support.patch
new file mode 100644
index 000000000..bfa843e73
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Temporarily-disable-EventService-log-support.patch
@@ -0,0 +1,30 @@
+From cd173b21c42456bde9765e7f6164e495b6c6a303 Mon Sep 17 00:00:00 2001
+From: James Feist <james.feist@linux.intel.com>
+Date: Wed, 3 Jun 2020 10:08:05 -0700
+Subject: [PATCH 1/1] Temporarily disable EventService log support
+
+This is causing bmcweb to crash when there is no
+redfish log.
+
+Change-Id: Id53e57f1ca140ee44f69fec46fd63bec18490c99
+Signed-off-by: James Feist <james.feist@linux.intel.com>
+---
+ src/webserver_main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
+index ea32122..421cd1d 100644
+--- a/src/webserver_main.cpp
++++ b/src/webserver_main.cpp
+@@ -116,7 +116,7 @@ int main(int argc, char** argv)
+ 
+     redfish::RedfishService redfish(app);
+ 
+-#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES
++#if 0
+     int rc = redfish::EventServiceManager::startEventLogMonitor(*io);
+     if (rc)
+     {
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch
new file mode 100644
index 000000000..844a65ec9
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch
@@ -0,0 +1,245 @@
+From 4d88fcada1d95f485ea5a1dd418b31c508652712 Mon Sep 17 00:00:00 2001
+From: Vikram Bodireddy <vikram.bodireddy@intel.com>
+Date: Fri, 15 May 2020 21:12:44 +0530
+Subject: [PATCH] bmcweb changes for setting ApplyOptions-ClearCfg
+
+ApplyOptions are used to specify firmware update specific options
+such as ClearConfig which is used while activating the updated
+firmware. This setting is maintained in a local static variable
+when set using PATCH method. Its used in activate image as input
+parameter. This attribute is added as Oem as the default
+UpdateService interface doesn't specify any relevant or appropriate
+attribute for this.
+
+Tested: Tested setting ClearConfig to true or false using PATCH
+        method.
+        Ran Redfish-Service-Validator and no new issues found.
+
+Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+---
+ redfish-core/lib/update_service.hpp           | 69 ++++++++++++++++++-
+ .../JsonSchemas/OemUpdateService/index.json   | 69 +++++++++++++++++++
+ .../redfish/v1/schema/OemUpdateService_v1.xml | 40 +++++++++++
+ 3 files changed, 177 insertions(+), 1 deletion(-)
+ create mode 100644 static/redfish/v1/JsonSchemas/OemUpdateService/index.json
+ create mode 100644 static/redfish/v1/schema/OemUpdateService_v1.xml
+
+diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
+index a913bac..3a64e63 100644
+--- a/redfish-core/lib/update_service.hpp
++++ b/redfish-core/lib/update_service.hpp
+@@ -579,6 +579,29 @@ class UpdateService : public Node
+             "/xyz/openbmc_project/software/apply_time",
+             "org.freedesktop.DBus.Properties", "Get",
+             "xyz.openbmc_project.Software.ApplyTime", "RequestedApplyTime");
++
++        // Get the ApplyOptions value
++        crow::connections::systemBus->async_method_call(
++            [aResp](const boost::system::error_code ec,
++                    const std::variant<bool> applyOption) {
++                if (ec)
++                {
++                    BMCWEB_LOG_DEBUG << "DBUS response error " << ec;
++                    messages::internalError(aResp->res);
++                    return;
++                }
++
++                const bool *b = std::get_if<bool>(&applyOption);
++
++                if (b)
++                {
++                    aResp->res.jsonValue["Oem"]["ApplyOptions"]["ClearConfig"] =
++                        *b;
++                }
++            },
++            "xyz.openbmc_project.Software.BMC.Updater",
++            "/xyz/openbmc_project/software", "org.freedesktop.DBus.Properties",
++            "Get", "xyz.openbmc_project.Software.ApplyOptions", "ClearConfig");
+     }
+ 
+     void doPatch(crow::Response &res, const crow::Request &req,
+@@ -591,15 +614,59 @@ class UpdateService : public Node
+         std::optional<nlohmann::json> pushUriOptions;
+         std::optional<std::vector<std::string>> imgTargets;
+         std::optional<bool> imgTargetBusy;
++        std::optional<nlohmann::json> oemProps;
+ 
+         if (!json_util::readJson(req, res, "HttpPushUriOptions", pushUriOptions,
+                                  "HttpPushUriTargets", imgTargets,
+-                                 "HttpPushUriTargetsBusy", imgTargetBusy))
++                                 "HttpPushUriTargetsBusy", imgTargetBusy, "Oem",
++                                 oemProps))
+         {
+             BMCWEB_LOG_DEBUG << "UpdateService doPatch: Invalid request body";
+             return;
+         }
+ 
++        if (oemProps)
++        {
++            std::optional<nlohmann::json> applyOptions;
++
++            if (!json_util::readJson(*oemProps, res, "ApplyOptions",
++                                     applyOptions))
++            {
++                return;
++            }
++
++            if (applyOptions)
++            {
++                std::optional<bool> clearConfig;
++                if (!json_util::readJson(*applyOptions, res, "ClearConfig",
++                                         clearConfig))
++                {
++                    return;
++                }
++
++                if (clearConfig)
++                {
++                    // Set the requested image apply time value
++                    crow::connections::systemBus->async_method_call(
++                        [asyncResp](const boost::system::error_code ec) {
++                            if (ec)
++                            {
++                                BMCWEB_LOG_ERROR << "D-Bus responses error: "
++                                                 << ec;
++                                messages::internalError(asyncResp->res);
++                                return;
++                            }
++                            messages::success(asyncResp->res);
++                        },
++                        "xyz.openbmc_project.Software.BMC.Updater",
++                        "/xyz/openbmc_project/software",
++                        "org.freedesktop.DBus.Properties", "Set",
++                        "xyz.openbmc_project.Software.ApplyOptions",
++                        "ClearConfig", std::variant<bool>{*clearConfig});
++                }
++            }
++        }
++
+         if (pushUriOptions)
+         {
+             std::optional<nlohmann::json> pushUriApplyTime;
+diff --git a/static/redfish/v1/JsonSchemas/OemUpdateService/index.json b/static/redfish/v1/JsonSchemas/OemUpdateService/index.json
+new file mode 100644
+index 0000000..74e39cd
+--- /dev/null
++++ b/static/redfish/v1/JsonSchemas/OemUpdateService/index.json
+@@ -0,0 +1,69 @@
++{
++    "$id": "http://redfish.dmtf.org/schemas/v1/OemUpdateService.json",
++    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
++    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
++    "definitions": {
++        "ApplyOptions": {
++            "additionalProperties": false,
++            "description": "An indication by boolean value whether to update firmware configuration along with firmware image update.",
++            "patternProperties": {
++                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
++                    "description": "This property shall specify a valid odata or Redfish property.",
++                    "type": [
++                        "array",
++                        "boolean",
++                        "integer",
++                        "number",
++                        "null",
++                        "object",
++                        "string"
++                    ]
++                }
++            },
++            "properties": {
++                "ClearConfig": {
++                    "description": "This indicates whether to update firmware configuration or not.",
++                    "longDescription": "The value of this property is used to indicate the firmware configuration update.",
++                    "readonly": false,
++                    "type": [
++                        "boolean",
++                        "null"
++                    ]
++                }
++            },
++            "type": "object"
++        },
++        "Oem": {
++            "additionalProperties": true,
++            "description": "OemUpdateService Oem properties.",
++            "patternProperties": {
++                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
++                    "description": "This property shall specify a valid odata or Redfish property.",
++                    "type": [
++                        "array",
++                        "boolean",
++                        "integer",
++                        "number",
++                        "null",
++                        "object",
++                        "string"
++                    ]
++                }
++            },
++            "properties": {
++                "ApplyOptions": {
++                    "anyOf": [
++                        {
++                            "$ref": "#/definitions/ApplyOptions"
++                        },
++                        {
++                            "type": "null"
++                        }
++                    ]
++                }
++            },
++            "type": "object"
++        }
++    },
++    "title": "#OemUpdateService"
++}
+diff --git a/static/redfish/v1/schema/OemUpdateService_v1.xml b/static/redfish/v1/schema/OemUpdateService_v1.xml
+new file mode 100644
+index 0000000..cbb7aa4
+--- /dev/null
++++ b/static/redfish/v1/schema/OemUpdateService_v1.xml
+@@ -0,0 +1,40 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
++    <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
++        <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData" />
++    </edmx:Reference>
++    <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
++        <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
++        <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
++    </edmx:Reference>
++    <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/UpdateService_v1.xml">
++        <edmx:Include Namespace="UpdateService"/>
++        <edmx:Include Namespace="UpdateService.v1_4_0"/>
++    </edmx:Reference>
++    <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
++        <edmx:Include Namespace="Resource"/>
++        <edmx:Include Namespace="Resource.v1_0_0"/>
++    </edmx:Reference>
++
++    <edmx:DataServices>
++        <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemUpdateService">
++            <ComplexType Name="Oem" BaseType="Resource.OemObject">
++                <Annotation Term="OData.AdditionalProperties" Bool="true" />
++                <Annotation Term="OData.Description" String="OemUpdateService Oem properties." />
++                <Annotation Term="OData.AutoExpand"/>
++                <Property Name="ApplyOptions" Type="OemUpdateService.ApplyOptions"/>
++            </ComplexType>
++
++            <ComplexType Name="ApplyOptions" BaseType="Resource.OemObject">
++                <Annotation Term="OData.AdditionalProperties" Bool="false" />
++                <Annotation Term="OData.Description" String="An indication by boolean value whether to update firmware configuration along with firmware image update." />
++                <Property Name="ClearConfig" Type="Edm.Boolean">
++                    <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
++                    <Annotation Term="OData.Description" String="This indicates whether to update firmware configuration or not."/>
++                    <Annotation Term="OData.LongDescription" String="The value of this property is used to indicate the firmware configuration update."/>
++                </Property>
++            </ComplexType>
++
++        </Schema>
++    </edmx:DataServices>
++</edmx:Edmx>
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 9824210cd..a1ce5f99b 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,6 +1,6 @@
 # todo(james) remove nobranch
 SRC_URI = "git://github.com/openbmc/bmcweb.git"
-SRCREV = "7d1cc387d312e2a8e4844f9d69ab39b042acd5ce"
+SRCREV = "dc3fbbd0b0021ae888a97bf48a62f30129fc3f4d"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -12,6 +12,8 @@ GROUPADD_PARAM_${PN} = "web; redfish "
 
 SRC_URI += "file://0001-Firmware-update-support-for-StandBySpare.patch \
             file://0002-Use-chip-id-based-UUID-for-Service-Root.patch \
+            file://0003-Temporarily-disable-EventService-log-support.patch \
+            file://0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch \
 "
 
 # Enable PFR support
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 6f27959a2..98420b2ef 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,9 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 PROJECT_SRC_DIR := "${THISDIR}/${PN}"
 
-# latest upstream HEAD until meta-phosphor autobumps
-SRCREV = "6ba8d31525130dbb5ef5b60336993ef7b50a8f51"
-
 SRC_URI += "file://phosphor-ipmi-host.service \
             file://0010-fix-get-system-GUID-ipmi-command.patch \
             file://0053-Fix-keep-looping-issue-when-entering-OS.patch \
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb
index 2ffa151f4..5607ab823 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "libmctp_intel"
 DESCRIPTION = "Implementation of MCTP(DMTF DSP0236)"
 
 SRC_URI = "git://github.com/Intel-BMC/libmctp.git;protocol=ssh"
-SRCREV = "1f22461796e1f95a9b0d32f95cb8e871aab820c7"
+SRCREV = "8cf0d4e76516511ec77bda9e3a1ad1e75f801cdd"
 
 S = "${WORKDIR}/git/"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb
index 3b048b4fd..ae11b299a 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab"
 
 SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh"
-SRCREV = "5cecf9c8b1ab2ff819221f002b67010a6260c9a3"
+SRCREV = "31c8b7aa2bf24060fee2954ae1891c3418a3ae46"
 
 S = "${WORKDIR}/git/mctp_emulator/"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb
index 6335440a2..764b65c36 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh"
-SRCREV = "5cecf9c8b1ab2ff819221f002b67010a6260c9a3"
+SRCREV = "31c8b7aa2bf24060fee2954ae1891c3418a3ae46"
 
 S = "${WORKDIR}/git/mctpd/"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb
index f655d22e4..9581619ca 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 inherit cmake
 inherit obmc-phosphor-dbus-service
 inherit obmc-phosphor-systemd
-inherit pkgconfig pythonnative
+inherit pkgconfig
 
 SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.selftest.service"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index c78b00bc1..ab36babb3 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1,4 +1,4 @@
-SRCREV = "3840d0ad45134597455f6d70fe1ae76f3cac0e7d"
+SRCREV = "54ffb271b995db4f0b00f0661baab23763fae5bd"
 #SRC_URI = "git://github.com/openbmc/dbus-sensors.git"
 
 DEPENDS_append = " libgpiod libmctp"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/service-config-manager/service-config-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/service-config-manager/service-config-manager_%.bbappend
new file mode 100644
index 000000000..3b4b25021
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/service-config-manager/service-config-manager_%.bbappend
@@ -0,0 +1,3 @@
+# Enable downstream autobump
+SRC_URI = "git://github.com/openbmc/service-config-manager"
+SRCREV = "ee853eb2d865c7da9eec99cdcac04f8aee750e49"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb
deleted file mode 100644
index b1ac1fbc1..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Service configuration manager daemon to control service properties"
-DESCRIPTION = "Daemon controls service properies like port, channels, state etc.."
-
-PV = "1.0+git${SRCPV}"
-
-S = "${WORKDIR}/git/srvcfg-manager"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh"
-SRCREV = "bee56d62b209088454d166d1efae4825a2b175df"
-
-inherit cmake systemd
-SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service"
-
-DEPENDS += " \
-    systemd \
-    sdbusplus \
-    sdbusplus-native \
-    phosphor-logging \
-    boost \
-    "
-RDEPENDS_${PN} += " \
-    libsystemd \
-    sdbusplus \
-    phosphor-logging \
-    "
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend
index 162f5210c..5733eceed 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRCREV = "3ab6cc280e71c1fffe53a4f3f14ea683f0e2e87e"
+SRCREV = "73ce773e2f94fcfdeeeb9db83a3e92429ab4a663"
 
 EXTRA_OECONF += "${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], '', '--disable-root_user_mgmt', d)}"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/frb2-watchdog.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/frb2-watchdog.bb
index ebd795e83..2ffb40431 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/frb2-watchdog.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/frb2-watchdog.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe
 S = "${WORKDIR}"
 
 inherit cmake
-inherit pkgconfig pythonnative
+inherit pkgconfig
 
 DEPENDS += " \
             systemd \
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
index be02d5fd9..217eb9ef9 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
@@ -1,4 +1,4 @@
 SRC_URI = "git://github.com/Intel-BMC/phosphor-webui;protocol=ssh;branch=intel2"
 FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:"
 
-SRCREV = "34a4a702870e33a5612d2c4a84385eae2edbf477"
+SRCREV = "190f423c191f1f292d24b55f1310eadd565e5ee9"
diff --git a/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend
new file mode 100644
index 000000000..ed9dd31e8
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PV = "3.6.14"
+
+SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
+SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \
+          "
+SRC_URI[md5sum] = "bf70632d420e421baff482247f01dbfe"
+#SRC_URI[sha256sum] =  "3847a3354dd908c5e603f490865ae10577d7ee3b5edf35e82d1ed8cfa1cf0191"
+SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
+
+
diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb
index 207a8ede3..b97dea75c 100644
--- a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "curl xz e2fsprogs zlib"
 
-inherit pkgconfig python3native perlnative pythonnative autotools
+inherit pkgconfig python3native perlnative autotools
 inherit autotools-brokensep
 
 # Specify any options you want to pass to the configure script using EXTRA_OECONF:
diff --git a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch
new file mode 100644
index 000000000..61d3105b2
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch
@@ -0,0 +1,32 @@
+From 9617412472669eef5d3ed66c05468646d8e8a951 Mon Sep 17 00:00:00 2001
+From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
+Date: Thu, 11 Jun 2020 13:00:15 -0700
+Subject: [PATCH] Extend VR Watchdog timeout
+
+The VR watchdog reset is causing issues on platforms such as
+Cooper City that take longer to assert CPU Power Good.  This
+extends the timeout to 15s to hold off the reset for Cooper
+City.
+
+Change-Id: I9658b4ead6d9bf8eaa30e4aeb9f1d56c2f2187d3
+Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+---
+ power-control-x86/src/power_control.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/power-control-x86/src/power_control.cpp b/power-control-x86/src/power_control.cpp
+index b891c8c..b6ee6f1 100644
+--- a/power-control-x86/src/power_control.cpp
++++ b/power-control-x86/src/power_control.cpp
+@@ -53,7 +53,7 @@ const static constexpr int powerPulseTimeMs = 200;
+ const static constexpr int forceOffPulseTimeMs = 15000;
+ const static constexpr int resetPulseTimeMs = 500;
+ const static constexpr int powerCycleTimeMs = 5000;
+-const static constexpr int sioPowerGoodWatchdogTimeMs = 1000;
++const static constexpr int sioPowerGoodWatchdogTimeMs = 12000;
+ const static constexpr int psPowerOKWatchdogTimeMs = 8000;
+ const static constexpr int gracefulPowerOffTimeMs = 60000;
+ const static constexpr int warmResetCheckTimeMs = 500;
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend
index 600f9e25f..b107c8873 100755
--- a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -1,3 +1,5 @@
-# Enable downstream autobump
-SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh"
-SRCREV = "35aa665e01cf9d735ba4aeb3818a60caab376692"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+        file://0001-Extend-VR-Watchdog-timeout.patch \
+        "
diff --git a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample
index d0d291a92..3fe594301 100644
--- a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample
+++ b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample
@@ -1,10 +1,13 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "11"
+LCONF_VERSION = "12"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 
+# meta-intel has a config file that needs to be overridden
+BBMASK = "/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb"
+
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
diff --git a/meta-openbmc-mods/meta-wht/conf/layer.conf b/meta-openbmc-mods/meta-wht/conf/layer.conf
index 3c2354e62..6b2661f3a 100644
--- a/meta-openbmc-mods/meta-wht/conf/layer.conf
+++ b/meta-openbmc-mods/meta-wht/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "wht"
 BBFILE_PATTERN_wht = ""
 BBFILE_PRIORITY_wht = "7"
-LAYERSERIES_COMPAT_wht = "warrior zeus"
+LAYERSERIES_COMPAT_wht = "zeus dunfell"
 
 PRODUCT_GENERATION = "wht"
diff --git a/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
new file mode 100644
index 000000000..ff570c63c
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
@@ -0,0 +1,22 @@
+{
+  "channels": [
+    {
+      "type": "me",
+      "slave-path": "/dev/ipmb-5",
+      "bmc-addr": 32,
+      "remote-addr": 44
+    },
+    {
+      "type": "ipmb",
+      "slave-path": "/dev/ipmb-0",
+      "bmc-addr": 32,
+      "remote-addr": 88
+    },
+    {
+      "type": "slot-ipmb",
+      "slave-path": "/dev/ipmb-6",
+      "bmc-addr": 18,
+      "remote-addr": 176
+    }
+  ]
+}
diff --git a/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
new file mode 100644
index 000000000..03c685d1d
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " file://ipmb-channels.json"
+
+do_install_append(){
+    install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
+                   ${D}/usr/share/ipmbbridge/
+}
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
index 27d0d5fa4..493fdde0b 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
+++ b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "11"
+LCONF_VERSION = "12"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
index acfeed4e2..1f59559ed 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
+++ b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "wolfpass"
 BBFILE_PATTERN_wolfpass = ""
 BBFILE_PRIORITY_wolfpass = "7"
-LAYERSERIES_COMPAT_wolfpass = "warrior zeus"
+LAYERSERIES_COMPAT_wolfpass = "zeus dunfell"
 
 PRODUCT_GENERATION = "prl"
author	Jason M. Bills <jason.m.bills@linux.intel.com>	2020-07-10 01:11:22 +0300
committer	Jason M. Bills <jason.m.bills@linux.intel.com>	2020-07-10 20:11:31 +0300
commit	d071adf43ac87f21dde2f84287120960c723962c (patch)
tree	05a1d365e0faa6ce8570b2d0c2d0f100dc8df1d4
parent	f24c1e9afc47a421831278b57377951e71494d92 (diff)
download	openbmc-d071adf43ac87f21dde2f84287120960c723962c.tar.xz