Update to internal 6-6-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>
author: Ed Tanous <ed.tanous@intel.com> 2019-06-06 19:43:20 +0300
committer: Ed Tanous <ed.tanous@intel.com> 2019-06-07 00:20:52 +0300
commit: 10bc2ef852277cf8e9858f75cea9f55b482bf85b (patch)
tree: 6d29c0a7edc3769c9fbba0a3c6f6ed9ba10ba8ed /meta-openbmc-mods
parent: 9087065ce8c9f13d6450293c15101a3db5fe6f49 (diff)
download: openbmc-10bc2ef852277cf8e9858f75cea9f55b482bf85b.tar.xz
129 files changed, 838 insertions, 1257 deletions
diff --git a/meta-openbmc-mods/conf/machine/include/intel.inc b/meta-openbmc-mods/conf/machine/include/intel.inc
index 9fedc33e7..236ccb768 100644
--- a/meta-openbmc-mods/conf/machine/include/intel.inc
+++ b/meta-openbmc-mods/conf/machine/include/intel.inc
@@ -11,6 +11,8 @@ OBMC_MACHINE_FEATURES += "\
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
 VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager"
 VIRTUAL-RUNTIME_obmc-led-monitor = ""
+VIRTUAL-RUNTIME_obmc-host-state-manager = "intel-chassis-control"
+VIRTUAL-RUNTIME_obmc-chassis-state-manager = "intel-chassis-control"
 
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps"
diff --git a/meta-openbmc-mods/meta-ast2500/conf/layer.conf b/meta-openbmc-mods/meta-ast2500/conf/layer.conf
new file mode 100644
index 000000000..99ca15d28
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/conf/layer.conf
@@ -0,0 +1,21 @@
+LOCALCONF_VERSION = "3"
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "ast2500"
+BBFILE_PATTERN_ast2500 = ""
+BBFILE_PRIORITY_ast2500 = "6"
+LAYERSERIES_COMPAT_ast2500 = "warrior"
+
+INHERIT += "extrausers"
+#INHERIT += " cve-check"
+
+EXTRA_USERS_PARAMS_append_pn-intel-platforms = " \
+  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
+  "
+
+hostname_pn-base-files = "intel-obmc"
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc
index cc9e30495..cc9e30495 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf
+++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc
index 24ec3113b..24ec3113b 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc
+++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
index 5f8e0fd5c..978489110 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
@@ -1,4 +1,4 @@
-From 429f3710a88d81d6875aec7a848dde96074ee8df Mon Sep 17 00:00:00 2001
+From fbbad6c3a18ec7f1e9d95c09e44e765de303329c Mon Sep 17 00:00:00 2001
 From: Yuan Li <yuan.li@linux.intel.com>
 Date: Tue, 19 Sep 2017 15:55:39 +0800
 Subject: [PATCH] arm: dts: add DTS for Intel platforms
@@ -17,7 +17,7 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 new file mode 100644
-index 0000000..20067f5
+index 0000000..421699c
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 @@ -0,0 +1,388 @@
@@ -158,16 +158,16 @@ index 0000000..20067f5
 +	/*P0-P7*/	"","","","","","","","",
 +	/*Q0-Q7*/	"","","","","","","","",
 +	/*R0-R7*/	"","","","","","","","",
-+	/*S0-S7*/	"","","","","","","ID_BUTTON","",
++	/*S0-S7*/	"","","","","","","","",
 +	/*T0-T7*/	"","","","","","","","",
 +	/*U0-U7*/	"","","","","","","","",
 +	/*V0-V7*/	"","","","","","","","",
 +	/*W0-W7*/	"","","","","","","","",
 +	/*X0-X7*/	"","","","","","","","",
-+	/*Y0-Y7*/	"","","","","","","","",
-+	/*Z0-Z7*/	"","","","","","","","",
++	/*Y0-Y7*/	"SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","",
++	/*Z0-Z7*/	"","SIO_POWER_GOOD","","","","","","",
 +	/*AA0-AA7*/	"","","","","","","","POST_COMPLETE",
-+	/*AB0-AB7*/	"","","","PGOOD","","","","",
++	/*AB0-AB7*/	"","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","",
 +	/*AC0-AC7*/	"","","","","","","","";
 +};
 +
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch
index b05ad2502..b05ad2502 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch
index 1d26b9667..1d26b9667 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch
index dbb163d20..dbb163d20 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
index 03b4f4da4..03b4f4da4 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch
new file mode 100644
index 000000000..d3b850efe
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch
@@ -0,0 +1,80 @@
+From 2e834ae04eba975066f80102c6f4656da314ca1e Mon Sep 17 00:00:00 2001
+From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
+Date: Fri, 24 May 2019 12:42:59 -0700
+Subject: [PATCH] Allow monitoring of power control input GPIOs
+
+The pass-through input GPIOs cannot be monitored because when
+requested, pass-through is disabled which causes a change on the
+pass-through output.
+
+The SIO GPIOs cannot be monitored because when requested, the
+request is rejected based on the value of the ACPI strap.
+
+This change removes the register check condition from the pass-
+through and desired SIO GPIOs so they can be requsted and
+monitored from power control.
+
+Tested:
+For pass-through, I used gpioset to hold a request on the input
+GPIOs and confirmed that pass-through remained enabled.
+
+For SIO, I used gpioget to confirm that I can successfully request
+and read the GPIO value.
+
+Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+---
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+index beb0729..05d1081 100644
+--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
++++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+@@ -250,7 +250,7 @@ FUNC_GROUP_DECL(SD2, F19, E21, F20, D20, D21, E20, G18, C21);
+ 
+ #define B20 32
+ SIG_EXPR_LIST_DECL_SINGLE(NCTS3, NCTS3, SIG_DESC_SET(SCU80, 16));
+-SIG_EXPR_DECL(GPIE0IN, GPIE0, GPIE0_DESC);
++SIG_EXPR_DECL(GPIE0IN, GPIE0);
+ SIG_EXPR_DECL(GPIE0IN, GPIE, GPIE_DESC);
+ SIG_EXPR_LIST_DECL_DUAL(GPIE0IN, GPIE0, GPIE);
+ MS_PIN_DECL(B20, GPIOE0, NCTS3, GPIE0IN);
+@@ -270,7 +270,7 @@ FUNC_GROUP_DECL(GPIE0, B20, C20);
+ 
+ #define F18 34
+ SIG_EXPR_LIST_DECL_SINGLE(NDSR3, NDSR3, SIG_DESC_SET(SCU80, 18));
+-SIG_EXPR_DECL(GPIE2IN, GPIE2, GPIE2_DESC);
++SIG_EXPR_DECL(GPIE2IN, GPIE2);
+ SIG_EXPR_DECL(GPIE2IN, GPIE, GPIE_DESC);
+ SIG_EXPR_LIST_DECL_DUAL(GPIE2IN, GPIE2, GPIE);
+ MS_PIN_DECL(F18, GPIOE2, NDSR3, GPIE2IN);
+@@ -1349,7 +1349,7 @@ FUNC_GROUP_DECL(ADC15, H4);
+ 
+ #define R22 192
+ SIG_EXPR_DECL(SIOS3, SIOS3, SIG_DESC_SET(SCUA4, 8));
+-SIG_EXPR_DECL(SIOS3, ACPI, ACPI_DESC);
++SIG_EXPR_DECL(SIOS3, ACPI);
+ SIG_EXPR_LIST_DECL_DUAL(SIOS3, SIOS3, ACPI);
+ SIG_EXPR_LIST_DECL_SINGLE(DASHR22, DASHR22, SIG_DESC_SET(SCU94, 10));
+ MS_PIN_DECL(R22, GPIOY0, SIOS3, DASHR22);
+@@ -1357,7 +1357,7 @@ FUNC_GROUP_DECL(SIOS3, R22);
+ 
+ #define R21 193
+ SIG_EXPR_DECL(SIOS5, SIOS5, SIG_DESC_SET(SCUA4, 9));
+-SIG_EXPR_DECL(SIOS5, ACPI, ACPI_DESC);
++SIG_EXPR_DECL(SIOS5, ACPI);
+ SIG_EXPR_LIST_DECL_DUAL(SIOS5, SIOS5, ACPI);
+ SIG_EXPR_LIST_DECL_SINGLE(DASHR21, DASHR21, SIG_DESC_SET(SCU94, 10));
+ MS_PIN_DECL(R21, GPIOY1, SIOS5, DASHR21);
+@@ -1373,7 +1373,7 @@ FUNC_GROUP_DECL(SIOPWREQ, P22);
+ 
+ #define P21 195
+ SIG_EXPR_DECL(SIOONCTRL, SIOONCTRL, SIG_DESC_SET(SCUA4, 11));
+-SIG_EXPR_DECL(SIOONCTRL, ACPI, ACPI_DESC);
++SIG_EXPR_DECL(SIOONCTRL, ACPI);
+ SIG_EXPR_LIST_DECL_DUAL(SIOONCTRL, SIOONCTRL, ACPI);
+ SIG_EXPR_LIST_DECL_SINGLE(DASHP21, DASHP21, SIG_DESC_SET(SCU94, 11));
+ MS_PIN_DECL(P21, GPIOY3, SIOONCTRL, DASHP21);
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
index 480d4cc18..480d4cc18 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
index 782fc6532..0ba716442 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,8 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:"
-SRC_URI += "file://wolfpass.cfg \
+SRC_URI += "file://intel-ast2500.cfg \
             file://0001-arm-dts-add-DTS-for-Intel-platforms.patch \
             file://0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch \
             file://0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch \
             file://0004-Test-code-for-LPC-MBOX.patch \
+            file://0006-Allow-monitoring-of-power-control-input-GPIOs.patch \
             "
 SRC_URI += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}"
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
index 474dc0565..271881706 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
@@ -850,20 +850,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 215,
-            "Name": "Post complete",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 217,
-            "Name": "Nmi Button",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 218,
             "Name": "ID Button",
             "Polarity": "Low",
@@ -871,13 +857,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 219,
-            "Name": "Power Good",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 232,
             "Name": "CPU1 Present",
             "Polarity": "Low",
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json
index 22f8b1c6d..22f8b1c6d 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json
index 53edbfe87..53edbfe87 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json
index 7b86bfae0..7b86bfae0 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
index 6a1696432..75cd39719 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
@@ -585,33 +585,12 @@
         },
         {
             "Direction": "Input",
-            "Index": 215,
-            "Name": "Post complete",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 217,
-            "Name": "Nmi Button",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 218,
             "Name": "ID Button",
             "Polarity": "Low",
             "Type": "Gpio"
         },
         {
-            "Direction": "Input",
-            "Index": 219,
-            "Name": "Power Good",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Out",
             "Index": 232,
             "Name": "Post Complete led0",
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
index c88e50676..982dade40 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
@@ -34,37 +34,6 @@
             "Type": "ADC"
         },
         {
-            "Index": 4,
-            "Name": "P0V83_LAN_AUX",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 0.901
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 0.875
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 0.786
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.763
-                }
-            ],
-            "Type": "ADC"
-        },
-        {
             "Index": 3,
             "Name": "P105_PCH_AUX",
             "Thresholds": [
@@ -193,6 +162,7 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": 208,
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -678,6 +648,13 @@
             "Type": "FanRedundancy"
         },
         {
+            "Direction": "Out",
+            "Index": 208,
+            "Name": "Bridge P3VBAT",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
             "Direction": "Input",
             "Index": 40,
             "Name": "NMI Input",
@@ -707,33 +684,12 @@
         },
         {
             "Direction": "Input",
-            "Index": 215,
-            "Name": "Post Complete",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 217,
-            "Name": "Nmi Button",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 218,
             "Name": "ID Button",
             "Polarity": "Low",
             "Type": "Gpio"
         },
         {
-            "Direction": "Input",
-            "Index": 219,
-            "Name": "Power Good",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Name": "System Fan connector 1",
             "Pwm": 0,
             "Tachs": [
@@ -2026,7 +1982,8 @@
             "Address": "0x30",
             "Bus": 0,
             "CpuID": 1,
-            "Name": "Xeon CPU 1",
+            "Name": "CPU 1",
+            "PresenceGpio": 232,
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -2049,7 +2006,8 @@
             "Address": "0x31",
             "Bus": 0,
             "CpuID": 2,
-            "Name": "Xeon CPU 2",
+            "Name": "CPU 2",
+            "PresenceGpio": 242,
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -2079,4 +2037,4 @@
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
+}
+\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
index fc851f200..bdf6b7d9c 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
@@ -34,37 +34,6 @@
             "Type": "ADC"
         },
         {
-            "Index": 4,
-            "Name": "P0V83_LAN_AUX",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 0.901
-                },
-                {
-                    "Direction": "greater than",
-                    "Name": "upper non critical",
-                    "Severity": 0,
-                    "Value": 0.875
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower non critical",
-                    "Severity": 0,
-                    "Value": 0.786
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.763
-                }
-            ],
-            "Type": "ADC"
-        },
-        {
             "Index": 3,
             "Name": "P105_PCH_AUX",
             "Thresholds": [
@@ -193,6 +162,7 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": 208,
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -678,6 +648,13 @@
             "Type": "FanRedundancy"
         },
         {
+            "Direction": "Out",
+            "Index": 208,
+            "Name": "Bridge P3VBAT",
+            "Polarity": "Low",
+            "Type": "Gpio"
+        },
+        {
             "Direction": "Input",
             "Index": 40,
             "Name": "NMI Input",
@@ -700,33 +677,12 @@
         },
         {
             "Direction": "Input",
-            "Index": 215,
-            "Name": "Post Complete",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 217,
-            "Name": "Nmi Button",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 218,
             "Name": "ID Button",
             "Polarity": "Low",
             "Type": "Gpio"
         },
         {
-            "Direction": "Input",
-            "Index": 219,
-            "Name": "Power Good",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Name": "System Fan connector 1",
             "Pwm": 0,
             "Tachs": [
@@ -2019,7 +1975,8 @@
             "Address": "0x30",
             "Bus": 0,
             "CpuID": 1,
-            "Name": "Xeon CPU 1",
+            "Name": "CPU 1",
+            "PresenceGpio": 232,
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -2042,7 +1999,8 @@
             "Address": "0x31",
             "Bus": 0,
             "CpuID": 2,
-            "Name": "Xeon CPU 2",
+            "Name": "CPU 2",
+            "PresenceGpio": 242,
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -2072,4 +2030,4 @@
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
+}
+\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend
index b8b38ecff..b8b38ecff 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf
index 1d332e2a2..1d332e2a2 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service
index 7fb8f79d3..7fb8f79d3 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console@.service
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/sol-option-check.sh b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh
index ef32fcb9a..ef32fcb9a 100755
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/sol-option-check.sh
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend
index c2aad5e50..e808e4929 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_wolfpass := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_intel-ast2500 := "${THISDIR}/${PN}:"
 OBMC_CONSOLE_HOST_TTY = "ttyS2"
 SRC_URI += "file://sol-option-check.sh"
 
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb
index 9c10c5b3d..9c10c5b3d 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed.bb
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service
index 267fdee43..267fdee43 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py
index 70ba64799..70ba64799 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb
index af0505d1f..1ae1680e0 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru.bb
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb
@@ -11,7 +11,7 @@ SRC_URI = "file://checkFru.sh \
            file://*.fru.bin"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b"
+LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 RDEPENDS_${PN} = "bash"
 
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin
index ba5b96392..ba5b96392 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin
index afd58e6b9..afd58e6b9 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WC.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin
index 76c4b8d4b..76c4b8d4b 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WC.fru.bin
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin
index 1b9f97ff4..1b9f97ff4 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin
index fb219c0ce..fb219c0ce 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WP.fru.bin
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/SetBaseboardFru.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/SetBaseboardFru.service
index dec53725e..dec53725e 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/SetBaseboardFru.service
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/SetBaseboardFru.service
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/checkFru.sh b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh
index 1eb79b299..1eb79b299 100755
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/checkFru.sh
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/workbook/wolfpass-config.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb
index ead62f47e..c91053536 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/workbook/wolfpass-config.bb
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb
@@ -7,4 +7,4 @@ inherit config-in-skeleton
 LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 SRCREV = "946064239016e38cd1cc346047b1d26960c06cdb"
-SKELETON_URI = "git://git-amr-1.devtools.intel.com:29418/openbmc-skeleton.git;protocol=ssh;branch=intel"
+SKELETON_URI = "git://git@github.com/Intel-BMC/skeleton.git;protocol=ssh;branch=intel"
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes.txt b/meta-openbmc-mods/meta-ast2500/recipes.txt
index 3ec3f4a42..3ec3f4a42 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes.txt
+++ b/meta-openbmc-mods/meta-ast2500/recipes.txt
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 cff93d0ee..1520cb7b9 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
@@ -19,7 +19,6 @@ IMAGE_INSTALL_append = " \
         phosphor-host-postd \
         smbios-mdrv1 \
         phosphor-certificate-manager \
-        set-passthrough \
         phosphor-sel-logger \
         gpiodaemon \
         smbios-mdrv2 \
diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 6026f8d91..798e43295 100644
--- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_append_wolfpass:= "${THISDIR}/files:"
+FILESEXTRAPATHS_append_intel-ast2500:= "${THISDIR}/files:"
 
 # the meta-phosphor layer adds this patch, which conflicts
 # with the intel layout for environment
-SRC_URI_remove_wolfpass = " file://0001-configs-ast-Add-redundnant-env.patch"
+SRC_URI_remove_intel-ast2500 = " file://0001-configs-ast-Add-redundnant-env.patch"
 
-SRC_URI_append_wolfpass = " \
+SRC_URI_append_intel-ast2500 = " \
     file://0001-flash-use-readX-writeX-not-udelay.patch \
     file://0002-intel-layout-environment-addr.patch \
     file://0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch \
@@ -34,4 +34,10 @@ SRC_URI_append_wolfpass = " \
     file://0027-CPLD-u-boot-commands-support-for-PFR.patch \
     file://0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch \
     "
-SRC_URI_append_wolfpass += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0022-u-boot-env-change-for-PFR-image.patch', '', d)}"
+SRC_URI_append_intel-ast2500 += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0022-u-boot-env-change-for-PFR-image.patch', '', d)}"
+
+require recipes-core/os-release/version-vars.inc
+
+BUILD_CFLAGS_append =  " -DVER_MAJOR=${IPMI_MAJOR} -DVER_MINOR=${IPMI_MINOR}"
+BUILD_CFLAGS_append += " -DVER_AUX13=${IPMI_AUX13} -DVER_AUX14=${IPMI_AUX14}"
+BUILD_CFLAGS_append += " -DVER_AUX15=${IPMI_AUX15} -DVER_AUX16=${IPMI_AUX16}"
diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
index 6026f8d91..742334ade 100644..120000
--- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
@@ -1,37 +1 @@
-FILESEXTRAPATHS_append_wolfpass:= "${THISDIR}/files:"
-
-# the meta-phosphor layer adds this patch, which conflicts
-# with the intel layout for environment
-SRC_URI_remove_wolfpass = " file://0001-configs-ast-Add-redundnant-env.patch"
-
-SRC_URI_append_wolfpass = " \
-    file://0001-flash-use-readX-writeX-not-udelay.patch \
-    file://0002-intel-layout-environment-addr.patch \
-    file://0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch \
-    file://0005-enable-passthrough-in-uboot.patch \
-    file://0006-Add-Aspeed-g5-interrupt-support.patch \
-    file://0007-Add-espi-support.patch \
-    file://0008-add-sgio-support-for-port80-snoop-post-LEDs.patch \
-    file://0009-Add-basic-GPIO-support.patch \
-    file://0010-Update-Force-Firmware-Update-Jumper-to-use-new-gpio.patch \
-    file://0011-Add-basic-timer-support-for-Aspeed-g5-in-U-Boot.patch \
-    file://0012-Add-status-and-ID-LED-support.patch \
-    file://0013-aspeed-Add-Pwm-Driver.patch \
-    file://0014-Keep-interrupts-enabled-until-last-second.patch \
-    file://0015-Rewrite-memmove-to-optimize-on-word-transfers.patch \
-    file://0016-Add-support-for-128MB-Macronix-spi-flash-MX66L1G45G.patch \
-    file://0017-Enable-Macronix-and-Micron-SPI-support.patch \
-    file://0018-Add-support-for-Macronix-and-Micron-1Gbits-SPI-flash.patch \
-    file://0019-u-boot-full-platform-reset-espi-oob-ready.patch \
-    file://0020-Enable-PCIe-L1-support.patch \
-    file://0020-Add-system-reset-status-support.patch \
-    file://0021-Config-host-uart-clock-source-using-environment-vari.patch \
-    file://0022-KCS-driver-support-in-uBoot.patch \
-    file://0023-Add-TPM-enable-pulse-triggering.patch \
-    file://0024-IPMI-command-handler-implementation-in-uboot.patch \
-    file://0025-Manufacturing-mode-physical-presence-detection.patch \
-    file://0026-Aspeed-I2C-support-in-U-Boot.patch \
-    file://0027-CPLD-u-boot-commands-support-for-PFR.patch \
-    file://0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch \
-    "
-SRC_URI_append_wolfpass += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0022-u-boot-env-change-for-PFR-image.patch', '', d)}"
+u-boot-aspeed_%.bbappend
+\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
index fd71e0abf..fda0716c5 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb
@@ -12,9 +12,9 @@ DEPENDS = "sdbusplus openssl libpam"
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
-SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
 
-SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d"
+SRCREV = "0536b8cc3591a310ab36d145540811c728f8ef60"
 S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
index bbf4f0183..a1c53389d 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb
@@ -10,8 +10,8 @@ inherit cmake
 LICENSE = "CLOSED"
 LIC_FILES_CHKSUM = ""
 
-SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
-SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d"
+SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
+SRCREV = "0536b8cc3591a310ab36d145540811c728f8ef60"
 
 S = "${WORKDIR}/git/crashdump"
 PACKAGES += "libpeci"
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 01cc72e69..22568dba2 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
@@ -1,2 +1,2 @@
 SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git"
-SRCREV = "1f2eb5eac4a75a219ece15850a3c2dfc0fdc5991"
+SRCREV = "53870d7308e374df0c0382e3208ff1567a160947"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
index d4ad9c4e6..b5448060f 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Intel IPMI Providers"
 DESCRIPTION = "IPMI Provider Libraries"
 
-SRC_URI = "git://github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh"
 SRCREV = "3f8aa7959d2e8475e50743d32ff178257aafc1e7"
 
 S = "${WORKDIR}/git"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
index 584d3b645..059931ed2 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend
@@ -5,60 +5,9 @@
 # and pasting into another recipe ensure it is understood
 # what that means!
 
-def irun_git(d, oeroot, git_cmd, **kwargs):
-    err = None
-    try:
-        cmd = 'git --work-tree {} --git-dir {}/.git {}'.format(oeroot, oeroot, git_cmd)
-        ret, err = bb.process.run(cmd, **kwargs)
-        if err is not None:
-            ret += err
-    except bb.process.ExecutionError as e:
-        ret = ''
-        if e.stdout is not None:
-            ret += e.stdout
-        if e.stderr is not None:
-            ret += e.stderr
-    except Exception as e:
-        ret = str(e)
-    return ret.strip('\n')
+require version-vars.inc
 
-def repo_status(d, f, repo, tagargs):
-    import subprocess
-
-    cmd_list = [['HEAD', 'rev-parse HEAD'],
-                ['TAG', 'describe {} --dirty --long'.format(tagargs)],
-                ['STATUS', 'status -sb']]
-
-    f.write(('\n# REPOSITORY: {} '.format(os.path.basename(repo))).ljust(80, '+') + '\n')
-    for item in cmd_list:
-        f.write('# {}: '.format(item[0]))
-        sb = irun_git(d, repo, item[1])
-        if sb:
-            sb_lines = sb.split('\n')
-            if len(sb_lines) == 1:
-                f.write(sb_lines[0])
-            else:
-                f.write('\n# ' + '\n# '.join(sb_lines))
-        f.write('\n')
-
-python() {
-    corebase = d.getVar('COREBASE', True)
-    mibase = os.path.join(corebase, 'meta-openbmc-mods')
-    obmc_vers = irun_git(d, corebase, 'describe --dirty --long')
-    meta_vers = irun_git(d, mibase, 'rev-parse HEAD')[0:7]
-    version_id = '{}-{}'.format(obmc_vers, meta_vers)
-    if version_id:
-        d.setVar('VERSION_ID', version_id)
-        versionList = version_id.split('-')
-        version = '{}-{}'.format(versionList[0], versionList[1])
-        d.setVar('VERSION', version)
-
-    build_id = irun_git(d, corebase, 'describe --abbrev=0')
-    if build_id:
-        d.setVar('BUILD_ID', build_id)
-}
-
-OS_RELEASE_FIELDS_append = " BUILD_ID"
+OS_RELEASE_FIELDS_append = " OPENBMC_VERSION IPMI_MAJOR IPMI_MINOR IPMI_AUX13 IPMI_AUX14 IPMI_AUX15 IPMI_AUX16"
 
 python do_compile_append () {
     import glob
@@ -80,6 +29,7 @@ python do_compile_append () {
 
 # Ensure the git commands run every time bitbake is invoked.
 BB_DONT_CACHE = "1"
+do_compile[nostamp]="1"
 
 # Make os-release available to other recipes.
 SYSROOT_DIRS_append = " ${sysconfdir}"
diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
new file mode 100644
index 000000000..b6a2504a2
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc
@@ -0,0 +1,78 @@
+def irun_git(d, oeroot, git_cmd, **kwargs):
+    err = None
+    try:
+        cmd = 'git --work-tree {} --git-dir {}/.git {}'.format(oeroot, oeroot, git_cmd)
+        ret, err = bb.process.run(cmd, **kwargs)
+        if err is not None:
+            ret += err
+    except bb.process.ExecutionError as e:
+        ret = ''
+        if e.stdout is not None:
+            ret += e.stdout
+        if e.stderr is not None:
+            ret += e.stderr
+    except Exception as e:
+        ret = str(e)
+    return ret.strip('\n')
+
+def repo_status(d, f, repo, tagargs):
+    import subprocess
+
+    cmd_list = [['HEAD', 'rev-parse HEAD'],
+                ['TAG', 'describe {} --dirty --long'.format(tagargs)],
+                ['STATUS', 'status -sb']]
+
+    f.write(('\n# REPOSITORY: {} '.format(os.path.basename(repo))).ljust(80, '+') + '\n')
+    for item in cmd_list:
+        f.write('# {}: '.format(item[0]))
+        sb = irun_git(d, repo, item[1])
+        if sb:
+            sb_lines = sb.split('\n')
+            if len(sb_lines) == 1:
+                f.write(sb_lines[0])
+            else:
+                f.write('\n# ' + '\n# '.join(sb_lines))
+        f.write('\n')
+
+python() {
+    import re
+
+    gen = d.getVar('PRODUCT_GENERATION', True)
+    if gen is None:
+        gen = 'unknown'
+
+    corebase = d.getVar('COREBASE', True)
+    mibase = os.path.join(corebase, 'meta-openbmc-mods')
+    obmc_vers = irun_git(d, corebase, 'describe --dirty --long')
+    if obmc_vers is None:
+        raise bb.build.FuncFailed("Missing version tag for openbmc-openbmc")
+    d.setVar('OPENBMC_VERSION', obmc_vers)
+
+    obmc_hash = irun_git(d, corebase, 'rev-parse HEAD')
+    meta_vers = irun_git(d, mibase,
+                         'describe --long --abbrev=6 ' +
+                         '--match \'{}-[0-9]*\.[0-9]*\''.format(gen))
+
+    # Until tags in meta-openbmc-mods, interim measure keep builds working.
+    if meta_vers.startswith('fatal:'):
+        meta_vers = '{}-0.0-0'.format(gen)
+
+    meta_hash = irun_git(d, mibase, 'rev-parse HEAD')
+    version_id = '{}-{}'.format(meta_vers, obmc_hash[0:7])
+    if version_id:
+        d.setVar('VERSION_ID', version_id)
+        versionList = version_id.split('-')
+        versionList = re.split('-|\.', version_id)
+        version = '{}.{}-{}'.format(versionList[0], versionList[1], versionList[2])
+        d.setVar('VERSION', version)
+        d.setVar('IPMI_MAJOR', versionList[1])
+        d.setVar('IPMI_MINOR', versionList[2])
+        d.setVar('IPMI_AUX13', hex(int(versionList[3])))
+        d.setVar('IPMI_AUX14', '0x{}'.format(meta_hash[0:2]))
+        d.setVar('IPMI_AUX15', '0x{}'.format(meta_hash[2:4]))
+        d.setVar('IPMI_AUX16', '0x{}'.format(meta_hash[4:6]))
+
+    build_id = irun_git(d, mibase, 'describe --abbrev=0')
+    if build_id:
+        d.setVar('BUILD_ID', build_id)
+}
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 506484311..d66a14281 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
@@ -5,12 +5,12 @@ LICENSE = "CLOSED"
 LIC_FILES_CHKSUM = ""
 inherit cmake systemd
 
-SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh"
 
 DEPENDS = "boost sdbusplus crashdump"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d"
+SRCREV = "0536b8cc3591a310ab36d145540811c728f8ef60"
 
 S = "${WORKDIR}/git/peci_pcie"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb
index 3e88648b4..46a185cdf 100644
--- a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb
+++ b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "OpenBMC mtd-util"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b77c43ae4eaf67bd73fb6452b2f113a3"
 
-SRC_URI = "git://github.com/Intel-BMC/mtd-util;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/mtd-util;protocol=ssh"
 
 PV = "1.0+git${SRCPV}"
 SRCREV = "0414bd37ba324867c5c89fc91ab80714309f4c80"
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend
index 995f99cfd..b174f271e 100644
--- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend
@@ -1,4 +1,4 @@
 
 #SRC_URI += "git://github.com/openbmc/sdbusplus"
-SRCREV = "66ef099b5a77315bb531300dfcc81a53867cd5fa"
+SRCREV = "c14699f63e909ed6d8599e65503ee9c1e3a104d6"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb
index 61dfce853..4b11782e8 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb
@@ -1,14 +1,8 @@
 SUMMARY = "Chassis Power Control service for Intel based platform"
 DESCRIPTION = "Chassis Power Control service for Intel based platfrom"
 
-SRC_URI = "git://github.com/Intel-BMC/intel-chassis-control.git;protocol=ssh"
-SRCREV = "7cbb2153afedf3b7d3fa7856f0a306138c4b4297"
-
-SRC_URI += "file://intel-wait-power-on.sh \
-            file://intel-wait-power-off.sh \
-            file://intel-wait-host-on.sh \
-            file://intel-wait-host-off.sh \
-           "
+SRC_URI = "git://git@github.com/Intel-BMC/intel-chassis-control.git;protocol=ssh"
+SRCREV = "d98b80a3ce937abe6282b7b9011b47e8b2f162be"
 
 S = "${WORKDIR}/git/services/chassis/"
 
@@ -17,239 +11,19 @@ PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-inherit cmake pkgconfig pythonnative
-inherit obmc-phosphor-dbus-service
-
-DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service"
-DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Chassis@.service"
-DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Buttons@.service"
-
-# Force the standby target to run these services
-SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-
-POWER_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Power@.service"
-#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-POWER_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Power@{0}.service"
-POWER_FMT_CTRL = "../${POWER_TMPL_CTRL}:${SYSD_TGT}.wants/${POWER_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWER_FMT_CTRL', 'OBMC_HOST_INSTANCES')}"
-
-CHASSIS_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Chassis@.service"
-#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-CHASSIS_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Chassis@{0}.service"
-CHASSIS_FMT_CTRL = "../${CHASSIS_TMPL_CTRL}:${SYSD_TGT}.wants/${CHASSIS_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_FMT_CTRL', 'OBMC_HOST_INSTANCES')}"
-
-BUTTONS_TMPL_CTRL = "xyz.openbmc_project.Chassis.Buttons@.service"
-#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-BUTTONS_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Buttons@{0}.service"
-BUTTONS_FMT_CTRL = "../${BUTTONS_TMPL_CTRL}:${SYSD_TGT}.wants/${BUTTONS_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'BUTTONS_FMT_CTRL', 'OBMC_HOST_INSTANCES')}"
-
-SYSTEMD_SERVICE_${PN} += " \
-        obmc-host-start@.target \
-        obmc-host-startmin@.target \
-        obmc-host-stop@.target \
-        obmc-host-shutdown@.target \
-        obmc-host-reboot@.target \
-        obmc-chassis-poweroff@.target \
-        obmc-chassis-poweron@.target \
-        obmc-chassis-hard-poweroff@.target \
-        obmc-host-soft-reboot@.target \
-        obmc-host-warm-reset@.target \
-        obmc-chassis-powerreset@.target \
-        "
-
-RESET_TGTFMT = "obmc-chassis-powerreset@{0}.target"
-
-RESET_ON_TMPL = "op-reset-chassis-running@.service"
-RESET_ON_INSTFMT = "op-reset-chassis-running@{0}.service"
-RESET_ON_FMT = "../${RESET_ON_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${RESET_ON_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-RESET_ON_CHASSIS_TMPL = "op-reset-chassis-on@.service"
-RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service"
-RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${RESET_ON_CHASSIS_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-# Force the standby target to run the chassis reset check target
-RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target"
-SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
-RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target"
-RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-
-START_TMPL = "intel-power-start@.service"
-START_TGTFMT = "obmc-chassis-poweron@{0}.target"
-START_INSTFMT = "intel-power-start@{0}.service"
-START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${START_TMPL}"
-
-ON_TMPL = "intel-wait-power-on@.service"
-ON_TGTFMT = "obmc-chassis-poweron@{0}.target"
-ON_INSTFMT = "intel-wait-power-on@{0}.service"
-ON_FMT = "../${ON_TMPL}:${ON_TGTFMT}.requires/${ON_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${ON_TMPL}"
-
-OFF_TMPL = "intel-wait-power-off@.service"
-OFF_TGTFMT = "obmc-chassis-poweroff@{0}.target"
-OFF_INSTFMT = "intel-wait-power-off@{0}.service"
-OFF_FMT = "../${OFF_TMPL}:${OFF_TGTFMT}.requires/${OFF_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${OFF_TMPL}"
-
-STOP_TMPL = "intel-power-stop@.service"
-STOP_TGTFMT = "obmc-chassis-poweroff@{0}.target"
-STOP_INSTFMT = "intel-power-stop@{0}.service"
-STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${STOP_TMPL}"
-
-WARM_RESET_TMPL = "intel-power-warm-reset@.service"
-WARM_RESET_TGTFMT = "obmc-host-warm-reset@{0}.target"
-WARM_RESET_INSTFMT = "intel-power-warm-reset@{0}.service"
-WARM_RESET_FMT = "../${WARM_RESET_TMPL}:${WARM_RESET_TGTFMT}.requires/${WARM_RESET_INSTFMT}"
-WARM_RESET_LINK_FMT = "obmc-host-warm-reset@.target:${WARM_RESET_TGTFMT}"
-SYSTEMD_SERVICE_${PN} += "${WARM_RESET_TMPL}"
-
-# Build up requires relationship for START_TGTFMT and STOP_TGTFMT
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT',  'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_FMT',  'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'OFF_FMT',  'OBMC_CHASSIS_INSTANCES')}"
+inherit cmake systemd
 
-#The main control target requires these power targets
-START_TMPL_CTRL = "obmc-chassis-poweron@.target"
-START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target"
-START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target"
-START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-
-HOSTON_TMPL_CTRL = "intel-wait-host-on@.service"
-START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target"
-HOSTON_INSTFMT_CTRL = "intel-wait-host-on@{0}.service"
-HOSTON_FMT_CTRL = "../${HOSTON_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${HOSTON_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOSTON_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${HOSTON_TMPL_CTRL}"
-
-HOSTOFF_TMPL_CTRL = "intel-wait-host-off@.service"
-HOSTSTOP_TGTFMT_CTRL = "obmc-host-stop@{0}.target"
-HOSTOFF_INSTFMT_CTRL = "intel-wait-host-off@{0}.service"
-HOSTOFF_FMT_CTRL = "../${HOSTOFF_TMPL_CTRL}:${HOSTSTOP_TGTFMT_CTRL}.requires/${HOSTOFF_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOSTOFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${HOSTOFF_TMPL_CTRL}"
-
-# Chassis off requires host off
-STOP_TMPL_CTRL = "obmc-host-stop@.target"
-STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target"
-STOP_INSTFMT_CTRL = "obmc-host-stop@{0}.target"
-STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-
-# Hard power off requires chassis off
-HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target"
-HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target"
-HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target"
-HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-
-# Hard power off requires the forceoff flag service
-FORCE_OFF_TMPL_CTRL = "intel-power-forceoff@.service"
-HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target"
-FORCE_OFF_INSTFMT_CTRL = "intel-power-forceoff@{0}.service"
-FORCE_OFF_FMT_CTRL = "../${FORCE_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${FORCE_OFF_INSTFMT_CTRL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FORCE_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} += "${FORCE_OFF_TMPL_CTRL}"
-
-# Host soft reboot to run the shutdown target
-HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target"
-HOST_SOFT_REBOOT_TMPL = "obmc-host-soft-reboot@.target"
-HOST_SOFT_REBOOT_TGTFMT = "obmc-host-soft-reboot@{0}.target"
-HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target"
-HOST_SOFT_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}"
-# And also to call the host startmin service
-HOST_SOFT_REBOOT_SVC = "phosphor-reboot-host@.service"
-HOST_SOFT_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service"
-HOST_SOFT_REBOOT_SVC_FMT = "../${HOST_SOFT_REBOOT_SVC}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SOFT_REBOOT_SVC_INST}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}"
-
-#Broadcast Host state
-PRE_HOST_START_TMPL = "obmc-send-signal-pre-host-start@.service"
-PRE_HOST_START_TGTFMT = "obmc-host-start-pre@{0}.target"
-PRE_HOST_START_INSTFMT = "obmc-send-signal-pre-host-start@{0}.service"
-PRE_HOST_START_FMT = "../${PRE_HOST_START_TMPL}:${PRE_HOST_START_TGTFMT}.requires/${PRE_HOST_START_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${PRE_HOST_START_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}"
-
-POST_HOST_START_TMPL = "obmc-send-signal-post-host-start@.service"
-POST_HOST_START_TGTFMT = "obmc-host-started@{0}.target"
-POST_HOST_START_INSTFMT = "obmc-send-signal-post-host-start@{0}.service"
-POST_HOST_START_FMT = "../${POST_HOST_START_TMPL}:${POST_HOST_START_TGTFMT}.requires/${POST_HOST_START_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${POST_HOST_START_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}"
-
-HOST_STARTING_TMPL = "obmc-send-signal-host-starting@.service"
-HOST_STARTING_TGTFMT = "obmc-host-starting@{0}.target"
-HOST_STARTING_INSTFMT = "obmc-send-signal-host-starting@{0}.service"
-HOST_STARTING_FMT = "../${HOST_STARTING_TMPL}:${HOST_STARTING_TGTFMT}.requires/${HOST_STARTING_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${HOST_STARTING_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STARTING_FMT', 'OBMC_HOST_INSTANCES')}"
-
-PRE_HOST_STOP_TMPL = "obmc-send-signal-pre-host-stop@.service"
-PRE_HOST_STOP_TGTFMT = "obmc-host-stop-pre@{0}.target"
-PRE_HOST_STOP_INSTFMT = "obmc-send-signal-pre-host-stop@{0}.service"
-PRE_HOST_STOP_FMT = "../${PRE_HOST_STOP_TMPL}:${PRE_HOST_STOP_TGTFMT}.requires/${PRE_HOST_STOP_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${PRE_HOST_STOP_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}"
-
-POST_HOST_STOP_TMPL = "obmc-send-signal-post-host-stop@.service"
-POST_HOST_STOP_TGTFMT = "obmc-host-stopped@{0}.target"
-POST_HOST_STOP_INSTFMT = "obmc-send-signal-post-host-stop@{0}.service"
-POST_HOST_STOP_FMT = "../${POST_HOST_STOP_TMPL}:${POST_HOST_STOP_TGTFMT}.requires/${POST_HOST_STOP_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${POST_HOST_STOP_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}"
-
-HOST_STOPPING_TMPL = "obmc-send-signal-host-stopping@.service"
-HOST_STOPPING_TGTFMT = "obmc-host-stopping@{0}.target"
-HOST_STOPPING_INSTFMT = "obmc-send-signal-host-stopping@{0}.service"
-HOST_STOPPING_FMT = "../${HOST_STOPPING_TMPL}:${HOST_STOPPING_TGTFMT}.requires/${HOST_STOPPING_INSTFMT}"
-SYSTEMD_SERVICE_${PN} += "${HOST_STOPPING_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STOPPING_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service"
 
 DEPENDS += " \
-    autoconf-archive-native \
     boost \
     i2c-tools \
     libgpiod \
-    systemd \
-    sdbusplus \
-    sdbusplus-native \
-    phosphor-dbus-interfaces \
-    phosphor-dbus-interfaces-native \
-    phosphor-logging \
-    "
-RDEPENDS_${PN} += " \
-    libsystemd \
     sdbusplus \
-    phosphor-dbus-interfaces \
     phosphor-logging \
-    bash \
     "
 
-EXTRA_OECMAKE = " -DENABLE_GTEST=OFF -DCMAKE_SKIP_RPATH=ON"
-
 # linux-libc-headers guides this way to include custom uapi headers
 CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
 CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
-
-do_install_append() {
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/intel-wait-power-on.sh ${D}/${bindir}/intel-wait-power-on.sh
-    install -m 0755 ${WORKDIR}/intel-wait-power-off.sh ${D}/${bindir}/intel-wait-power-off.sh
-    install -m 0755 ${WORKDIR}/intel-wait-host-on.sh ${D}/${bindir}/intel-wait-host-on.sh
-    install -m 0755 ${WORKDIR}/intel-wait-host-off.sh ${D}/${bindir}/intel-wait-host-off.sh
-}
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service
deleted file mode 100644
index 54b9befa4..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Add force power offf flag for Power%i
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-host-start@%i.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "mkdir -p /run/openbmc && touch /run/openbmc/host@%i-request"
-SyslogIdentifier=intel-power-forceoff
-StartLimitInterval=0
-
-[Install]
-WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service
deleted file mode 100644
index 763c11546..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Start Power%i on
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \
-          /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 1"
-SyslogIdentifier=intel-power-start
-StartLimitInterval=0
-
-[Install]
-WantedBy=obmc-host-start@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service
deleted file mode 100644
index d0476e9b2..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Stop Power%i
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-host-start@%i.target
-ConditionPathExists=/run/openbmc/chassis@%i-on
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \
-          /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 0"
-SyslogIdentifier=intel-power-stop
-StartLimitInterval=0
-
-[Install]
-WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service
deleted file mode 100644
index 8d4897a25..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Power%i warm reset
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \
-          /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 2"
-SyslogIdentifier=intel-power-warm-reset
-
-[Install]
-WantedBy=obmc-host-warm-reset@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh
deleted file mode 100755
index 983f1bc8d..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-echo "wait for vrd_good = OFF"
-SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0)
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \
-        | sed 's/i\s*[0]/off/' | grep off | wc -l)
-
-while [ $PGOOD == 0 ]; do
-  echo "!OFF"
-sleep 1
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \
-        | sed 's/i\s*[0]/off/' | grep off | wc -l)
-done
-echo "vrd_good = OFF"
-\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service
deleted file mode 100644
index eedfcc78a..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Wait for Host%i to turn off
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-#After=obmc-chassis-poweroff@%i.target
-Before=intel-wait-power-off@%i.service
-After=intel-power-stop@%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-ConditionPathExists=/run/openbmc/host@%i-on
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/intel-wait-host-off.sh
-ExecStartPost=/bin/sh -c "rm -rf /run/openbmc/host@%i-on"
-
-SyslogIdentifier=intel-wait-host-off
-TimeoutSec=30
-
-[Install]
-RequiredBy=obmc-host-stop@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh
deleted file mode 100755
index 74f6bd47b..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-echo "wait for vrd_good = ON"
-SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0)
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \
-        | sed 's/i\s*[1]/on/' | grep on | wc -l)
-
-while [ $PGOOD == 0 ]; do
-  echo "!ON"
-sleep 1
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \
-        | sed 's/i\s*[1]/on/' | grep on | wc -l)
-done
-echo "vrd_good = ON"
-\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service
deleted file mode 100644
index a1fc316c2..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Wait for Host%i to turn on
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=intel-wait-power-on@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/host@%i-on
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/intel-wait-host-on.sh
-ExecStartPost=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/host@%i-on"
-
-SyslogIdentifier=intel-wait-host-on
-TimeoutSec=30
-
-[Install]
-RequiredBy=obmc-host-startmin@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh
deleted file mode 100755
index be58682cc..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-echo "wait for pgood = OFF"
-SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0)
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \
-        | sed 's/i\s*[0]/off/' | grep off | wc -l)
-
-while [ $PGOOD == 0 ]; do
-  echo "!OFF"
-sleep 1
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \
-        | sed 's/i\s*[0]/off/' | grep off | wc -l)
-done
-echo "pgood = OFF"
-\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service
deleted file mode 100644
index 0dcc897ce..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Wait for Power%i to turn off
-Before=obmc-power-off@%i.target
-Wants=obmc-power-stop@%i.target
-Before=obmc-power-stop@%i.target
-Wants=obmc-power-stop-pre@%i.target
-After=obmc-power-stop-pre@%i.target
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=intel-wait-host-off@%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/intel-wait-power-off.sh
-ExecStartPost=/bin/rm -f /run/openbmc/chassis@%i-on
-ExecStartPost=/bin/rm -f /run/openbmc/host@%i-request
-SyslogIdentifier=intel-wait-power-off
-TimeoutSec=15
-
-[Install]
-WantedBy=obmc-host-stop@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh
deleted file mode 100755
index 970e5a420..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-echo "wait for pgood = ON"
-SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0)
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \
-        | sed 's/i\s*[1]/on/' | grep on | wc -l)
-
-while [ $PGOOD == 0 ]; do
-  echo "!ON"
-sleep 1
-PGOOD=$(busctl get-property $SERVICE \
-        /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \
-        | sed 's/i\s*[1]/on/' | grep on | wc -l)
-done
-echo "pgood = ON"
-\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service
deleted file mode 100644
index 140ee5b8d..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Wait for Power%i to turn on
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=intel-power-start@%i.service
-Before=intel-wait-host-on@%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/intel-wait-power-on.sh
-
-ExecStartPost=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on"
-
-SyslogIdentifier=intel-wait-power-on
-TimeoutSec=15
-
-[Install]
-WantedBy=obmc-host-start@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target
deleted file mode 100644
index 265a48982..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Chassis%i (Hard Power Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-reset@%i.target
-Conflicts=obmc-host-shutdown@%i.target
-RefuseManualStop=yes
-
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target
deleted file mode 100644
index 34580a21f..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Chassis%i (Power Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-reset@%i.target
-RefuseManualStop=yes
-
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target
deleted file mode 100644
index e95e46353..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Power On)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-OnFailureJobMode=flush
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target
deleted file mode 100644
index 8d7c47e6b..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Chassis%i (Reset Check)
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target
deleted file mode 100644
index c860889e3..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Reboot Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target
deleted file mode 100644
index 585886b26..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Power%i Host Off
-Wants=multi-user.target
-RefuseManualStop=yes
-OnFailureJobMode=flush
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target
deleted file mode 100644
index c35c3e1ae..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Soft Reboot Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target
deleted file mode 100644
index 2f8c24929..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Start Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailureJobMode=flush
-\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target
deleted file mode 100644
index 69056254a..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Start Host%i Minimum
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target
deleted file mode 100644
index 625eda8ee..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Stop Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailureJobMode=flush
-\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target
deleted file mode 100644
index 8fc9358e2..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Warm reset Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailureJobMode=flush
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service
deleted file mode 100644
index 4e84c8783..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcast host starting signal to dbus
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.HostStarting"
-SyslogIdentifier=hoststartingsignal
-
-[Install]
-WantedBy=obmc-host-starting@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service
deleted file mode 100644
index 0f89f94a8..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcast host stopping signal to dbus
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.HostStoping"
-SyslogIdentifier=hoststoppingsignal
-
-[Install]
-WantedBy=obmc-host-stopping@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service
deleted file mode 100644
index f7e0a3bde..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcast post host start signal to dbus
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PostHostStart"
-SyslogIdentifier=posthoststartsignal
-
-[Install]
-WantedBy=obmc-host-started@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service
deleted file mode 100644
index 90007dbf2..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcast post host stop signal to dbus
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PostHostStop"
-SyslogIdentifier=posthoststopsignal
-
-[Install]
-WantedBy=obmc-host-stopped@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service
deleted file mode 100644
index a57423e2c..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcast pre host start signal to dbus
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PreHostStart"
-SyslogIdentifier=prehoststartsignal
-
-[Install]
-WantedBy=obmc-host-start-pre@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service
deleted file mode 100644
index ec6f453cd..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Broadcast pre host stop signal to dbus
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PreHostStop"
-SyslogIdentifier=prehoststopsignal
-
-[Install]
-WantedBy=obmc-host-stop-pre@%i.target
-
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service
deleted file mode 100644
index d3ea71639..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Start chassis%i on after BMC reset
-Requires=op-reset-chassis-running@%i.service
-After=op-reset-chassis-running@%i.service
-After=obmc-power-reset-on@%i.target
-Requires=obmc-power-reset-on@%i.target
-ConditionPathExists=/run/openbmc/chassis@%i-on
-
-[Service]
-RemainAfterExit=no
-ExecStart=/bin/systemctl start obmc-host-start@%i.target
-
-
-[Install]
-WantedBy=obmc-chassis-powerreset@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service
deleted file mode 100644
index 3280d0a40..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Check Chassis%i pgood and create a file to indicate it
-Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service
-Wants=obmc-power-reset-on@%i.target
-Before=obmc-power-reset-on@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-
-[Service]
-RemainAfterExit=no
-Type=oneshot
-ExecStart=/bin/sh -c "if [ $(busctl get-property `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power pgood | sed 's/i\s*[1]/on/' | grep on | wc -l) != 0 ]; then mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on; fi"
-
-[Install]
-WantedBy=obmc-chassis-powerreset@%i.target
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service
deleted file mode 100644
index e1e3baedf..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Intel Buttons%i
-
-[Service]
-Restart=always
-RestartSec=3
-ExecStart=/usr/bin/env buttons
-SyslogIdentifier=buttons
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
-
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service
deleted file mode 100644
index 521cb17b4..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Intel Chassis%i Control
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env chassis-control
-SyslogIdentifier=chassis-control
-Type=dbus
-BusName={BUSNAME}
-Nice=19
-TimeoutStartSec=180s
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
-
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service
deleted file mode 100644
index bf83a54e2..000000000
--- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-
-[Unit]
-Description=Intel Power Control%i
-Wants=mapper-wait@-xyz-openbmc_project-control-gpio-Power_Good.service
-After=mapper-wait@-xyz-openbmc_project-control-gpio-Power_Good.service
-
-[Service]
-Restart=always
-RestartSec=3
-ExecStart=/usr/bin/env power-control
-SyslogIdentifier=power-control
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
-
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
index fdaf60b41..923133be7 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
@@ -27,7 +27,6 @@ RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
 SUMMARY_${PN}-chassis = "Intel Chassis"
 RDEPENDS_${PN}-chassis = " \
         intel-chassis-control \
-        libgpiod \
         obmc-host-failure-reboots \
         "
 
diff --git a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
index b352295ba..c71e84bdc 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,2 +1,3 @@
 # this is for image signing and signature verification
 RDEPENDS_${PN}-extras += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', ' phosphor-image-signing', '', d)}"
+RDEPENDS_${PN}-extrasdevtools = "libgpiod-tools"
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 3abbb16fb..64645da2b 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
@@ -1,8 +1,8 @@
 SUMMARY = "SMBIOS MDR version 1 service for Intel based platform"
 DESCRIPTION = "SMBIOS MDR version 1 service for Intel based platfrom"
 
-SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh"
-SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd"
+SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh"
+SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391"
 
 S = "${WORKDIR}/git/services/smbios/"
 
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 1a39c0017..175d5edf9 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
@@ -1,8 +1,8 @@
 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/provingground.git;protocol=ssh"
-SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd"
+SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh"
+SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391"
 
 S = "${WORKDIR}/git/services/smbios-mdrv2/"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch
index e4161961e..41bf4fb55 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch
@@ -1,19 +1,19 @@
-From aa8f405609038693481bad4393d58f0c665569a6 Mon Sep 17 00:00:00 2001
+From 28aa61a720d2db812d66b2b59681ba184771ff3e Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
 Date: Tue, 21 May 2019 16:00:28 -0700
-Subject: [PATCH 1/4] media: aspeed: remove source buffer allocation before
- mode detection
+Subject: [PATCH] media: aspeed: remove source buffer allocation before mode
+ detection
 
 Mode detection doesn't require source buffer allocation so this
 commit removes that.
 
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
 ---
- drivers/media/platform/aspeed-video.c | 21 ---------------------
- 1 file changed, 21 deletions(-)
+ drivers/media/platform/aspeed-video.c | 37 +++++------------------------------
+ 1 file changed, 5 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
-index 1bb863b32836..ee1f87a08c7c 100644
+index 1bb863b32836..fed51fd22ce2 100644
 --- a/drivers/media/platform/aspeed-video.c
 +++ b/drivers/media/platform/aspeed-video.c
 @@ -733,27 +733,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
@@ -44,6 +44,32 @@ index 1bb863b32836..ee1f87a08c7c 100644
  	do {
  		if (tries) {
  			set_current_state(TASK_INTERRUPTIBLE);
+@@ -873,20 +852,14 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
+ 
+ 	size *= 4;
+ 
+-	if (size == video->srcs[0].size / 2) {
+-		aspeed_video_write(video, VE_SRC1_ADDR,
+-				   video->srcs[0].dma + size);
+-	} else if (size == video->srcs[0].size) {
+-		if (!aspeed_video_alloc_buf(video, &video->srcs[1], size))
+-			goto err_mem;
+-
+-		aspeed_video_write(video, VE_SRC1_ADDR, video->srcs[1].dma);
+-	} else {
+-		aspeed_video_free_buf(video, &video->srcs[0]);
++	if (size != video->srcs[0].size) {
++		if (video->srcs[0].size)
++			aspeed_video_free_buf(video, &video->srcs[0]);
++		if (video->srcs[1].size)
++			aspeed_video_free_buf(video, &video->srcs[1]);
+ 
+ 		if (!aspeed_video_alloc_buf(video, &video->srcs[0], size))
+ 			goto err_mem;
+-
+ 		if (!aspeed_video_alloc_buf(video, &video->srcs[1], size))
+ 			goto err_mem;
+ 
 -- 
-2.21.0
+2.7.4
 
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch
deleted file mode 100644
index 7739d5214..000000000
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 294391f66df034de8dc63ac2e78f3a00d14075d9 Mon Sep 17 00:00:00 2001
-From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
-Date: Thu, 23 May 2019 14:24:25 -0700
-Subject: [PATCH 3/4] media: aspeed: fix an incorrect timeout checking in mode
- detection
-
-There is an incorrect timeout checking in mode detection logic so
-it misses resolution detecting chances. This commit fixes the bug.
-
-Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
----
- drivers/media/platform/aspeed-video.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
-index b8540cc7848d..da20e93f58d3 100644
---- a/drivers/media/platform/aspeed-video.c
-+++ b/drivers/media/platform/aspeed-video.c
-@@ -737,7 +737,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
- 	do {
- 		if (tries) {
- 			set_current_state(TASK_INTERRUPTIBLE);
--			if (schedule_timeout(INVALID_RESOLUTION_DELAY))
-+			if (!schedule_timeout(INVALID_RESOLUTION_DELAY))
- 				return;
- 		}
- 
--- 
-2.21.0
-
diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch
index efa6f5023..a10963572 100644
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch
+++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch
@@ -1,7 +1,7 @@
-From 09ec380a1d6ae66b2a8124c8fdd984ff829b41d1 Mon Sep 17 00:00:00 2001
+From fa386f96691ed8501949daf5129667b72723a55e Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
 Date: Thu, 23 May 2019 14:33:03 -0700
-Subject: [PATCH 4/4] media: aspeed: add a workaround to fix a silicon bug
+Subject: [PATCH] media: aspeed: add a workaround to fix a silicon bug
 
 AST2500 silicon revision A1 and A2 have a silicon bug which causes
 extremly long capturing time on specific resolutions (1680 width).
@@ -12,14 +12,14 @@ result will be the same.
 
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
 ---
- drivers/media/platform/aspeed-video.c | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
+ drivers/media/platform/aspeed-video.c | 28 +++++++++++++++++++++-------
+ 1 file changed, 21 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
-index da20e93f58d3..c2d4a2e6f20f 100644
+index 67d6380d4ef3..f58f44eab588 100644
 --- a/drivers/media/platform/aspeed-video.c
 +++ b/drivers/media/platform/aspeed-video.c
-@@ -826,8 +826,27 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
+@@ -826,8 +826,29 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
  	struct v4l2_bt_timings *act = &video->active_timings;
  	unsigned int size = act->width * act->height;
  
@@ -29,9 +29,11 @@ index da20e93f58d3..c2d4a2e6f20f 100644
 +	if (video->active_timings.width == 1680) {
 +		/*
 +		 * This is a workaround to fix a silicon bug on A1 and A2
-+		 * revisions. Since it doesn't break capturing operation on A0
-+		 * revision, use it for all revisions without checking the
-+		 * revision ID.
++		 * revisions. Since it doesn't break capturing operation of
++		 * other revisions, use it for all revisions without checking
++		 * the revision ID. It picked 1728 which is a very next
++		 * 64-pixels aligned value to 1680 to minimize memory bandwidth
++		 * and to get better access speed from video engine.
 +		 */
 +		aspeed_video_write(video, VE_CAP_WINDOW,
 +				   1728 << 16 | act->height);
@@ -47,7 +49,7 @@ index da20e93f58d3..c2d4a2e6f20f 100644
  	/* Don't use direct mode below 1024 x 768 (irqs don't fire) */
  	if (size < DIRECT_FETCH_THRESHOLD) {
  		aspeed_video_write(video, VE_TGS_0,
-@@ -844,13 +863,6 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
+@@ -844,13 +865,6 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
  		aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_DIRECT_FETCH);
  	}
  
@@ -60,7 +62,7 @@ index da20e93f58d3..c2d4a2e6f20f 100644
 -
  	size *= 4;
  
- 	if (size == video->srcs[0].size / 2) {
+ 	if (size != video->srcs[0].size) {
 -- 
-2.21.0
+2.7.4
 
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 c5d48eb90..7ae4b5e64 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
@@ -43,6 +43,5 @@ SRC_URI += " \
         file://0058-i2c-aspeed-add-general-call-support.patch \
         file://0059-media-aspeed-remove-source-buffer-allocation-before-.patch \
         file://0060-media-aspeed-use-different-delays-for-triggering-VE-.patch \
-        file://0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch \
         file://0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch \
         "
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 77ef33c29..e773da3cd 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 = "24b01fdd5681726c71ddab73b2b9dfc89ee3de70"
+SRCREV = "683ff83b9cfe0ec3d9683f7220bd40ef77dbfe96"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch
new file mode 100644
index 000000000..181d12428
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch
@@ -0,0 +1,40 @@
+From b55c6847b18fdee5a72d601b871d73085481e4d9 Mon Sep 17 00:00:00 2001
+From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
+Date: Mon, 3 Jun 2019 16:31:29 -0700
+Subject: [PATCH] Add chassis power-cycle and reset to Chassis State
+
+This adds chassis PowerCycle and Reset as possible Transition
+values for the Chassis State. These are to support chassis
+power cycle and a chassis reset button, respectively.
+
+Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+---
+ xyz/openbmc_project/State/Chassis.interface.yaml | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/xyz/openbmc_project/State/Chassis.interface.yaml b/xyz/openbmc_project/State/Chassis.interface.yaml
+index 4ae6274..470a3a2 100644
+--- a/xyz/openbmc_project/State/Chassis.interface.yaml
++++ b/xyz/openbmc_project/State/Chassis.interface.yaml
+@@ -31,10 +31,17 @@ enumerations:
+       values:
+         - name: 'Off'
+           description: >
+-            Chassis  power should be off
++            Chassis power should be off
+         - name: 'On'
+           description: >
+             Chassis power should be on
++        - name: 'PowerCycle'
++          description: >
++            Chassis power should be cycled
++        - name: 'Reset'
++          description: >
++            Chassis should be reset
++
+ 
+     - name: PowerState
+       description: >
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch
new file mode 100644
index 000000000..650fd3bc9
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch
@@ -0,0 +1,31 @@
+From 9c94439a5a55efbb72bee10e9cfa0827dbedf511 Mon Sep 17 00:00:00 2001
+From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
+Date: Mon, 3 Jun 2019 16:35:46 -0700
+Subject: [PATCH] Add host interrupt to the Host State
+
+This adds host Interrupt as possible Transition value for the
+Host State. This is to support an interrupt signal to the host
+firmware or software.
+
+Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+---
+ xyz/openbmc_project/State/Host.interface.yaml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xyz/openbmc_project/State/Host.interface.yaml b/xyz/openbmc_project/State/Host.interface.yaml
+index 1ceba13..3d71280 100644
+--- a/xyz/openbmc_project/State/Host.interface.yaml
++++ b/xyz/openbmc_project/State/Host.interface.yaml
+@@ -28,6 +28,9 @@ enumerations:
+       description: >
+         The desired transition for host firmware
+       values:
++        - name: 'Interrupt'
++          description: >
++            Host firmware should be interrupted
+         - name: 'Off'
+           description: >
+             Host firmware should be off
+-- 
+2.7.4
+
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 8521f6839..94eff8ac7 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,5 @@
 SRC_URI =  "git://github.com/openbmc/phosphor-dbus-interfaces.git"
-SRCREV = "b8a82d92bb6e1727257d745189215b03016a39c6"
+SRCREV = "57b878d048f929643276f1bf7fdf750abc4bde8b"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -16,4 +16,6 @@ SRC_URI += "file://0002-Modify-Dbus-for-IPv6.patch \
             file://0018-Define-post-code-interfaces-for-post-code-manager.patch \
             file://0019-Creating-the-Session-interface-for-Host-and-LAN.patch \
             file://0021-Add-interface-suppot-for-provisioning-modes.patch \
+            file://0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch \
+            file://0023-Add-host-interrupt-to-the-Host-State.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 2706f8508..1ce94dca4 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 = "ded0ab5662212155e5d209343375e34ce9d34cdb"
+SRCREV = "98b704e179f12d987179fe6b0ea6234d1bace48f"
 
 FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb
index 588ae46b6..e24245525 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb
@@ -8,9 +8,9 @@ S = "${WORKDIR}/git/gpiodaemon"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh"
 
-SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd"
+SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391"
 
 inherit cmake systemd
 SYSTEMD_SERVICE_${PN} = "gpiodaemon.service"
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 62e332e2e..6ac05b61d 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,5 +1,5 @@
 SRC_URI = "git://github.com/openbmc/bmcweb.git"
-SRCREV = "22c33710fed78a5c47446ee91ececf8b8ab104db"
+SRCREV = "d62cec731dcb533b3fecb08ba115dbf713539681"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
index a7815a9a9..c2f3c9a0e 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
@@ -77,7 +77,7 @@
     }
   },
   "7" : {
-    "name" : "ipmi-kcs4",
+    "name" : "ipmi_kcs4",
     "is_valid" : true,
     "active_sessions" : 0,
     "channel_info" : {
@@ -165,7 +165,7 @@
     }
   },
   "15" : {
-    "name" : "ipmi-kcs3",
+    "name" : "ipmi_kcs3",
     "is_valid" : true,
     "active_sessions" : 0,
     "channel_info" : {
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch
deleted file mode 100644
index fb5dcee09..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 7b5c6a54c049a447b1fd3a42f9d63322dcee4dc7 Mon Sep 17 00:00:00 2001
-From: Yong Li <yong.b.li@linux.intel.com>
-Date: Sun, 16 Sep 2018 19:45:10 +0800
-Subject: [PATCH] [ipmi] set/get boot options
-
-1. fix issue for handling unsupported paramter
-2. add support for floppy/USB boot
-
-Change-Id: I2b888c1ad67fec7924dd5825f78622cd216a55f4
-Signed-off-by: Jia, Chunhui <chunhui.jia@intel.com>
-Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
----
- chassishandler.cpp | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/chassishandler.cpp b/chassishandler.cpp
-index 666addb..77af2dc 100644
---- a/chassishandler.cpp
-+++ b/chassishandler.cpp
-@@ -1244,7 +1244,8 @@ constexpr auto ipmiDefault = 0;
- std::map<IpmiValue, Source::Sources> sourceIpmiToDbus = {
-     {0x01, Source::Sources::Network},
-     {0x02, Source::Sources::Disk},
-     {0x05, Source::Sources::ExternalMedia},
-+    {0x0f, Source::Sources::RemovableMedia},
-     {ipmiDefault, Source::Sources::Default}};
- 
- std::map<IpmiValue, Mode::Modes> modeIpmiToDbus = {
-@@ -1255,7 +1256,8 @@ std::map<IpmiValue, Mode::Modes> modeIpmiToDbus = {
- std::map<Source::Sources, IpmiValue> sourceDbusToIpmi = {
-     {Source::Sources::Network, 0x01},
-     {Source::Sources::Disk, 0x02},
-     {Source::Sources::ExternalMedia, 0x05},
-+    {Source::Sources::RemovableMedia, 0x0f},
-     {Source::Sources::Default, ipmiDefault}};
- 
- std::map<Mode::Modes, IpmiValue> modeDbusToIpmi = {
-@@ -1533,7 +1535,7 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
-                     setBootMode(Mode::Modes::Regular);
-                 }
-             }
--            if (modeIpmiToDbus.end() != modeItr)
-+            else if (modeIpmiToDbus.end() != modeItr)
-             {
-                 rc = setBootMode(modeItr->second);
-                 if (rc != IPMI_CC_OK)
-@@ -1550,6 +1552,12 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
-                     setBootSource(Source::Sources::Default);
-                 }
-             }
-+            else
-+            {
-+                // if boot option is not in support list, return error
-+                *data_len = 0;
-+                return IPMI_CC_INVALID_FIELD_REQUEST;
-+            }
-         }
-         catch (InternalFailure& e)
-         {
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch
index 2a4cc9bb1..903ae96a7 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch
@@ -1,4 +1,4 @@
-From 9ed3fd11047f8c360b7d808946939ef280813811 Mon Sep 17 00:00:00 2001
+From ad93a6e17310d92ef07b8d367b23c93793562d0f Mon Sep 17 00:00:00 2001
 From: Cheng C Yang <cheng.c.yang@linux.intel.com>
 Date: Wed, 23 Jan 2019 17:02:40 +0800
 Subject: [PATCH] Fix keep looping issue when entering OS
@@ -20,19 +20,19 @@ correctly through KCS channel.
  1 file changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/host-cmd-manager.cpp b/host-cmd-manager.cpp
-index 0a61e63..6e50684 100644
+index f3aba7f..465eb81 100644
 --- a/host-cmd-manager.cpp
 +++ b/host-cmd-manager.cpp
 @@ -26,6 +26,8 @@ constexpr auto MAPPER_INTERFACE = "xyz.openbmc_project.ObjectMapper";
  constexpr auto HOST_STATE_PATH = "/xyz/openbmc_project/state/host0";
  constexpr auto HOST_STATE_INTERFACE = "xyz.openbmc_project.State.Host";
  constexpr auto HOST_TRANS_PROP = "RequestedHostTransition";
-+constexpr const char* IPMI_PATH = "/org/openbmc/HostIpmi/1";
-+constexpr const char* IPMI_INTERFACE = "org.openbmc.HostIpmi";
++constexpr const char* IPMI_PATH = "/xyz/openbmc_project/Ipmi/Channel/ipmi_kcs3";
++constexpr const char* IPMI_INTERFACE = "xyz.openbmc_project.Ipmi.Channel.SMS";
  
  // For throwing exceptions
  using namespace phosphor::logging;
-@@ -107,6 +109,20 @@ void Manager::clearQueue()
+@@ -106,6 +108,20 @@ void Manager::clearQueue()
          // `false` indicating Failure
          std::get<CallBack>(command)(ipmiCmdData, false);
      }
@@ -53,7 +53,7 @@ index 0a61e63..6e50684 100644
  }
  
  // Called for alerting the host
-@@ -116,9 +132,6 @@ void Manager::checkQueueAndAlertHost()
+@@ -115,9 +131,6 @@ void Manager::checkQueueAndAlertHost()
      {
          log<level::DEBUG>("Asserting SMS Attention");
  
@@ -63,7 +63,7 @@ index 0a61e63..6e50684 100644
          auto host = ::ipmi::getService(this->bus, IPMI_INTERFACE, IPMI_PATH);
  
          // Start the timer for this transaction
-@@ -132,9 +145,8 @@ void Manager::checkQueueAndAlertHost()
+@@ -131,9 +144,8 @@ void Manager::checkQueueAndAlertHost()
              return;
          }
  
@@ -76,5 +76,5 @@ index 0a61e63..6e50684 100644
  
          if (reply.is_method_error())
 -- 
-2.16.2
+2.7.4
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch
new file mode 100644
index 000000000..877c5336a
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch
@@ -0,0 +1,127 @@
+From 514b76d1c05d7ed7fb7e1df27833e423e04c9a1c Mon Sep 17 00:00:00 2001
+From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
+Date: Tue, 21 May 2019 09:57:16 -0700
+Subject: [PATCH] Use xyz.openbmc_project.State.Chassis for IPMI chassis status
+
+Instead of directly using pgood on dbus, this change uses the
+xyz.openbmc_project.State.Chassis "CurrentPowerState" property
+for the IPMI chassis status command.  This will allow us to
+remove pgood from dbus.
+
+Tested:
+Ran IPMI chassis commands and confirmed that they behave as
+expected:
+ipmitool power status
+Chassis Power is on
+
+ipmitool power off
+Chassis Power Control: Down/Off
+
+ipmitool power status
+Chassis Power is off
+
+ipmitool power on
+Chassis Power Control: Up/On
+
+ipmitool power status
+Chassis Power is on
+
+Change-Id: I7836c16b76c3b309f176186f3e2453082e4cd1af
+Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+---
+ chassishandler.cpp | 61 ++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 41 insertions(+), 20 deletions(-)
+
+diff --git a/chassishandler.cpp b/chassishandler.cpp
+index 1738ccc..e4e842d 100644
+--- a/chassishandler.cpp
++++ b/chassishandler.cpp
+@@ -824,44 +824,65 @@ std::optional<uint2_t> getPowerRestorePolicy()
+  */
+ std::optional<bool> getPowerStatus()
+ {
+-    constexpr const char* powerControlObj =
+-        "/xyz/openbmc_project/Chassis/Control/Power0";
+-    constexpr const char* powerControlIntf =
+-        "xyz.openbmc_project.Chassis.Control.Power";
+     bool powerGood = false;
+     std::shared_ptr<sdbusplus::asio::connection> busp = getSdBus();
+     try
+     {
++        constexpr const char* chassisStatePath =
++            "/xyz/openbmc_project/state/chassis0";
++        constexpr const char* chassisStateIntf =
++            "xyz.openbmc_project.State.Chassis";
+         auto service =
+-            ipmi::getService(*busp, powerControlIntf, powerControlObj);
++            ipmi::getService(*busp, chassisStateIntf, chassisStatePath);
+ 
+-        ipmi::Value variant = ipmi::getDbusProperty(
+-            *busp, service, powerControlObj, powerControlIntf, "pgood");
+-        powerGood = static_cast<bool>(std::get<int>(variant));
++        ipmi::Value variant =
++            ipmi::getDbusProperty(*busp, service, chassisStatePath,
++                                  chassisStateIntf, "CurrentPowerState");
++        std::string powerState = std::get<std::string>(variant);
++        if (powerState == "xyz.openbmc_project.State.Chassis.PowerState.On")
++        {
++            powerGood = true;
++        }
+     }
+     catch (const std::exception& e)
+     {
+         try
+         {
+-            // FIXME: some legacy modules use the older path; try that next
+-            constexpr const char* legacyPwrCtrlObj =
+-                "/org/openbmc/control/power0";
+-            constexpr const char* legacyPwrCtrlIntf =
+-                "org.openbmc.control.Power";
++            // FIXME: some modules use pgood; try that next
++            constexpr const char* powerControlObj =
++                "/xyz/openbmc_project/Chassis/Control/Power0";
++            constexpr const char* powerControlIntf =
++                "xyz.openbmc_project.Chassis.Control.Power";
+             auto service =
+-                ipmi::getService(*busp, legacyPwrCtrlIntf, legacyPwrCtrlObj);
++                ipmi::getService(*busp, powerControlIntf, powerControlObj);
+ 
+             ipmi::Value variant = ipmi::getDbusProperty(
+-                *busp, service, legacyPwrCtrlObj, legacyPwrCtrlIntf, "pgood");
++                *busp, service, powerControlObj, powerControlIntf, "pgood");
+             powerGood = static_cast<bool>(std::get<int>(variant));
+         }
+         catch (const std::exception& e)
+         {
+-            log<level::ERR>("Failed to fetch pgood property",
+-                            entry("ERROR=%s", e.what()),
+-                            entry("PATH=%s", powerControlObj),
+-                            entry("INTERFACE=%s", powerControlIntf));
+-            return std::nullopt;
++            try
++            {
++                // FIXME: some legacy modules use the older path; try that next
++                constexpr const char* legacyPwrCtrlObj =
++                    "/org/openbmc/control/power0";
++                constexpr const char* legacyPwrCtrlIntf =
++                    "org.openbmc.control.Power";
++                auto service = ipmi::getService(*busp, legacyPwrCtrlIntf,
++                                                legacyPwrCtrlObj);
++
++                ipmi::Value variant =
++                    ipmi::getDbusProperty(*busp, service, legacyPwrCtrlObj,
++                                          legacyPwrCtrlIntf, "pgood");
++                powerGood = static_cast<bool>(std::get<int>(variant));
++            }
++            catch (const std::exception& e)
++            {
++                log<level::ERR>("Failed to fetch pgood property",
++                                entry("ERROR=%s", e.what()));
++                return std::nullopt;
++            }
+         }
+     }
+     return std::make_optional(powerGood);
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch
new file mode 100644
index 000000000..498233881
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch
@@ -0,0 +1,214 @@
+From f11928c6b39052c679c9300e9d836837ef60be06 Mon Sep 17 00:00:00 2001
+From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
+Date: Mon, 3 Jun 2019 17:01:47 -0700
+Subject: [PATCH] Update IPMI Chassis Control command
+
+This change updates the IPMI Chassis Control command to use the new
+chassis state transitions. This allows each chassis control action
+to more closely follow the behavior defined in the IPMI spec.
+
+Tested:
+Ran each IPMI chassis control command to confirm the expected
+behavior:
+ipmitool power on: system is powered-on
+ipmitool power off: system is forced off
+ipmitool power cycle: system is forced off then powered-on
+ipmitool power reset: system is hard reset
+ipmitool power soft: soft power-off requested from system software
+
+Change-Id: Ic9fba3ca4abd9a758eb88f1e6ee09f7ca64ff80a
+Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+---
+ chassishandler.cpp | 138 +++++++++++++++++++++--------------------------------
+ 1 file changed, 54 insertions(+), 84 deletions(-)
+
+diff --git a/chassishandler.cpp b/chassishandler.cpp
+index e4e842d..d71b95f 100644
+--- a/chassishandler.cpp
++++ b/chassishandler.cpp
+@@ -31,6 +31,7 @@
+ #include <xyz/openbmc_project/Control/Boot/Mode/server.hpp>
+ #include <xyz/openbmc_project/Control/Boot/Source/server.hpp>
+ #include <xyz/openbmc_project/Control/Power/RestorePolicy/server.hpp>
++#include <xyz/openbmc_project/State/Chassis/server.hpp>
+ #include <xyz/openbmc_project/State/Host/server.hpp>
+ #include <xyz/openbmc_project/State/PowerOnHours/server.hpp>
+ 
+@@ -712,59 +713,63 @@ ipmi_ret_t ipmi_set_chassis_cap(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+ //------------------------------------------
+ // Calls into Host State Manager Dbus object
+ //------------------------------------------
+-int initiate_state_transition(State::Host::Transition transition)
++int initiateHostStateTransition(State::Host::Transition transition)
+ {
+     // OpenBMC Host State Manager dbus framework
+-    constexpr auto HOST_STATE_MANAGER_ROOT = "/xyz/openbmc_project/state/host0";
+-    constexpr auto HOST_STATE_MANAGER_IFACE = "xyz.openbmc_project.State.Host";
+-    constexpr auto DBUS_PROPERTY_IFACE = "org.freedesktop.DBus.Properties";
+-    constexpr auto PROPERTY = "RequestedHostTransition";
++    constexpr auto hostStatePath = "/xyz/openbmc_project/state/host0";
++    constexpr auto hostStateIntf = "xyz.openbmc_project.State.Host";
+ 
+-    // sd_bus error
+-    int rc = 0;
+-    char* busname = NULL;
++    auto service = ipmi::getService(*getSdBus(), hostStateIntf, hostStatePath);
+ 
+-    // SD Bus error report mechanism.
+-    sd_bus_error bus_error = SD_BUS_ERROR_NULL;
++    // Convert to string equivalent of the passed in transition enum.
++    auto request = State::convertForMessage(transition);
+ 
+-    // Gets a hook onto either a SYSTEM or SESSION bus
+-    sd_bus* bus_type = ipmid_get_sd_bus_connection();
+-    rc = mapper_get_service(bus_type, HOST_STATE_MANAGER_ROOT, &busname);
+-    if (rc < 0)
++    try
++    {
++        ipmi::setDbusProperty(*getSdBus(), service, hostStatePath,
++                              hostStateIntf, "RequestedHostTransition",
++                              request);
++    }
++    catch (std::exception& e)
+     {
+         log<level::ERR>(
+-            "Failed to get bus name",
+-            entry("ERRNO=0x%X, OBJPATH=%s", -rc, HOST_STATE_MANAGER_ROOT));
+-        return rc;
++            "Failed to initiate transition",
++            entry("EXCEPTION=%s, REQUEST=%s", e.what(), request.c_str()));
++        return -1;
+     }
++    return 0;
++}
++
++//------------------------------------------
++// Calls into Chassis State Manager Dbus object
++//------------------------------------------
++int initiateChassisStateTransition(State::Chassis::Transition transition)
++{
++    // OpenBMC Chassis State Manager dbus framework
++    constexpr auto chassisStatePath = "/xyz/openbmc_project/state/chassis0";
++    constexpr auto chassisStateIntf = "xyz.openbmc_project.State.Chassis";
++
++    auto service =
++        ipmi::getService(*getSdBus(), chassisStateIntf, chassisStatePath);
+ 
+     // Convert to string equivalent of the passed in transition enum.
+     auto request = State::convertForMessage(transition);
+ 
+-    rc = sd_bus_call_method(bus_type,                // On the system bus
+-                            busname,                 // Service to contact
+-                            HOST_STATE_MANAGER_ROOT, // Object path
+-                            DBUS_PROPERTY_IFACE,     // Interface name
+-                            "Set",                   // Method to be called
+-                            &bus_error,              // object to return error
+-                            nullptr,                 // Response buffer if any
+-                            "ssv",                   // Takes 3 arguments
+-                            HOST_STATE_MANAGER_IFACE, PROPERTY, "s",
+-                            request.c_str());
+-    if (rc < 0)
++    try
+     {
+-        log<level::ERR>("Failed to initiate transition",
+-                        entry("ERRNO=0x%X, REQUEST=%s", -rc, request.c_str()));
++        ipmi::setDbusProperty(*getSdBus(), service, chassisStatePath,
++                              chassisStateIntf, "RequestedPowerTransition",
++                              request);
+     }
+-    else
++    catch (std::exception& e)
+     {
+-        log<level::INFO>("Transition request initiated successfully");
++        log<level::ERR>(
++            "Failed to initiate transition",
++            entry("EXCEPTION=%s, REQUEST=%s", e.what(), request.c_str()));
++        return -1;
+     }
+ 
+-    sd_bus_error_free(&bus_error);
+-    free(busname);
+-
+-    return rc;
++    return 0;
+ }
+ 
+ namespace power_policy
+@@ -1138,61 +1143,26 @@ ipmi::RspType<> ipmiChassisControl(uint8_t chassisControl)
+     switch (chassisControl)
+     {
+         case CMD_POWER_ON:
+-            rc = initiate_state_transition(State::Host::Transition::On);
++            rc = initiateHostStateTransition(State::Host::Transition::On);
+             break;
+         case CMD_POWER_OFF:
+-            // This path would be hit in 2 conditions.
+-            // 1: When user asks for power off using ipmi chassis command 0x04
+-            // 2: Host asking for power off post shutting down.
+-
+-            // If it's a host requested power off, then need to nudge Softoff
+-            // application that it needs to stop the watchdog timer if running.
+-            // If it is a user requested power off, then this is not really
+-            // needed. But then we need to differentiate between user and host
+-            // calling this same command
+-
+-            // For now, we are going ahead with trying to nudge the soft off and
+-            // interpret the failure to do so as a non softoff case
+-            rc = stop_soft_off_timer();
+-
+-            // Only request the Off transition if the soft power off
+-            // application is not running
+-            if (rc < 0)
+-            {
+-                // First create a file to indicate to the soft off application
+-                // that it should not run. Not doing this will result in State
+-                // manager doing a default soft power off when asked for power
+-                // off.
+-                indicate_no_softoff_needed();
+-
+-                // Now request the shutdown
+-                rc = initiate_state_transition(State::Host::Transition::Off);
+-            }
+-            else
+-            {
+-                log<level::INFO>("Soft off is running, so let shutdown target "
+-                                 "stop the host");
+-            }
++            rc =
++                initiateChassisStateTransition(State::Chassis::Transition::Off);
+             break;
+-
+         case CMD_HARD_RESET:
++            rc = initiateChassisStateTransition(
++                State::Chassis::Transition::Reset);
++            break;
+         case CMD_POWER_CYCLE:
+-            // SPEC has a section that says certain implementations can trigger
+-            // PowerOn if power is Off when a command to power cycle is
+-            // requested
+-
+-            // First create a file to indicate to the soft off application
+-            // that it should not run since this is a direct user initiated
+-            // power reboot request (i.e. a reboot request that is not
+-            // originating via a soft power off SMS request)
+-            indicate_no_softoff_needed();
+-
+-            rc = initiate_state_transition(State::Host::Transition::Reboot);
++            rc = initiateChassisStateTransition(
++                State::Chassis::Transition::PowerCycle);
+             break;
+-
+         case CMD_SOFT_OFF_VIA_OVER_TEMP:
+-            // Request Host State Manager to do a soft power off
+-            rc = initiate_state_transition(State::Host::Transition::Off);
++            rc = initiateHostStateTransition(State::Host::Transition::Off);
++            break;
++        case CMD_PULSE_DIAGNOSTIC_INTR:
++            rc =
++                initiateHostStateTransition(State::Host::Transition::Interrupt);
+             break;
+ 
+         default:
+-- 
+2.7.4
+
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 91319a9d3..3509ebfd6 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
@@ -3,12 +3,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 # TODO: This should be removed, once up-stream bump up
 # issue is resolved
 #SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "fdb8389df74f9f0d6428252a75c33f6abf6d8481"
+SRCREV = "ea1c401c4bac43d6070bf7d515df08f8bf57c0a2"
 
 SRC_URI += "file://phosphor-ipmi-host.service \
             file://0009-IPv6-Network-changes.patch \
             file://0010-fix-get-system-GUID-ipmi-command.patch \
-            file://0012-ipmi-set-get-boot-options.patch \
             file://0013-ipmi-add-set-bios-id-to-whitelist.patch \
             file://0021-Implement-IPMI-Commmand-Get-Host-Restart-Cause.patch \
             file://0039-ipmi-add-oem-command-get-AIC-FRU-to-whitelist.patch \
@@ -20,6 +19,8 @@ SRC_URI += "file://phosphor-ipmi-host.service \
             file://0057-Add-timer-use-actions-support.patch \
             file://0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch \
             file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \
+            file://0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch \
+            file://0062-Update-IPMI-Chassis-Control-command.patch \
             "
 
 # remove the softpoweroff service since we do not need it
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
index 4861755b6..af83facf6 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Node Manager Proxy"
 DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \
 with Management Engine via IPMB"
 
-SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/node-manager;protocol=ssh"
 SRCREV = "2ab90332828614c95e0ce22c0c95285734b55b65"
 PV = "0.1+git${SRCPV}"
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
index 7b193f85b..533df68a4 100755..100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
@@ -34,6 +34,10 @@ enclosure_identify:
     identify:
         Action: 'On'
 
+enclosure_identify_blink:
+    identify:
+        Action: 'Blink'
+
 cpu0_fault:
     cpu0fault:
         Action: 'On'
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb
index e7cd1ab42..31b9e9338 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Multi node manager"
 DESCRIPTION = "Daemon to handle chassis level shared resources on multi-node platform"
 
-SRC_URI = "git://github.com/Intel-BMC/multi-node-manager.git;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/multi-node-manager.git;protocol=ssh"
 SRCREV = "8a34c017e04dd8f327aff127f64855f6132bd318"
 
 PV = "0.1+git${SRCPV}"
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..da1d74207 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
@@ -1,7 +1,7 @@
 SUMMARY = "BMC Self Test service"
 DESCRIPTION = "BMC Self Test service for subsystem diagnosis failure info"
 
-SRC_URI = "git://github.com/Intel-BMC/intel-self-test;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/intel-self-test;protocol=ssh"
 
 PV = "1.0+git${SRCPV}"
 SRCREV = "d039998ad2c55aeae4191af30e15bbd3032508c1"
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 ba82532fc..996f11b42 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,7 +1,7 @@
-SRCREV = "8dbb395364629673a1f1dde81b1cf7d8041b0662"
+SRCREV = "930fcde3c8776c02f2a3d969d05608e2155eb159"
 SRC_URI = "git://github.com/openbmc/dbus-sensors.git"
 
-DEPENDS_append = " i2c-tools"
+DEPENDS_append = " libgpiod"
 
 #todo(cheng) remove this when synced upstream
 SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.psusensor.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb
index bcb8361dd..503f3875a 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/git/special-mode-mgr"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh;nobranch=1"
+SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh;nobranch=1"
 SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd"
 
 inherit cmake systemd
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
index c3d71d30c..878de75bb 100644
--- 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
@@ -8,8 +8,8 @@ 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 = "ec8f1c06be71d6059c82fd442475420286f5dbcd"
+SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh"
+SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391"
 
 inherit cmake systemd
 SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb
index 818259153..4bef0fd0e 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb
@@ -1,13 +1,13 @@
 SUMMARY = "Callback Manager"
 DESCRIPTION = "D-Bus daemon that registers matches that trigger method calls"
 
-SRC_URI = "git://github.com/Intel-BMC/provingground;protocol=ssh"
+SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh"
 
 inherit cmake systemd
 DEPENDS = "boost sdbusplus"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd"
+SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391"
 
 S = "${WORKDIR}/git/callback-manager"
 
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 70cbc72f6..0cb531e60 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,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 #SRC_URI = "git://github.com/openbmc/phosphor-user-manager"
-SRCREV = "fef578960f632abacc5cd615b2bedfb3ab9ebb90"
+SRCREV = "59dba4435d0d553369790e8936d7eb43251ff302"
 
 
 SRC_URI += " \
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch
index 6e057f681..28995d14b 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch
@@ -1,4 +1,4 @@
-From 1c0e658833ea7595b2fb42261ce5e0ce781bac98 Mon Sep 17 00:00:00 2001
+From 38faf5c040660e752741dcf7f03e4bb1e9f3411b Mon Sep 17 00:00:00 2001
 From: Yong Li <yong.b.li@linux.intel.com>
 Date: Thu, 4 Apr 2019 18:24:54 +0800
 Subject: [PATCH] Add redfish log support for IPMI watchdog timeout actions
@@ -17,11 +17,11 @@ https://BMCIP/redfish/v1/Systems/system/LogServices/EventLog/Entries
 
 Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
 ---
- watchdog.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ watchdog.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
 
 diff --git a/watchdog.cpp b/watchdog.cpp
-index d529746..008cde5 100644
+index bc3ba95..4774fd8 100644
 --- a/watchdog.cpp
 +++ b/watchdog.cpp
 @@ -1,5 +1,7 @@
@@ -32,19 +32,20 @@ index d529746..008cde5 100644
  #include <chrono>
  #include <phosphor-logging/elog.hpp>
  #include <phosphor-logging/log.hpp>
-@@ -115,6 +117,12 @@ void Watchdog::timeOutHandler()
-                          entry("ACTION=%s", convertForMessage(action).c_str()),
-                          entry("TARGET=%s", target->second.c_str()));
+@@ -101,6 +103,13 @@ void Watchdog::timeOutHandler()
+         action = fallback->action;
+     }
  
-+        // Log into redfish event log
-+        sd_journal_send("MESSAGE=IPMIWatchdog: Timed out ACTION=%s; TARGET=%s",
-+                        convertForMessage(action).c_str(),
-+                        target->second.c_str(), "PRIORITY=%i", LOG_INFO,
-+                        "REDFISH_MESSAGE_ID=%s", "IPMIWatchdog", NULL);
++    // Log into redfish event log
++    sd_journal_send("MESSAGE=IPMIWatchdog: Timed out ACTION=%s",
++                    convertForMessage(action).c_str(), "PRIORITY=%i", LOG_INFO,
++                    "REDFISH_MESSAGE_ID=%s", "OpenBMC.0.1.IPMIWatchdog",
++                    "REDFISH_MESSAGE_ARGS=%s",
++                    convertForMessage(action).c_str(), NULL);
 +
-         try
-         {
-             auto method = bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_ROOT,
+     expiredTimerUse(currentTimerUse());
+ 
+     auto target = actionTargetMap.find(action);
 -- 
 2.7.4
 
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 3d8f359f8..e6e329d06 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,6 +1,6 @@
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 
 #SRC_URI = "git://github.com/openbmc/phosphor-webui.git"
-SRCREV = "44da471fceb3790b49a43bc023781f62b19f9fde"
+SRCREV = "5bd1dec7fdc8f6a3a20e6c23dc491b3d31392bc5"
 
 SRC_URI += "file://0004-Implement-force-boot-to-bios-in-server-power-control.patch"
diff --git a/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend
index aa28e8d85..5c3c24ec5 100644
--- a/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend
@@ -1,5 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PACKAGECONFIG += " cxx"
+
 SRC_URI += " \
         file://0001-Add-pass-through-setting-in-gpioset.patch \
         "
diff --git a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample
new file mode 100644
index 000000000..09c2bbc4a
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample
@@ -0,0 +1,25 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "10"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-x86 \
+  ##OEROOT##/meta-openbmc-mods \
+  ##OEROOT##/meta-intel \
+  ##OEROOT##/meta-openbmc-mods/meta-common \
+  ##OEROOT##/meta-openbmc-mods/meta-common-small \
+  ##OEROOT##/meta-openbmc-mods/meta-ast2500 \
+  ##OEROOT##/meta-openbmc-mods/meta-wht \
+  ##OEROOT##/meta-security \
+  "
diff --git a/meta-openbmc-mods/meta-wht/conf/conf-notes.txt b/meta-openbmc-mods/meta-wht/conf/conf-notes.txt
new file mode 100644
index 000000000..558487db6
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/conf/conf-notes.txt
@@ -0,0 +1,5 @@
+Common targets are:
+    intel-platforms
+    obmc-phosphor-image
+    virtual/kernel
+    phosphor-ipmi-host
diff --git a/meta-openbmc-mods/meta-wht/conf/layer.conf b/meta-openbmc-mods/meta-wht/conf/layer.conf
new file mode 100644
index 000000000..99d7ee689
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/conf/layer.conf
@@ -0,0 +1,14 @@
+LOCALCONF_VERSION = "3"
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "wht"
+BBFILE_PATTERN_wht = ""
+BBFILE_PRIORITY_wht = "7"
+LAYERSERIES_COMPAT_wht = "warrior"
+
+PRODUCT_GENERATION_pn-os-release = "wht"
diff --git a/meta-openbmc-mods/meta-wht/conf/local.conf.sample b/meta-openbmc-mods/meta-wht/conf/local.conf.sample
new file mode 100644
index 000000000..31b18a76e
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/conf/local.conf.sample
@@ -0,0 +1,20 @@
+MACHINE ??= "intel-ast2500"
+#DL_DIR ?= "/~YoctoDownloads"
+#SSTATE_DIR ?= "/~YoctoSstate-cache"
+DISTRO ?= "openbmc-phosphor"
+PACKAGE_CLASSES ?= "package_rpm"
+SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*"
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+CONF_VERSION = "3"
+#BB_NUMBER_THREADS = "70"
diff --git a/meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf b/meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf
new file mode 100644
index 000000000..907b9f1e1
--- /dev/null
+++ b/meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf
@@ -0,0 +1 @@
+require conf/machine/include/intel-ast2500.inc
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
index 12d9af86b..f3a4bc513 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
+++ b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
@@ -19,6 +19,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-intel \
   ##OEROOT##/meta-openbmc-mods/meta-common \
   ##OEROOT##/meta-openbmc-mods/meta-common-small \
+  ##OEROOT##/meta-openbmc-mods/meta-ast2500 \
   ##OEROOT##/meta-openbmc-mods/meta-wolfpass \
   ##OEROOT##/meta-security \
   "
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
index 2d85bfdce..711850f6d 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
+++ b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
@@ -8,5 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "wolfpass"
 BBFILE_PATTERN_wolfpass = ""
-BBFILE_PRIORITY_wolfpass = "6"
+BBFILE_PRIORITY_wolfpass = "7"
 LAYERSERIES_COMPAT_wolfpass = "warrior"
+
+PRODUCT_GENERATION_pn-os-release = "prl"
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample
index d39fb371c..49ffc117f 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample
+++ b/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample
@@ -1,4 +1,4 @@
-MACHINE ??= "wolfpass"
+MACHINE ??= "intel-ast2500"
 #DL_DIR ?= "/~YoctoDownloads"
 #SSTATE_DIR ?= "/~YoctoSstate-cache"
 DISTRO ?= "openbmc-phosphor"
@@ -17,9 +17,6 @@ BB_DISKMON_DIRS = "\
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
 CONF_VERSION = "3"
-INHERIT += "extrausers"
-
-EXTRA_USERS_PARAMS_append_pn-intel-platforms = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
 #BB_NUMBER_THREADS = "70"
+
+#INHERIT += "cve-check"
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf b/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf
new file mode 100644
index 000000000..907b9f1e1
--- /dev/null
+++ b/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf
@@ -0,0 +1 @@
+require conf/machine/include/intel-ast2500.inc
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb b/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb
deleted file mode 100644
index e20ea75cf..000000000
--- a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "Set passthrough"
-DESCRIPTION = "Script to enable / disable passthrough"
-
-S = "${WORKDIR}"
-SRC_URI = "file://set-passthrough.sh"
-
-LICENSE = "CLOSED"
-RDEPENDS_${PN} += "bash"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/set-passthrough.sh ${D}/${bindir}/set-passthrough.sh
-}
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh b/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh
deleted file mode 100644
index 2b9ef6876..000000000
--- a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# this script uses devmem to set hardware passthrough
-# it is temporary and should be removed in the future
-
-PASSTHROUGH_ENABLE=0x3000
-
-if [[ -z $1 ]]; then
-    echo "First Argument Must Be 1 To Enable or 0 To Disable"
-    exit 1
-fi
-
-if [[ $1 != "0" && $1 != "1" ]]; then
-    echo "Arg 1 must be 0 or 1"
-    exit 1
-fi
-
-# read register
-var=$(devmem 0x1e6e208C w)
-
-# convert to int
-typeset -i value=$( echo $(( $var )) )
-
-if [[ $1 == "0" ]]; then
-    value=$((value & ~PASSTHROUGH_ENABLE))
-    # Mark the gpio reset out & power up pin as released
-    echo "1" > /sys/class/gpio/gpio33/value
-    echo "1" > /sys/class/gpio/gpio35/value
-fi
-
-if [[ $1 == "1" ]]; then
-    value=$((value | PASSTHROUGH_ENABLE))
-fi
-
-val=$(printf '0x%x\n' $value)
-
-#echo $val
-
-devmem 0x1e6e208C w $val
-
-# devmem 0x1e6e208C w
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE
deleted file mode 100644
index dd0408376..000000000
--- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2018 Intel Corporation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-\ No newline at end of file
author	Ed Tanous <ed.tanous@intel.com>	2019-06-06 19:43:20 +0300
committer	Ed Tanous <ed.tanous@intel.com>	2019-06-07 00:20:52 +0300
commit	10bc2ef852277cf8e9858f75cea9f55b482bf85b (patch)
tree	6d29c0a7edc3769c9fbba0a3c6f6ed9ba10ba8ed /meta-openbmc-mods
parent	9087065ce8c9f13d6450293c15101a3db5fe6f49 (diff)
download	openbmc-10bc2ef852277cf8e9858f75cea9f55b482bf85b.tar.xz