Update to internal 7-31-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

27 files changed, 496 insertions, 337 deletions

diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc
index cc9e30495..1bbd64381 100644
--- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc
+++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc
@@ -8,12 +8,6 @@ require conf/distro/include/phosphor-tiny.inc
 
 UBOOT_MACHINE = "ast_g5_phy_config"
 
-#Developer to specify the appropriate IMAGE_TYPE and FLASH_SIZE
-#On Intel Whitley platforms PFR feature requires 128MB flash, default is 64MB
-#IMAGE_TYPE = "default" or "pfr" or "non-pfr"
-# "non-pfr" setting for future which is for BMC secure boot
-#for PFR its 128MB in KBs - 128*1024=131072, for non-pfr its 64MB= 64*1024 = 65536
-#pfr IMAGE_TYPE enforces the image signature verification during the image update
-IMAGE_TYPE = "default"
-
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
+
+IMAGE_CLASSES += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'image_types_intel_pfr', '', d)}"
diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc
index 24ec3113b..f4f8a7b9f 100644
--- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc
+++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc
@@ -21,7 +21,7 @@ MACHINEOVERRIDES =. "openbmc:"
 OBMC_PHOSPHOR_IMAGE_OVERLAY= "1"
 OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils-aspeed"
 
-IMAGE_CLASSES += "image_types image_types_phosphor_auto"
+IMAGE_CLASSES += "image_types image_types_phosphor_auto qemuboot"
 
 INITRAMFS_CTYPE ?= "lzma"
 INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
@@ -29,3 +29,12 @@ INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"
 
 KERNEL_IMAGETYPES += "zImage"
+
+# runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_DEFAULT_FSTYPE = "mtd"
+QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,if=mtd"
+QB_MACHINE = "-M intel-ast2500"
+QB_OPT_APPEND += " -nographic"
+QB_NETWORK_DEVICE = "-net nic,macaddr=C0:FF:EE:00:00:02,model=ftgmac100"
+QB_DEFAULT_KERNEL = "none"
diff --git a/meta-openbmc-mods/meta-ast2500/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 88a9c5624..613118843 100644
--- a/meta-openbmc-mods/meta-ast2500/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 fbbad6c3a18ec7f1e9d95c09e44e765de303329c Mon Sep 17 00:00:00 2001
+From a2505e885fafd674fe0eb3a2e6daa69392e46684 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
@@ -10,17 +10,20 @@ Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
 Signed-off-by: James Feist <james.feist@linux.intel.com>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+Signed-off-by: Zhu, Yunge <yunge.zhu@linux.intel.com>
+Signed-off-by: Chen Yugang <yugang.chen@linux.intel.com>
+Signed-off-by: Qiang XU <qiang.xu@linux.intel.com>
 ---
- arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 388 ++++++++++++++++++++++++++
- 1 file changed, 388 insertions(+)
+ arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 410 ++++++++++++++++++++++++++
+ 1 file changed, 410 insertions(+)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 
 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..421699c
+index 000000000000..e94a1473045f
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -0,0 +1,388 @@
+@@ -0,0 +1,410 @@
 +/dts-v1/;
 +
 +#include "aspeed-g5.dtsi"
@@ -146,7 +149,7 @@ index 0000000..421699c
 +	/*D0-D7*/	"","","","","","","","",
 +	/*E0-E7*/	"RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","",
 +	/*F0-F7*/	"","","","","CPU_ERR0","CPU_ERR1","","",
-+	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","","","","","","",
++	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","PCH_BMC_THERMTRIP","","","","","",
 +	/*H0-H7*/	"","","","","","","","",
 +	/*I0-I7*/	"","","","","","","","",
 +	/*J0-J7*/	"","","","","","","","",
@@ -166,7 +169,7 @@ index 0000000..421699c
 +	/*X0-X7*/	"","","","","","","","",
 +	/*Y0-Y7*/	"SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","",
 +	/*Z0-Z7*/	"","SIO_POWER_GOOD","","","","","","",
-+	/*AA0-AA7*/	"","","","","","","","POST_COMPLETE",
++	/*AA0-AA7*/	"P3VBAT_BRIDGE_EN","","","","","","SMI","POST_COMPLETE",
 +	/*AB0-AB7*/	"","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","",
 +	/*AC0-AC7*/	"","","","","","","","";
 +};
@@ -270,31 +273,36 @@ index 0000000..421699c
 +&i2c0 {
 +	multi-master;
 +	general-call;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
-+
-+	ipmb0@10 {
-+		compatible = "slave-mqueue";
-+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
-+	};
 +};
 +
 +&i2c1 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c2 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c3 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c4 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +
 +	hsbp0@10 {
@@ -306,6 +314,8 @@ index 0000000..421699c
 +&i2c5 {
 +	bus-frequency = <1000000>;
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +
 +	smlink0@10 {
@@ -316,22 +326,37 @@ index 0000000..421699c
 +
 +&i2c6 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c7 {
 +	multi-master;
 +	#retries = <3>;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c9 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
++	status = "okay";
++};
++
++&i2c11 {
++	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c13 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch
new file mode 100644
index 000000000..40afce9be
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch
@@ -0,0 +1,28 @@
+From 80795ca1de706c4111ac7e8874e1490e7ebf8100 Mon Sep 17 00:00:00 2001
+From: James Feist <james.feist@linux.intel.com>
+Date: Tue, 2 Jul 2019 10:14:59 -0700
+Subject: [PATCH] aspeed-pwm-tacho: change default fan speed
+
+Change it from max to 58%
+
+Signed-off-by: James Feist <james.feist@linux.intel.com>
+---
+ drivers/hwmon/aspeed-pwm-tacho.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c
+index 40c489be62ea..ae5771f881b5 100644
+--- a/drivers/hwmon/aspeed-pwm-tacho.c
++++ b/drivers/hwmon/aspeed-pwm-tacho.c
+@@ -160,7 +160,7 @@
+  */
+ #define M_TACH_MODE 0x02 /* 10b */
+ #define M_TACH_UNIT 0x0210
+-#define INIT_FAN_CTRL 0xFF
++#define INIT_FAN_CTRL 150 /* 58% */
+ 
+ /* How long we sleep in us while waiting for an RPM result. */
+ #define ASPEED_RPM_STATUS_SLEEP_USEC	500
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-ast2500/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..0ce4163dd 100644
--- a/meta-openbmc-mods/meta-ast2500/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
@@ -1,4 +1,4 @@
-From 9537923d6e6a793cb2bf3c1daacd12562263bc0a Mon Sep 17 00:00:00 2001
+From 56faf4c5a3957012f3a3a8467b3dfde760093784 Mon Sep 17 00:00:00 2001
 From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
 Date: Fri, 3 May 2019 16:12:39 -0700
 Subject: [PATCH] Enable pass-through on GPIOE1 and GPIOE3 free
@@ -20,10 +20,10 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
  3 files changed, 64 insertions(+)
 
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-index 187abd7..beb0729 100644
+index e20e2a259141..fbc9a68bd88c 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-@@ -2498,6 +2498,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = {
+@@ -2605,6 +2605,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = {
  	.get_function_groups = aspeed_pinmux_get_fn_groups,
  	.set_mux = aspeed_pinmux_set_mux,
  	.gpio_request_enable = aspeed_gpio_request_enable,
@@ -32,11 +32,11 @@ index 187abd7..beb0729 100644
  };
  
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
-index eb87ab7..f06d752 100644
+index 18f46177b4af..6feea140b438 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
-@@ -538,6 +538,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev,
- 	return aspeed_sig_expr_enable(expr, pdata->maps);
+@@ -356,6 +356,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev,
+ 	return aspeed_sig_expr_enable(&pdata->pinmux, expr);
  }
  
 +void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev,
@@ -68,11 +68,11 @@ index eb87ab7..f06d752 100644
 +		return;
 +
 +	/* Disable any functions of higher priority than GPIO just in case */
-+	while (funcs = *prios) {
++	while ((funcs = *prios)) {
 +		if (aspeed_gpio_in_exprs(funcs))
 +			break;
 +
-+		ret = aspeed_disable_sig(funcs, pdata->maps);
++		ret = aspeed_disable_sig(&pdata->pinmux, funcs);
 +		if (ret)
 +			return;
 +
@@ -96,17 +96,17 @@ index eb87ab7..f06d752 100644
 +	prios--;
 +	funcs = *prios;
 +	expr = *funcs;
-+	aspeed_sig_expr_enable(expr, pdata->maps);
++	aspeed_sig_expr_enable(&pdata->pinmux, expr);
 +}
 +
  int aspeed_pinctrl_probe(struct platform_device *pdev,
  			 struct pinctrl_desc *pdesc,
  			 struct aspeed_pinctrl_data *pdata)
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h
-index d4d7f03..0037b11 100644
+index 11cc0eb6666b..735162ebb855 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h
-@@ -595,6 +595,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function,
+@@ -64,6 +64,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function,
  int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev,
  		struct pinctrl_gpio_range *range,
  		unsigned int offset);
diff --git a/meta-openbmc-mods/meta-ast2500/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..c38134b8c 100644
--- a/meta-openbmc-mods/meta-ast2500/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
@@ -1,4 +1,4 @@
-From d26dd7c4ef1a2cb88440420deccc54eb88129c60 Mon Sep 17 00:00:00 2001
+From 7513371d16158cb638dd97e81b402bbef7ed3156 Mon Sep 17 00:00:00 2001
 From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
 Date: Mon, 6 May 2019 14:18:27 -0700
 Subject: [PATCH] Enable GPIOE0 and GPIOE2 pass-through by default
@@ -23,10 +23,10 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
  2 files changed, 14 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-index 45556ac..051e927 100644
+index b049f816bf67..4815104459f1 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -124,6 +124,10 @@
+@@ -116,6 +116,10 @@
  
  &gpio {
  	status = "okay";
@@ -35,21 +35,21 @@ index 45556ac..051e927 100644
 +	pinctrl-0 = <&pinctrl_gpie0_default
 +			&pinctrl_gpie2_default>;
  	gpio-line-names =
- 	/*A0-A8*/	"","","","","","","","",
- 	/*B0-B8*/	"","","","","","","","",
+ 	/*A0-A7*/	"","","","","","","","",
+ 	/*B0-B7*/	"","","","","","","","",
 diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
-index 2175070..f47d139 100644
+index 13d80bfbc3b6..e426452a28f7 100644
 --- a/drivers/gpio/gpio-aspeed.c
 +++ b/drivers/gpio/gpio-aspeed.c
-@@ -1157,6 +1157,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+@@ -1152,6 +1152,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+ {
  	const struct of_device_id *gpio_id;
  	struct aspeed_gpio *gpio;
- 	struct resource *res;
 +	struct pinctrl *pinctrl;
  	int rc, i, banks;
  
  	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
-@@ -1205,6 +1206,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+@@ -1199,6 +1200,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
  		return -ENOMEM;
  
  	/*
diff --git a/meta-openbmc-mods/meta-ast2500/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
deleted file mode 100644
index dbb163d20..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 2f3587cf9e44f261fe74413ef6a54467686c910b Mon Sep 17 00:00:00 2001
-From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
-Date: Tue, 20 Nov 2018 15:49:15 -0800
-Subject: [PATCH] Test code for LPC MBOX
-
-Blocked interrupt driven code for test.
-
-Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
----
- drivers/misc/aspeed-lpc-mbox.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/misc/aspeed-lpc-mbox.c b/drivers/misc/aspeed-lpc-mbox.c
-index 0f0c711bafee..0933e0553953 100644
---- a/drivers/misc/aspeed-lpc-mbox.c
-+++ b/drivers/misc/aspeed-lpc-mbox.c
-@@ -19,6 +19,8 @@
- 
- #define DEVICE_NAME	"aspeed-mbox"
- 
-+#define MBX_USE_INTERRUPT 0
-+
- #define ASPEED_MBOX_NUM_REGS 16
- 
- #define ASPEED_MBOX_DATA_0 0x00
-@@ -79,12 +81,14 @@ static int aspeed_mbox_open(struct inode *inode, struct file *file)
- 	struct aspeed_mbox *mbox = file_mbox(file);
- 
- 	if (atomic_inc_return(&aspeed_mbox_open_count) == 1) {
-+#if MBX_USE_INTERRUPT
- 		/*
- 		 * Clear the interrupt status bit if it was left on and unmask
- 		 * interrupts.
- 		 * ASPEED_MBOX_CTRL_RECV bit is W1C, this also unmasks in 1 step
- 		 */
- 		aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL);
-+#endif
- 		return 0;
- 	}
- 
-@@ -106,6 +110,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf,
- 	if (count + *ppos > ASPEED_MBOX_NUM_REGS)
- 		return -EINVAL;
- 
-+#if MBX_USE_INTERRUPT
- 	if (file->f_flags & O_NONBLOCK) {
- 		if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) &
- 				ASPEED_MBOX_CTRL_RECV))
-@@ -115,6 +120,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf,
- 				ASPEED_MBOX_CTRL_RECV)) {
- 		return -ERESTARTSYS;
- 	}
-+#endif
- 
- 	mutex_lock(&mbox->mutex);
- 
-@@ -129,8 +135,10 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf,
- 		count--;
- 	}
- 
-+#if MBX_USE_INTERRUPT
- 	/* ASPEED_MBOX_CTRL_RECV bit is write to clear, this also unmasks in 1 step */
- 	aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL);
-+#endif
- 	ret = p - buf;
- 
- out_unlock:
-@@ -180,7 +188,9 @@ static unsigned int aspeed_mbox_poll(struct file *file, poll_table *wait)
- 
- 	poll_wait(file, &mbox->queue, wait);
- 
-+#if MBX_USE_INTERRUPT
- 	if (aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV)
-+#endif
- 		mask |= POLLIN;
- 
- 	return mask;
-@@ -206,6 +216,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg)
- {
- 	struct aspeed_mbox *mbox = arg;
- 
-+#if MBX_USE_INTERRUPT
- 	if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV))
- 		return IRQ_NONE;
- 
-@@ -216,6 +227,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg)
- 
- 	/* Mask it off, we'll clear it when we the data gets read */
- 	aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL);
-+#endif
- 
- 	wake_up(&mbox->queue);
- 	return IRQ_HANDLED;
-@@ -248,7 +260,14 @@ static int aspeed_mbox_config_irq(struct aspeed_mbox *mbox,
- 	aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_0);
- 	aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_1);
- 
--	aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL);
-+	aspeed_mbox_outb(mbox, aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) | ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL);
-+
-+	/*
-+	 * Because mailbox data register init value is random, need to give a
-+	 * init value to mailbox data register.
-+	 */
-+	aspeed_mbox_outb(mbox, 0x00, ASPEED_MBOX_DATA_0);
-+
- 	return 0;
- }
- 
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/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..14b7154bf 100644
--- a/meta-openbmc-mods/meta-ast2500/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
@@ -1,4 +1,4 @@
-From ddfbe1364c6ecf77f06990e6550dfe5a3791e6bf Mon Sep 17 00:00:00 2001
+From 9a71adc7aecbfdf066ba54c763c2ecd8fb09d3cd Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
 Date: Wed, 6 Feb 2019 15:59:34 +0530
 Subject: [PATCH] Selecting 128MB for PFR
@@ -13,10 +13,10 @@ Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-index 8aba46cdce46..6959a06d04e2 100644
+index 4815104459f1..df02bb1aaf36 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
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
index d3b850efe..c1207055d 100644
--- 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
@@ -1,4 +1,4 @@
-From 2e834ae04eba975066f80102c6f4656da314ca1e Mon Sep 17 00:00:00 2001
+From 029cf5d5ff436ea14ab2d33da32238910be0a8b2 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
@@ -27,10 +27,10 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
  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
+index fbc9a68bd88c..6f151e7c8d81 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);
+@@ -272,7 +272,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));
@@ -39,7 +39,7 @@ index beb0729..05d1081 100644
  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);
+@@ -292,7 +292,7 @@ FUNC_GROUP_DECL(GPIE0, B20, C20);
  
  #define F18 34
  SIG_EXPR_LIST_DECL_SINGLE(NDSR3, NDSR3, SIG_DESC_SET(SCU80, 18));
@@ -48,7 +48,7 @@ index beb0729..05d1081 100644
  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);
+@@ -1371,7 +1371,7 @@ FUNC_GROUP_DECL(ADC15, H4);
  
  #define R22 192
  SIG_EXPR_DECL(SIOS3, SIOS3, SIG_DESC_SET(SCUA4, 8));
@@ -57,7 +57,7 @@ index beb0729..05d1081 100644
  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);
+@@ -1379,7 +1379,7 @@ FUNC_GROUP_DECL(SIOS3, R22);
  
  #define R21 193
  SIG_EXPR_DECL(SIOS5, SIOS5, SIG_DESC_SET(SCUA4, 9));
@@ -66,7 +66,7 @@ index beb0729..05d1081 100644
  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);
+@@ -1395,7 +1395,7 @@ FUNC_GROUP_DECL(SIOPWREQ, P22);
  
  #define P21 195
  SIG_EXPR_DECL(SIOONCTRL, SIOONCTRL, SIG_DESC_SET(SCUA4, 11));
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
index 155ba3ae4..9860a2815 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
@@ -12,7 +12,6 @@ CONFIG_PECI_CHARDEV=y
 CONFIG_PECI_ASPEED=y
 CONFIG_SENSORS_PECI_CPUTEMP=y
 CONFIG_SENSORS_PECI_DIMMTEMP=y
-CONFIG_OF_CONFIGFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_BLK_DEV_RAM_SIZE=49152
 CONFIG_MAGIC_SYSRQ=y
@@ -21,10 +20,12 @@ CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_ASPEED_ESPI_SLAVE=y
 CONFIG_ASPEED_KCS_IPMI_BMC=y
 CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=n
 CONFIG_I2C_SLAVE_MQUEUE=y
 CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256
 CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32
+CONFIG_ASPEED_BT_IPMI_BMC=n
+CONFIG_ASPEED_LPC_CTRL=n
+CONFIG_ASPEED_LPC_MBOX=y
 CONFIG_ASPEED_LPC_SIO=y
 CONFIG_JTAG=y
 CONFIG_JTAG_ASPEED=y
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
index 0ba716442..1ef28afb5 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -3,7 +3,7 @@ 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 \
+            file://0001-aspeed-pwm-tacho-change-default-fan-speed.patch \
             "
-SRC_URI += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}"
+SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}"
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
index 2bbaa0238..42e313568 100644..100755
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
@@ -224,6 +224,12 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -661,20 +667,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 48,
-            "Name": "Cpu Err2",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 49,
-            "Name": "Cpu Caterr",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 50,
             "Name": "PCH Thermaltrip",
             "Polarity": "Low",
@@ -1150,6 +1142,90 @@
             "Type": "Gpio"
         },
         {
+            "Address": "0x71",
+            "Bus": 2,
+            "ChannelNames": [
+                "M2_Slot1",
+                "M2_Slot2",
+                "",
+                ""
+            ],
+            "Name": "M.2 Mux",
+            "Type": "PCA9543Mux"
+        },
+        {
+            "Address": "0x70",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot1",
+                "U2_Slot2",
+                "U2_Slot3",
+                "U2_Slot4"
+            ],
+            "Name": "HSBP 1 Mux",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x74",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot5",
+                "U2_Slot6",
+                "U2_Slot7",
+                "U2_Slot8"
+            ],
+            "Name": "HSBP 1 Mux2",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x77",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot1",
+                "U2_Slot2",
+                "U2_Slot3",
+                "U2_Slot4"
+            ],
+            "Name": "HSBP 2 Mux",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x73",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot5",
+                "U2_Slot6",
+                "U2_Slot7",
+                "U2_Slot8"
+            ],
+            "Name": "HSBP 2 Mux2",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x76",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot1",
+                "U2_Slot2",
+                "U2_Slot3",
+                "U2_Slot4"
+            ],
+            "Name": "HSBP 3 Mux",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x72",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot5",
+                "U2_Slot6",
+                "U2_Slot7",
+                "U2_Slot8"
+            ],
+            "Name": "HSBP 3 Mux2",
+            "Type": "PCA9546Mux"
+        },
+        {
             "Address": "0x4D",
             "Bus": 6,
             "Name": "CPU0 VR Temp",
@@ -1343,13 +1419,17 @@
         }
     ],
     "Name": "CYP Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})",
-    "Type": "Board",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'M50CYP2SB2U'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})"
+    ],
     "ProductId": 152,
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
+}
\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
index 39e101e77..235e7965a 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
@@ -193,6 +193,12 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -558,33 +564,12 @@
         },
         {
             "Direction": "Input",
-            "Index": 49,
-            "Name": "Cpu Caterr",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 48,
-            "Name": "Cpu Err2",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 63,
             "Name": "PU 240VA Status",
             "Polarity": "Low",
             "Type": "Gpio"
         },
         {
-            "Direction": "Out",
-            "Index": 208,
-            "Name": "P3v3bat BridgeEn",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Input",
             "Index": 214,
             "Name": "Nmi Button",
@@ -1687,6 +1672,39 @@
             "Type": "IpmbSensor"
         },
         {
+            "Address": "0x20",
+            "Bus": 10,
+            "Class": "NodePower",
+            "Name": "Node Power",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 255
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 250
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "MP5920"
+        },
+        {
             "GpioPins": [
                 27,
                 26
@@ -1818,7 +1836,11 @@
         }
     ],
     "Name": "TNP Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'D50TNP1SB'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})"
+    ],
     "ProductId": 153,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
index ce98132d6..9431c30a6 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
@@ -162,7 +162,12 @@
             "Type": "ADC"
         },
         {
-            "BridgeGpio": 208,
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -656,13 +661,6 @@
             "Type": "FanRedundancy"
         },
         {
-            "Direction": "Out",
-            "Index": 208,
-            "Name": "Bridge P3VBAT",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Input",
             "Index": 40,
             "Name": "NMI Input",
@@ -671,20 +669,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 48,
-            "Name": "CPU ERR2",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 49,
-            "Name": "CPU CATERR",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 214,
             "Name": "SMI Input",
             "Polarity": "High",
@@ -1197,7 +1181,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 65.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1439,7 +1423,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1464,7 +1448,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1490,7 +1474,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1515,7 +1499,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1541,7 +1525,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1567,7 +1551,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1592,7 +1576,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1669,7 +1653,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 75.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1686,16 +1670,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 1 Temp"
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR P1V8"
             ],
-            "Name": "VR 1 Temp",
+            "Name": "CPU 1 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1711,16 +1697,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 2 Temp"
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR P1V8"
             ],
-            "Name": "VR 2 Temp",
+            "Name": "CPU 2 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -2036,7 +2024,11 @@
         }
     ],
     "Name": "WC Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonCity'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})"
+    ],
     "ProductId": 145,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -2044,5 +2036,9 @@
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-    }
+    },
+    "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+        "AssetTag": "$PRODUCT_ASSET_TAG"
+    },
+    "xyz.openbmc_project.Inventory.Item.System": {}
 }
\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
index 923924a0b..7da6fe261 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
@@ -162,7 +162,12 @@
             "Type": "ADC"
         },
         {
-            "BridgeGpio": 208,
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -656,20 +661,6 @@
             "Type": "FanRedundancy"
         },
         {
-            "Direction": "Out",
-            "Index": 208,
-            "Name": "Bridge P3VBAT",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 49,
-            "Name": "CPU CATERR",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Input",
             "Index": 214,
             "Name": "SMI Input",
@@ -1183,7 +1174,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 65.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1425,7 +1416,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1450,7 +1441,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1476,7 +1467,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1501,7 +1492,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1527,7 +1518,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1553,7 +1544,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1578,7 +1569,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1655,7 +1646,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 75.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1672,16 +1663,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 1 Temp"
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR P1V8"
             ],
-            "Name": "VR 1 Temp",
+            "Name": "CPU 1 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1697,16 +1690,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 2 Temp"
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR P1V8"
             ],
-            "Name": "VR 2 Temp",
+            "Name": "CPU 2 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -2022,7 +2017,11 @@
         }
     ],
     "Name": "WP Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonPoint'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})"
+    ],
     "ProductId": 154,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -2030,5 +2029,9 @@
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-    }
-}
+    },
+    "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+        "AssetTag": "$PRODUCT_ASSET_TAG"
+    },
+    "xyz.openbmc_project.Inventory.Item.System": {}
+}
\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb
deleted file mode 100644
index 9c10c5b3d..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Set Wolfpass fan default speeds"
-DESCRIPTION = "Sets all fans to a single speed"
-
-inherit allarch
-inherit obmc-phosphor-systemd
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-RDEPENDS_${PN} += "python"
-
-S = "${WORKDIR}"
-SRC_URI += "file://set_fan_speeds.py"
-
-SYSTEMD_SERVICE_${PN} += "fan-default-speed.service"
-
-do_install() {
-        install -d ${D}/${bindir}
-        install -m 0755 ${WORKDIR}/set_fan_speeds.py ${D}/${bindir}/set_fan_speeds.py
-}
diff --git a/meta-openbmc-mods/meta-ast2500/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
deleted file mode 100644
index 267fdee43..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Set fans to a default speed
-ConditionFileNotEmpty={bindir}/set_fan_speeds.py
-
-[Service]
-ExecStart={bindir}/set_fan_speeds.py 150
-Type=oneshot
-
-[Install]
-WantedBy=default.target
diff --git a/meta-openbmc-mods/meta-ast2500/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
deleted file mode 100644
index 70ba64799..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-import os
-import glob
-import time
-import sys
-
-HWMON_DIR = "/sys/class/hwmon/hwmon0"
-
-count = 0
-inputs = None
-while not inputs:
-    count += 1
-    if count > 20:
-        print("pwm missing!")
-        sys.exit(0)
-
-    inputs = glob.glob(os.path.join(HWMON_DIR, "pwm*"))
-    time.sleep(5)
-
-inputs = glob.glob(os.path.join(HWMON_DIR, "pwm*"))
-for pwm in inputs:
-    with open(pwm, 'w') as f:
-        f.write(sys.argv[1])
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb
index 1ae1680e0..b8b8f7524 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb
@@ -8,13 +8,25 @@ SYSTEMD_SERVICE_${PN} = "SetBaseboardFru.service"
 S = "${WORKDIR}"
 SRC_URI = "file://checkFru.sh \
            file://SetBaseboardFru.service \
-           file://*.fru.bin"
+           file://create_fru.py"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 RDEPENDS_${PN} = "bash"
 
+python do_compile() {
+    import sys
+    workdir = d.getVar('WORKDIR', True)
+    sys.path.insert(0, workdir)
+    from create_fru import create_fru
+    create_fru('S2600WFT')
+    create_fru('WilsonCity')
+    create_fru('WilsonPoint')
+    create_fru('M50CYP2SB2U')
+    create_fru('D50TNP1SB')
+}
+
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 ${S}/checkFru.sh ${D}/${bindir}/checkFru.sh
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin
deleted file mode 100644
index ba5b96392..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin
+++ /dev/null
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin
deleted file mode 100644
index afd58e6b9..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin
+++ /dev/null
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin
deleted file mode 100644
index 76c4b8d4b..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin
+++ /dev/null
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin
deleted file mode 100644
index 1b9f97ff4..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin
+++ /dev/null
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin
deleted file mode 100644
index fb219c0ce..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin
+++ /dev/null
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh
index 1eb79b299..4b7910198 100755
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh
@@ -22,16 +22,16 @@ done
 
 # wp
 if (($result == 62)); then
-    cat S2600WP.fru.bin > $fruFile
+    cat WilsonPoint.fru.bin > $fruFile
 # wc
 elif (($result == 45)); then
-    cat S2600WC.fru.bin > $fruFile
+    cat WilsonCity.fru.bin > $fruFile
 # cyp
 elif (($result == 60)); then
-    cat S2600CYP.fru.bin > $fruFile
+    cat M50CYP2SB2U.fru.bin > $fruFile
 # tnp
 elif (($result == 12)); then
-    cat S2600TNP.fru.bin > $fruFile
+    cat D50TNP1SB.fru.bin > $fruFile
 # default to wft
 else
     cat S2600WFT.fru.bin > $fruFile
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/create_fru.py b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/create_fru.py
new file mode 100755
index 000000000..7f11cbf2d
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/create_fru.py
@@ -0,0 +1,154 @@
+#!/usr/bin/python3
+
+"""
+This script generates a default baseboard fru file.
+"""
+
+
+def create_fru(name):
+    if len(name) > 16:
+        raise Exception('Product Name Too Large: {}'.format(name))
+
+    fill_char = ord('.')
+    eof = 0xC1
+
+    filename = '{}.fru.bin'.format(name)
+    name = name.encode('ascii')
+
+    name_len = (0x3 << 6) | len(name)
+
+    # internal area
+    internal = [0x01] + ([0] * 6) + [0x01]
+
+    # chassis area
+    chassis = [0x01,  # Chassis Info Area Format Version Bit Fields
+               0xFF,  # Chassis Info Area Length (in multiples of 8 bytes)
+               0x17]  # Chassis Type (Main Server Chassis)
+
+    fill_len = 18
+
+    # Chassis Part Number
+    chassis += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)
+
+    # Chassis Serial Number
+    chassis += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)
+
+    fill_len = 31
+    chassis += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)  # Info AM1
+    chassis += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)  # Info AM2
+
+    chassis.append(eof)
+
+    chassis.append(0)  # need room for checksum
+
+    while len(chassis) % 8:  # pad
+        chassis.append(0)
+
+    chassis[1] = int(len(chassis) / 8)  # populate length
+    chassis[-1] = (256 - sum(chassis)) & 0xFF  # populate checksum
+
+    # board area
+    board = [0x1,  # Board Info Area Format Version Bit Fields
+             0xFF,  # Board Info Area Length (in multiples of 8 bytes)
+             0x0,  # Language Code
+             0x0,  # Mfg. Date/Time
+             0x0,  # Mfg. Date/Time
+             0x0,  # Mfg. Date/Time
+             0xD1]  # Product Manufacturer Name Len
+
+    corp = b'Intel Corporation'
+    board += bytearray(corp)  # Manufacturer Name
+
+    board.append(name_len)
+    board += bytearray(name)  # Board Product Name
+
+    fill_len = 12
+    board += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)  # board SN
+
+    fill_len = 10
+    board += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)  # board PN
+
+    version = b'FRU Ver 0.01'
+
+    board += [0x3 << 6 | len(version)]  # FRU File version ID string
+    board += bytearray(version)
+
+    board.append(eof)
+
+    board.append(0)  # need room for checksum
+
+    while len(board) % 8:
+        board.append(0)
+
+    board[1] = int(len(board) / 8)  # populate length
+    board[-1] = (256 - sum(board)) & 0xFF  # populate checksum
+
+    # product area
+    product = [1,  # Product Info Area Format Version Bit Fields
+               0xFF,  # Product Info Area Length (in multiples of 8 bytes)
+               0x0,  # Language Code
+               0xD1]  # Product Manufacturer Name Len
+
+    product += bytearray(corp)  # Manufacturer Name
+
+    product.append(name_len)  # Product Name Len
+    product += bytearray(name)  # Product Name
+
+    fill_len = 10
+
+    # Product Part Number
+    product += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)
+
+    # Product Version
+    fill_len = 20
+    product += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)
+
+    # Product Serial Number
+    fill_len = 12
+    product += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)
+
+    # Asset Tag
+    fill_len = 20
+    product += [0x3 << 6 | fill_len] + ([fill_char] * fill_len)
+
+    product.append(0xC0)  # FRU File ID (Not used)
+    product.append(eof)
+
+    product.append(0)  # need room for checksum
+
+    while len(product) % 8:
+        product.append(0)
+
+    product[1] = int(len(product) / 8)
+    product[-1] = (256 - sum(product)) & 0xFF
+
+    header = [0x1]
+    length = 1  # internal
+    header.append(length)
+    length += int(len(internal) / 8)
+    header.append(length)
+    length += int(len(chassis) / 8)
+    header.append(length)
+    length += int(len(board) / 8)
+    header.append(length)
+    header.append(0)
+    header.append(0)
+    header.append((256 - sum(header)) & 0xFF)
+
+    result = header + internal + chassis + board + product
+
+    while len(result) < 0x1FF:
+        result.append(0)
+
+    result = bytearray(result)
+
+    # print(result)
+
+    with open(filename, 'wb') as out:
+        out.write(result)
+
+
+if __name__ == '__main__':
+    product_name = input('Enter Product Name: ')
+    create_fru(product_name)
+
diff --git a/meta-openbmc-mods/meta-ast2500/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-ast2500/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"