Merge commit 'a9d9e970071285a9c9fd574774356d4489cce1db' of ssh://github.com/openbmc/openbmc into update2

author: Ed Tanous <ed.tanous@intel.com> 2019-03-20 02:01:13 +0300
committer: Ed Tanous <ed.tanous@intel.com> 2019-03-20 02:01:13 +0300
commit: e5c10e334eee83873c5bc09aac722e12c802c5ff (patch)
tree: 2b5e2d8fc54e4a6c04836ab2f935a21d661b2c1e
parent: 0a33a7ec0b66a3dc40ece30d75cec2afb79ab743 (diff)
parent: a9d9e970071285a9c9fd574774356d4489cce1db (diff)
download: openbmc-e5c10e334eee83873c5bc09aac722e12c802c5ff.tar.xz
97 files changed, 958 insertions, 354 deletions
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..55b152a8c
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,23 @@
+# Stale bot config https://github.com/apps/stale
+
+# Number of days of inactivity before an issue becomes stale (6 months)
+daysUntilStale: 183
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because no activity has
+  occurred in the last 6 months. It will be closed if no activity occurs in the
+  next 30 days. If this issue should not be closed please add a comment.
+  Thank you for your understanding and contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue has been closed because no activity has occurred in the last 7
+  months. Please reopen if this issue should not have been closed. Thank you
+  for your contributions.
diff --git a/README.md b/README.md
index c6849e1f7..83168f6ad 100644
--- a/README.md
+++ b/README.md
@@ -41,9 +41,3 @@ While the code is easily portable across different type of IA platforms,
 currently we use Intel’s Wolf Pass (S2600WP) platform for development and most
 testing.  
 
-
-### How to build for Wolf Pass ###
-```bash
-source oe-init-build-env
-bitbake intel-platforms
-```
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index b9be23fc0..524bcea46 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
 KBRANCH ?= "dev-4.19"
-LINUX_VERSION ?= "4.19.26"
+LINUX_VERSION ?= "4.19.29"
 
-SRCREV="aca5a55b09ffa6a74d5a63fe6a908586a2ad1d80"
+SRCREV="9bd1e03005e74ecfe16f58143714f25793ae1c5d"
 
 require linux-aspeed.inc
diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service
index 95c770837..d23ef909c 100644
--- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service
+++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service
@@ -5,5 +5,5 @@ After=host-gpio.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/power-util mb 1 off
+ExecStart=/usr/sbin/power-util mb off
 SyslogIdentifier=power-util
diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service
index b070edac2..446df3850 100644
--- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service
+++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service
@@ -5,7 +5,7 @@ After=host-gpio.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/power-util mb 1 on
+ExecStart=/usr/sbin/power-util mb on
 SyslogIdentifier=power-util
 
 [Install]
diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util
index 59f91ece7..a2261fb81 100755
--- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util
+++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util
@@ -1,48 +1,96 @@
 #!/bin/bash
 # Usage of this utility
 function usage() {
-	echo "usage: power-util mb 1 [on|off]";
+	echo "usage: power-util mb [on|off|status|cycle|reset]";
+	echo "       power-util sled-cycle"
 }
 
 GPIO_BASE=$(cat /sys/class/gpio/gpio*/base)
 PWR_GPIO=$(($GPIO_BASE + 32 + 3))
 BMC_RDY_GPIO=$(($GPIO_BASE + 144 +1))
+PWR_GOOD=$(($GPIO_BASE + 8 + 6))
+PWR_RESET=$(($GPIO_BASE + 33))
 
-if [ $# -lt 3 ]; then
+power_off() {
+	echo "Shutting down Server $2"
+	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
+	sleep 1
+	echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value
+	sleep 6
+	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
+}
+
+power_on() {
+	echo "Powering on Server $2"
+	echo 0 > /sys/class/gpio/gpio${BMC_RDY_GPIO}/value
+	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
+	echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value
+	sleep 1
+	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
+}
+
+power_status() {
+	st=$(cat /sys/class/gpio/gpio${PWR_GOOD}/value)
+	if [ "$st" == "0" ]; then
+		echo "off"
+	else
+		echo "on"
+	fi
+}
+
+power_reset() {
+	echo "Reset on server $2"
+	echo 0 > /sys/class/gpio/gpio${PWR_RESET}/value
+  sleep 0.1
+	echo 1 > /sys/class/gpio/gpio${PWR_RESET}/value
+}
+
+sled_cycle() {
+	i2cset -y 7 0x45 0xd9 c
+}
+
+if [ $# -lt 2 ]; then
 	echo "Total number of parameter=$#"
 	echo "Insufficient parameter"
 	usage;
 	exit 0;
 fi
 
-if [ $1 != "mb" ]; then
-	echo "Invalid parameter1=$1"
-	usage;
-	exit 0;
+if [ $1 == "sled-cycle" ]; then
+	sled_cycle
 fi
 
-if [ $2 -ne 1 ]; then
-	echo "Invalid parameter2=$2, Server $2 not supported"
+if [ $1 != "mb" ]; then
+	echo "Invalid parameter1=$1"
 	usage;
 	exit 0;
 fi
 
-if [ $3 = "on" ]; then
-	echo "Powering on Server $2"
-	echo 0 > /sys/class/gpio/gpio${BMC_RDY_GPIO}/value
-	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
-	echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value
-	sleep 1
-	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
-elif [ $3 = "off" ]; then
-	echo "Shutting down Server $2"
-	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
-	sleep 1
-	echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value
-	sleep 6
-	echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value
+if [ $2 = "on" ]; then
+  if [ $(power_status) == "off" ]; then
+	  power_on
+  fi
+elif [ $2 = "off" ]; then
+  if [ $(power_status) == "on" ]; then
+	  power_off
+  fi
+elif [ $2 == "cycle" ]; then
+  if [ $(power_status) == "on" ]; then
+	  power_off
+  else
+    echo "WARNING: Powering on server"
+  fi
+	power_on
+elif [ $2 == "reset" ]; then
+  if [ $(power_status) == "on" ]; then
+	  power_reset
+  else
+    echo "ERROR: Server not powered on"
+  fi
+elif [ $2 == "status" ]; then
+	power_status
 else
-	echo "Invalid parameter3=$3"
+	echo "Invalid parameter2=$2"
 	usage;
 fi
 
diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh
index 4e13109cb..1b1b2e3f0 100755
--- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh
+++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh
@@ -17,12 +17,22 @@ GPIO_BASE=$(cat /sys/class/gpio/gpio*/base)
 set_gpio_active_low $((${GPIO_BASE} + 144 +1)) high
 
 # FM_BMC_SSB_SMI_LPC_N, GPIO Q6, active low
-set_gpio_active_low $((${GPIO_BASE} + 128 + 6)) high
+#set_gpio_active_low $((${GPIO_BASE} + 128 + 6)) high
 
 # FP_PWR_BTN_PASS_R_N, GPIO E3, active low
 set_gpio_active_low $((${GPIO_BASE} + 32 + 3)) high
 
 # FP_PWR_GOOD, GPIO B6, active low
-set_gpio_active_low $((${GPIO_BASE} + 8 + 6)) high
+set_gpio_active_low $((${GPIO_BASE} + 8 + 6)) in
+
+# SYSRST_BTN_OUT_N, GPIO E1, active low
+set_gpio_active_low $((${GPIO_BASE} + 32 + 1)) high
+
+# FP_PECI_MUX, active low
+set_gpio_active_low $((${GPIO_BASE} + 212)) high
+
+# Set PECI Mux to high to select Peci interface
+echo 1 > /sys/class/gpio/gpio$((${GPIO_BASE} + 212))/value
+
 
 exit 0;
diff --git a/meta-google/README.md b/meta-google/README
index 7399b0305..ef22a55af 100644
--- a/meta-google/README.md
+++ b/meta-google/README
@@ -18,7 +18,7 @@ Please submit any patches against the meta-google layer to the OpenBMC gerrit ht
 
 Layer maintainer: Patrick Venture <venture@google.com>
 
-When sending patches, following [OpenBMC guidelines](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md).
+When sending patches, follow the OpenBMC guidelines.
 
 Table of Contents
 =================
@@ -48,13 +48,13 @@ other layers needed. e.g.:
 II.  Purpose
 ============
 
-Including this layer adds the following packages to your `obmc-phosphor-image`:
+Including this layer adds the following packages to your obmc-phosphor-image:
 
-* [google-ipmi-sys](https://github.com/openbmc/google-ipmi-sys): OEM IPMI Handler for providing specific information to the host.
-* [phosphor-ipmi-blobs](https://github.com/openbmc/phosphor-ipmi-blobs): OEM IPMI Blobs Handler for providing the framework for specific blob handlers.
-* [phosphor-ipmi-ethstats](https://github.com/openbmc/phosphor-ipmi-ethstats): OEM IPMI Handler for reporting ethernet device statistics from the BMCs ethernet devices.
-* [phosphor-ipmi-flash](https://github.com/openbmc/phosphor-ipmi-flash): OEM IPMI Handler for controlling in-band firmware updates.
+* google-ipmi-sys: OEM IPMI Handler for providing specific information to the host.
+* phosphor-ipmi-blobs: OEM IPMI Blobs Handler for providing the framework for specific blob handlers.
+* phosphor-ipmi-ethstats: OEM IPMI Handler for reporting ethernet device statistics from the BMCs ethernet devices.
+* phosphor-ipmi-flash: OEM IPMI Handler for controlling in-band firmware updates.
 
 III. Customizations
 
-Presently, this layer also enables the Google Iana for registering `phosphor-ipmi-ethstats` in addition to the OpenBMC one.
+Presently, this layer also enables the Google Iana for registering phosphor-ipmi-ethstats in addition to the OpenBMC one.
diff --git a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb
index 4cfcd9bd5..053a77c95 100644
--- a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb
+++ b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb
@@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/google-ipmi-i2c"
-SRCREV = "d7f368aae016cb2987ee0499b79174cb0ef79f6a"
+SRCREV = "605687d8a0df0d8f304c7fc7f1f654d95c956a08"
 
 FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
 FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb
index 9d3ef1876..3c0ef6a53 100644
--- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb
+++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb
@@ -18,7 +18,7 @@ DEPENDS += "nlohmann-json"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/google-ipmi-sys"
-SRCREV = "a289fa2e2f7a0e9ef5b896e26f4f91d39df30b9e"
+SRCREV = "6667a646bff33fdd22e69363e2313e2e61e10e53"
 
 FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
 FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf
new file mode 100644
index 000000000..85f35c190
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf
@@ -0,0 +1,2 @@
+local-tty = ttyS2
+local-tty-baud = 115200
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend
new file mode 100644
index 000000000..91909f129
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_stardragon4800-rep2 := "${THISDIR}/${PN}:"
+OBMC_CONSOLE_HOST_TTY = "ttyS2"
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb
new file mode 100644
index 000000000..879f7a520
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend_stardragon4800-rep2 := "${THISDIR}/${PN}:"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRC_URI += "file://stardragon4800-rep2-console-client.sh"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/stardragon4800-rep2-console-client.sh ${D}${bindir}/stardragon4800-rep2-console-client.sh
+}
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh
new file mode 100644
index 000000000..a95c1a656
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+#Control UART mux for obmc-console-client
+echo 0 > /sys/class/gpio/gpio325/value
+obmc-console-client
+echo 1 > /sys/class/gpio/gpio325/value
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service
new file mode 100644
index 000000000..dce0eec0d
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Control UART mux for obmc-console-client
+
+[Service]
+ExecStart=/usr/bin/env stardragon4800-rep2-console-client.sh
+SyslogIdentifier=stardragon4800-rep2-console-client.sh
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
new file mode 100644
index 000000000..e968f08e7
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
@@ -0,0 +1,7 @@
+LABEL_temp1=SYS_SOC_TEMP_L
+CRITLO_temp1=0
+CRITHI_temp1=100000
+
+LABEL_temp2=SYS_SOC_TEMP_R
+CRITLO_temp2=0
+CRITHI_temp2=100000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
new file mode 100644
index 000000000..a1ba06196
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
@@ -0,0 +1,5 @@
+LABEL_in1=VREG_5P0
+WARNLO_in1=4758
+WARNHI_in1=5258
+CRITLO_in1=4507
+CRITHI_in1=5509
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
new file mode 100644
index 000000000..8edf80c69
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
@@ -0,0 +1,5 @@
+LABEL_in1=VREG_3P3
+WARNLO_in1=3130
+WARNHI_in1=3474
+CRITLO_in1=2974
+CRITHI_in1=3631
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
new file mode 100644
index 000000000..b083035d3
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
@@ -0,0 +1,5 @@
+LABEL_in1=VREG_3P3_AUX
+WARNLO_in1=3130
+WARNHI_in1=3474
+CRITLO_in1=2974
+CRITHI_in1=3631
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
new file mode 100644
index 000000000..fc0896b0f
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
@@ -0,0 +1,5 @@
+LABEL_in1=VREG_5P0_USB
+WARNLO_in1=4758
+WARNHI_in1=5258
+CRITLO_in1=4507
+CRITHI_in1=5509
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
new file mode 100644
index 000000000..91a38eec8
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
@@ -0,0 +1,5 @@
+LABEL_in1=PVDDQ_510
+WARNLO_in1=1144
+WARNHI_in1=1264
+CRITLO_in1=1080
+CRITHI_in1=1320
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
new file mode 100644
index 000000000..d86a58890
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
@@ -0,0 +1,5 @@
+LABEL_in1=PVDDQ_423
+WARNLO_in1=1144
+WARNHI_in1=1264
+CRITLO_in1=1080
+CRITHI_in1=1320
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
new file mode 100644
index 000000000..e968f08e7
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
@@ -0,0 +1,7 @@
+LABEL_temp1=SYS_SOC_TEMP_L
+CRITLO_temp1=0
+CRITHI_temp1=100000
+
+LABEL_temp2=SYS_SOC_TEMP_R
+CRITLO_temp2=0
+CRITHI_temp2=100000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
new file mode 100644
index 000000000..6a0bab548
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
@@ -0,0 +1,7 @@
+LABEL_temp1=SYS_INLET_0_L
+CRITLO_temp1=0
+CRITHI_temp1=50000
+
+LABEL_temp2=SYS_INLET_0_R
+CRITLO_temp2=0
+CRITHI_temp2=50000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
new file mode 100644
index 000000000..b85648222
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=SYS_INLET_1
+CRITLO_temp1=0
+CRITHI_temp1=50000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
new file mode 100644
index 000000000..2ed024e34
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=SYS_INLET_2
+CRITLO_temp1=0
+CRITHI_temp1=50000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
new file mode 100644
index 000000000..ee3b5d5e5
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=SYS_INLET_3
+CRITLO_temp1=0
+CRITHI_temp1=50000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
new file mode 100644
index 000000000..2805cadb2
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
@@ -0,0 +1,27 @@
+LABEL_in1=HSC_AUX_VIN
+WARNLO_in1=11431
+WARNHI_in1=12567
+CRITLO_in1=10792
+CRITHI_in1=13206
+
+LABEL_in2=HSC_AUX_VOUT
+WARNLO_in2=11431
+WARNHI_in2=12567
+CRITLO_in2=10792
+CRITHI_in2=13206
+
+LABEL_curr1=HSC_AUX_IOUT
+WARNLO_curr1=0
+WARNHI_curr1=50058
+CRITLO_curr1=0
+CRITHI_curr1=60021
+
+LABEL_power1=HSC_AUX_PIN
+WARNLO_power1=0
+WARNHI_power1=601520
+CRITLO_power1=0
+CRITHI_power1=721240
+
+LABEL_temp1=HSC_AUX_TEMP
+CRITLO_temp1=0
+CRITHI_temp1=105000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
new file mode 100644
index 000000000..3c4ebbae6
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
@@ -0,0 +1,27 @@
+LABEL_in1=HSC_HDD_VIN
+WARNLO_in1=11431
+WARNHI_in1=12567
+CRITLO_in1=10792
+CRITHI_in1=13206
+
+LABEL_in2=HSC_HDD_VOUT
+WARNLO_in2=11431
+WARNHI_in2=12567
+CRITLO_in2=10792
+CRITHI_in2=13206
+
+LABEL_curr1=HSC_HDD_IOUT
+WARNLO_curr1=0
+WARNHI_curr1=11993
+CRITLO_curr1=0
+CRITHI_curr1=15008
+
+LABEL_power1=HSC_HDD_PIN
+WARNLO_power1=0
+WARNHI_power1=143200
+CRITLO_power1=0
+CRITHI_power1=179200
+
+LABEL_temp1=HSC_HDD_TEMP
+CRITLO_temp1=0
+CRITHI_temp1=60000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
new file mode 100644
index 000000000..01b32101d
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
@@ -0,0 +1,27 @@
+LABEL_in1=HSC_FAN_VIN
+WARNLO_in1=11431
+WARNHI_in1=12567
+CRITLO_in1=10792
+CRITHI_in1=13206
+
+LABEL_in2=HSC_FAN_VOUT
+WARNLO_in2=11431
+WARNHI_in2=12567
+CRITLO_in2=10792
+CRITHI_in2=13206
+
+LABEL_curr1=HSC_FAN_IOUT
+WARNLO_curr1=0
+WARNHI_curr1=24948
+CRITLO_curr1=0
+CRITHI_curr1=29988
+
+LABEL_power1=HSC_FAN_PIN
+WARNLO_power1=0
+WARNHI_power1=298980
+CRITLO_power1=0
+CRITHI_power1=359380
+
+LABEL_temp1=HSC_FAN_TEMP
+CRITLO_temp1=0
+CRITHI_temp1=105000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
new file mode 100644
index 000000000..5a6fe7ec3
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
@@ -0,0 +1,17 @@
+LABEL_fan1=PSU_FAN
+CRITLO_fan1=535
+CRITHI_fan1=13054
+
+LABEL_temp3=PSU_TEMP_AMB
+CRITLO_temp3=0
+CRITHI_temp3=50000
+
+LABEL_temp1=PSU_TEMP_HS
+CRITLO_temp1=0
+CRITHI_temp1=100000
+
+LABEL_in1=PSU_VIN
+WARNLO_in1=96000
+WARNHI_in1=0
+CRITLO_in1=0
+CRITHI_in1=253000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
new file mode 100644
index 000000000..1e21d96d6
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
@@ -0,0 +1,47 @@
+LABEL_fan1=SYS_FAN_1_F
+CRITLO_fan1=535
+CRITHI_fan1=26964
+GAIN_fan1=0.85
+OFFSET_fan1=0
+
+LABEL_fan2=SYS_FAN_1_R
+CRITLO_fan2=535
+CRITHI_fan2=26964
+GAIN_fan2=0.8
+OFFSET_fan2=0
+
+LABEL_fan8=SYS_FAN_2_F
+CRITLO_fan8=535
+CRITHI_fan8=26964
+GAIN_fan8=0.85
+OFFSET_fan8=0
+
+LABEL_fan3=SYS_FAN_2_R
+CRITLO_fan3=535
+CRITHI_fan3=26964
+GAIN_fan3=0.8
+OFFSET_fan3=0
+
+LABEL_fan4=SYS_FAN_3_F
+CRITLO_fan4=535
+CRITHI_fan4=26964
+GAIN_fan4=0.85
+OFFSET_fan4=0
+
+LABEL_fan5=SYS_FAN_3_R
+CRITLO_fan5=535
+CRITHI_fan5=26964
+GAIN_fan5=0.8
+OFFSET_fan5=0
+
+LABEL_fan11=SYS_FAN_4_F
+CRITLO_fan11=535
+CRITHI_fan11=26964
+GAIN_fan11=0.85
+OFFSET_fan11=0
+
+LABEL_fan6=SYS_FAN_4_R
+CRITLO_fan6=535
+CRITHI_fan6=26964
+GAIN_fan6=0.8
+OFFSET_fan6=0
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
new file mode 100644
index 000000000..20dad4b44
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
@@ -0,0 +1,47 @@
+LABEL_fan1=SYS_FAN_5_F
+CRITLO_fan1=535
+CRITHI_fan1=26964
+GAIN_fan1=0.85
+OFFSET_fan1=0
+
+LABEL_fan2=SYS_FAN_5_R
+CRITLO_fan2=535
+CRITHI_fan2=26964
+GAIN_fan2=0.8
+OFFSET_fan2=0
+
+LABEL_fan8=SYS_FAN_6_F
+CRITLO_fan8=535
+CRITHI_fan8=26964
+GAIN_fan8=0.85
+OFFSET_fan8=0
+
+LABEL_fan3=SYS_FAN_6_R
+CRITLO_fan3=535
+CRITHI_fan3=26964
+GAIN_fan3=0.8
+OFFSET_fan3=0
+
+LABEL_fan4=SYS_FAN_7_F
+CRITLO_fan4=535
+CRITHI_fan4=26964
+GAIN_fan4=0.85
+OFFSET_fan4=0
+
+LABEL_fan5=SYS_FAN_7_R
+CRITLO_fan5=535
+CRITHI_fan5=26964
+GAIN_fan5=0.8
+OFFSET_fan5=0
+
+LABEL_fan11=SYS_FAN_8_F
+CRITLO_fan11=535
+CRITHI_fan11=26964
+GAIN_fan11=0.85
+OFFSET_fan11=0
+
+LABEL_fan6=SYS_FAN_8_R
+CRITLO_fan6=535
+CRITHI_fan6=26964
+GAIN_fan6=0.8
+OFFSET_fan6=0
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
new file mode 100644
index 000000000..1c85be91a
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
@@ -0,0 +1,7 @@
+LABEL_temp1=FAN_BD_TEMP_L
+CRITLO_temp1=0
+CRITHI_temp1=60000
+
+LABEL_temp2=FAN_BD_TEMP_R
+CRITLO_temp2=0
+CRITHI_temp2=60000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
new file mode 100644
index 000000000..a7e74da32
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=SYS_OUTLET_3
+CRITLO_temp1=0
+CRITHI_temp1=100000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
new file mode 100644
index 000000000..0bb21b236
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
@@ -0,0 +1,7 @@
+LABEL_temp1=SYS_OUTLET_0_L
+CRITLO_temp1=0
+CRITHI_temp1=100000
+
+LABEL_temp2=SYS_OUTLET_0_R
+CRITLO_temp2=0
+CRITHI_temp2=100000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
new file mode 100644
index 000000000..f794c0e7b
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=SYS_OUTLET_1
+CRITLO_temp1=0
+CRITHI_temp1=100000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
new file mode 100644
index 000000000..3834fc2dd
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
@@ -0,0 +1,3 @@
+LABEL_temp1=SYS_OUTLET_2
+CRITLO_temp1=0
+CRITHI_temp1=100000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf
new file mode 100644
index 000000000..1311e52bb
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf
@@ -0,0 +1,73 @@
+LABEL_temp1=SOC_TEMP
+CRITLO_temp1=0
+CRITHI_temp1=94000
+
+LABEL_temp2=PMF2432_TEMP
+CRITLO_temp2=0
+CRITHI_temp2=103000
+
+LABEL_temp3=PMF2433_TEMP
+CRITLO_temp3=0
+CRITHI_temp3=103000
+
+LABEL_temp4=CVR_APC_TEMP
+CRITLO_temp4=0
+CRITHI_temp4=103000
+
+LABEL_temp5=CVR_CBF_TEMP
+CRITLO_temp5=0
+CRITHI_temp5=103000
+
+LABEL_temp6=DIMM_C0D0_TEMP
+CRITLO_temp6=0
+CRITHI_temp6=83000
+
+LABEL_temp7=DIMM_C0D1_TEMP
+CRITLO_temp7=0
+CRITHI_temp7=83000
+
+LABEL_temp8=DIMM_C1D0_TEMP
+CRITLO_temp8=0
+CRITHI_temp8=83000
+
+LABEL_temp9=DIMM_C1D1_TEMP
+CRITLO_temp9=0
+CRITHI_temp9=83000
+
+LABEL_temp10=DIMM_C2D0_TEMP
+CRITLO_temp10=0
+CRITHI_temp10=83000
+
+LABEL_temp11=DIMM_C2D1_TEMP
+CRITLO_temp11=0
+CRITHI_temp11=83000
+
+LABEL_temp12=DIMM_C3D0_TEMP
+CRITLO_temp12=0
+CRITHI_temp12=83000
+
+LABEL_temp13=DIMM_C3D1_TEMP
+CRITLO_temp13=0
+CRITHI_temp13=83000
+
+LABEL_temp14=DIMM_C4D0_TEMP
+CRITLO_temp14=0
+CRITHI_temp14=83000
+
+LABEL_temp15=DIMM_C4D1_TEMP
+CRITLO_temp15=0
+CRITHI_temp15=83000
+
+LABEL_temp16=DIMM_C5D0_TEMP
+CRITLO_temp16=0
+CRITHI_temp16=83000
+
+LABEL_temp17=DIMM_C5D1_TEMP
+CRITLO_temp17=0
+CRITHI_temp17=83000
+
+LABEL_power1=SOC_PWR
+WARNLO_power1=0
+WARNHI_power1=120000
+CRITLO_power1=0
+CRITHI_power1=130000
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf
new file mode 100644
index 000000000..86d33962d
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf
@@ -0,0 +1,30 @@
+LABEL_in1=SYS_3V3
+GAIN_in1=2.40
+WARNLO_in1=3132
+WARNHI_in1=3463
+CRITLO_in1=2975
+CRITHI_in1=3637
+LABEL_in2=SYS_5V0
+GAIN_in2=3.86
+WARNLO_in2=4744
+WARNHI_in2=5253
+CRITLO_in2=4502
+CRITHI_in2=5494
+LABEL_in3=SYS_12V0
+GAIN_in3=8.82
+WARNLO_in3=11408
+WARNHI_in3=12586
+CRITLO_in3=10850
+CRITHI_in3=13206
+LABEL_in6=SYS_3V3_AUX
+GAIN_in6=2.40
+WARNLO_in6=3132
+WARNHI_in6=3463
+CRITLO_in6=2975
+CRITHI_in6=3637
+LABEL_in8=SYS_3V0_Battery
+GAIN_in8=1.66
+WARNLO_in8=2849
+WARNHI_in8=3460
+CRITLO_in8=2701
+CRITHI_in8=3629
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
new file mode 100644
index 000000000..5d89e8267
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -0,0 +1,34 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+NAMES = " apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d \
+         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f \
+         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d \
+         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f \
+         apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c \
+         apb/i2c@1e78a000/i2c-bus@180/ir38163@42 \
+         apb/i2c@1e78a000/i2c-bus@180/ir38163@44 \
+         apb/i2c@1e78a000/i2c-bus@180/ir38163@46 \
+         apb/i2c@1e78a000/i2c-bus@180/ir38163@48 \
+         apb/i2c@1e78a000/i2c-bus@180/pxm1310@02 \
+         apb/i2c@1e78a000/i2c-bus@180/pxm1310@04 \
+         apb/i2c@1e78a000/i2c-bus@80/tmp421@1c \
+         apb/i2c@1e78a000/i2c-bus@80/tmp421@1e \
+         apb/i2c@1e78a000/i2c-bus@80/tmp421@2a \
+         apb/i2c@1e78a000/i2c-bus@80/tmp421@4e \
+         apb/i2c@1e78a000/i2c-bus@300/adm1278@10 \
+         apb/i2c@1e78a000/i2c-bus@300/adm1278@11 \
+         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12 \
+         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20 \
+         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23 \
+         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d \
+         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58 \
+         flash-controller@1e631000/spi2@0 \
+"
+
+ITEMSFMT = "ahb/{0}.conf"
+
+ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
+ITEMS += "iio-hwmon.conf"
+
+ENVS = "obmc/hwmon/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh
new file mode 100644
index 000000000..640ad767b
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh
@@ -0,0 +1,129 @@
+#!/bin/sh -e
+# SOC update tool, need two parameter(soc update file name and TFTP ip)
+
+if [ ! -n "$1" -o ! -n "$2" ] ;then
+    echo "Please enter SOC-ImageName and TFTP-IP."
+    echo "Format: socupdate.sh FileName IP"
+    echo "Example: socupdate.sh 0ACJAXXX.ROM 192.168.1.1"
+    exit
+fi
+
+echo "SOC update start."
+
+echo "Check BMC status."
+checkbmc='gpioutil -p Q4'
+if $checkbmc = "1"; then
+    echo "BMC is ready."
+else
+    echo "BMC isn't ready."
+    exit
+fi
+
+echo "Check SOC image does it exist."
+cd /tmp/
+FILEEXIST=0
+if [ -f "/tmp/$1" ]; then
+    GETFILE=`du -k $1 | awk '{print $1}'`
+    if [ "$GETFILE" -eq "65536" ]; then
+        FILEEXIST=1
+        echo "SOC image is exist."
+    else
+        FILEEXIST=0
+    fi
+fi
+
+if [ $FILEEXIST -eq 0 ]; then
+    echo "Get SOC image from TFTP server."
+    echo "Please wait a few minutes."
+    tftp -g -r $1 $2 &
+    sleep 2
+    LENGTH=0
+    ERRCOUNT=0
+    while true
+    do
+        echo -ne "\r["
+        usleep 500000
+        while [ $LENGTH -le 30 ]
+        do
+                usleep 500000
+                echo -n ">"
+                LENGTH=$(($LENGTH+1))
+                if [ -f "/tmp/$1" ]; then
+                    GETFILE=`du -k $1 | awk '{print $1}'`
+                    if [ $GETFILE -eq 65536 ]; then
+                        echo -en "\r"
+                        echo -en "--- Image download completed --- \n"
+                        usleep 1000000
+                        break 2
+                    fi
+                else
+                    ERRCOUNT=$(($ERRCOUNT+1))
+                    if [ $ERRCOUNT -le 10 ]; then
+                        echo -en "\r"
+                        echo -en "SOC-ImageName or TFTP-IP is ERROR. \n"
+                        usleep 500000
+                        exit
+                    fi
+                fi
+        done
+        echo -n "]"
+        LENGTH=0
+        usleep 500000
+        echo -en "\r                                "
+    done
+fi
+sleep 3
+
+echo "Switch the host SPI bus to BMC."
+cmd='gpioutil -p C7 -v 1'
+if $cmd 1>/dev/null 2>&1; then
+    echo "Switch completed."
+else
+    echo "Switch failed."
+fi
+echo "Load the ASpeed SMC driver"
+echo 1e630000.flash-controller > /sys/bus/platform/drivers/aspeed-smc/bind
+sleep 2
+chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}')
+echo "---Current Chassisstate $chassisstate---"
+if [ "$chassisstate" == 'On' ];
+then
+    echo "---Chassis on turning it off---"
+    obmcutil chassisoff
+    sleep 10
+fi
+
+echo "Flashcp to update SOC."
+echo "Please wait a few minutes."
+flashcp -v /tmp/$1 /dev/mtd6
+sleep 3
+
+echo "Switch the host SPI bus to HOST."
+cmd1='gpioutil -p C7 -v 0'
+if $cmd1 1>/dev/null 2>&1; then
+    echo "Switch completed."
+else
+    echo "Switch failed."
+fi
+echo "unLoad the ASpeed SMC driver"
+echo 1e630000.flash-controller > /sys/bus/platform/drivers/aspeed-smc/unbind
+echo -ne "SOC update steps is complete.\n"
+if [ "$chassisstate" == 'On' ];
+then
+    echo "5 sec later will be power-on."
+    echo "If wantn't power-on, please CTRL + C leave script."
+    WAITSEC=5
+    while [ $WAITSEC -ge 0 ]
+    do
+        echo -n "Countdown seconds:$WAITSEC"
+        sleep 1
+        echo -en "\r"
+        WAITSEC=$(($WAITSEC-1))
+        if [ $WAITSEC -eq 0 ]; then
+            echo -en "\r"
+            echo -en "--- Power-on ---       \n"
+            obmcutil chassison
+            break 1
+        fi
+    done
+fi
diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb
new file mode 100644
index 000000000..e2ae60afb
--- /dev/null
+++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb
@@ -0,0 +1,13 @@
+SUMMARY = "HXT SOC update"
+DESCRIPTION = "A sample script to help update the host(soc) firmware"
+HOMEPAGE = ""
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+SRC_URI += "file://socupdate.sh"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/socupdate.sh ${D}${bindir}/socupdate.sh
+}
diff --git a/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb
index 4c48369aa..366bfd3f1 100644
--- a/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb
+++ b/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb
@@ -44,7 +44,6 @@ RDEPENDS_${PN}-flash = " \
 
 SUMMARY_${PN}-system = "Inspur System"
 RDEPENDS_${PN}-system = " \
-        obmc-mgr-system \
         bmcweb \
         entity-manager \
         phosphor-webui \
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
new file mode 100644
index 000000000..1543a6249
--- /dev/null
+++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
@@ -0,0 +1,8 @@
+{
+  "customKeyEnable": true,
+  "keyType" : "VT100+",
+  "customConsoleDisplaySize": {
+    "width": 100,
+    "height": 32
+  }
+}
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
new file mode 100644
index 000000000..ff1bfdb09
--- /dev/null
+++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " file://config.json"
+
+do_compile_prepend() {
+        cp -r ${WORKDIR}/config.json ${S}/
+}
+
diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb
index bd5c46be8..8995da79f 100644
--- a/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb
+++ b/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 PV = "2.0+git${SRCPV}"
 
-SRC_URI += "git://github.com/open-power/pdbg.git;branch=master"
-SRCREV = "59ebe397a34570daca3aa296f8cedc7bd3d940de"
+SRC_URI += "git://github.com/open-power/pdbg.git"
+SRCREV = "deb577949a3505064f471e7b7c692e37c38ec8a4"
 
 DEPENDS += "dtc-native"
 
diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass
index a828f0693..eca260de9 100644
--- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass
+++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass
@@ -1,2 +1,2 @@
 SRC_URI += "git://github.com/openbmc/phosphor-networkd"
-SRCREV = "639cfe1f509657547d594b4d38bb215b85110c50"
+SRCREV = "f1aa51cedf4618d084ef9edd613d5f886fc8b73c"
diff --git a/meta-phosphor/classes/phosphor-pid-control.bbclass b/meta-phosphor/classes/phosphor-pid-control.bbclass
index 482b218db..3f69338aa 100644
--- a/meta-phosphor/classes/phosphor-pid-control.bbclass
+++ b/meta-phosphor/classes/phosphor-pid-control.bbclass
@@ -1,5 +1,5 @@
 config_datadir="${datadir}/swampd/"
 # config_path is the location swampd expects to find a json configuration.
 # the file is expected to be named config.json
-config_path="${config_datadir}/config.json"
+config_path="${config_datadir}config.json"
 
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index b1ccbcdae..f1bc7ea27 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -161,13 +161,6 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory ?= \
     "phosphor-ipmi-sensor-inventory-native"
 
 # The phosphor-host-ipmid application is data-driven and requires an input
-# mapping of IPMI channel to DBus objects interfaces and properties.
-# This virtual is a native recipe that provides that mapping by installing
-# configuration files in the format and native sysroot location expected by
-# the phosphor-host-ipmid build process in the native sysroot.
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config ?= "phosphor-ipmi-channel-inventory-native"
-
-# The phosphor-host-ipmid application is data-driven and requires an input
 # yaml of entity association record metadata.
 # This virtual is a native recipe that provides that mapping by installing
 # configuration files in the format and native sysroot location expected by
diff --git a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
index ff214b777..62ca318c3 100644
--- a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
+++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb
@@ -18,6 +18,6 @@ EXTRA_OECONF_append += " \
         "
 
 SRC_URI += "git://github.com/openbmc/gpioplus"
-SRCREV = "b20850288428d2f33d86038555421b365aceefa9"
+SRCREV = "444d6214d532a8b5862ad3a41893ca7079b1e9ff"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account
index 10cfc73ea..82449cad0 100644
--- a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account
+++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account
@@ -14,7 +14,8 @@
 #
 
 # here are the per-package modules (the "Primary" block)
-account	[success=1 new_authtok_reqd=done default=ignore]	pam_unix.so
+account	[success=2 new_authtok_reqd=done default=ignore]	pam_unix.so
+-account [success=1 new_authtok_reqd=done default=ignore]    	pam_ldap.so	 ignore_unknown_user ignore_authinfo_unavail
 # here's the fallback if no module succeeds
 account	requisite			pam_deny.so
 account	required			pam_tally2.so
diff --git a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth
index 4ac58fb54..7bebd9a6a 100644
--- a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth
+++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth
@@ -8,8 +8,10 @@
 # traditional Unix authentication mechanisms.
 
 # here are the per-package modules (the "Primary" block)
-auth	[success=ok default=1]	pam_tally2.so deny=0 unlock_time=0
-auth	[success=1 default=ignore]	pam_unix.so nullok_secure
+auth	[success=ok default=2]	pam_tally2.so deny=0 unlock_time=0
+# Try for local user first, and then try for ldap
+auth	[success=2 default=ignore]	pam_unix.so nullok_secure
+-auth    [success=1 default=ignore]  	pam_ldap.so ignore_unknown_user ignore_authinfo_unavail
 # here's the fallback if no module succeeds
 auth	requisite			pam_deny.so
 # prime the stack with a positive return value if there isn't one already;
diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb
index c650fb650..057052c18 100644
--- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb
+++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb
@@ -37,7 +37,7 @@ DEPENDS_append_class-native = " \
         "
 
 SRC_URI += "git://github.com/openbmc/sdbusplus"
-SRCREV = "3a3bb9e932b2306dafd33ddd2eb31d61ff89b3fb"
+SRCREV = "b5a844697969dfcc3ca664bfd152b73dd0ffa7c0"
 
 PACKAGECONFIG ??= "libsdbusplus transaction"
 PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd"
diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
index 3ae74aa2b..9f5147db6 100644
--- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
+++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb
@@ -19,6 +19,6 @@ EXTRA_OECONF_append += " \
         "
 
 SRC_URI += "git://github.com/openbmc/sdeventplus"
-SRCREV = "08ebb3993a2b5a82d0a5ead29a649c95632f7c64"
+SRCREV = "651e87ad362e55ed4e34e6565fd0674390941a58"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb
index 9168ee13c..13a2c5fe6 100644
--- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \
 and configures system sensors"
 
 SRC_URI = "git://github.com/openbmc/entity-manager.git"
-SRCREV = "550d1b53670e32c91ab4c6d717123a8672a92bd5"
+SRCREV = "93f67b2de03c0edba350e3bc2d1153995d3b75ec"
 PV = "0.1+git${SRCPV}"
 
 LICENSE = "Apache-2.0"
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
index 8183bb220..c04c32dff 100644
--- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
+++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb
@@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native"
 DEPENDS += "sdbus++-native"
 
 SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces"
-SRCREV = "c3b1900e9754b410456e3b8d94a1026cd467f01c"
+SRCREV = "096a5af0a38103e9bf121bef809c8903ee900b3c"
 
 DEPENDS_remove_class-native = "sdbus++-native"
 DEPENDS_remove_class-nativesdk = "sdbus++-native"
diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
index 2899824db..f49201721 100644
--- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
+++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/phosphor-debug-collector"
-SRCREV = "6d7f753ba7ecc2dd062758a46ef77ce5c44b9bdb"
+SRCREV = "fa180596fe2a3c6fe65e48055e02e0c3e4ef5977"
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb
index a5e78645c..2df6e4050 100644
--- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb
@@ -14,7 +14,7 @@ inherit obmc-phosphor-ipmiprovider-symlink
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-pid-control"
-SRCREV = "c32e3fc5d920967ef7fd58a7120096ba2224d41b"
+SRCREV = "b5cc37cebec74f0bd2a8d378d5f911fc4fa3439e"
 
 # Each platform will need a service file that starts
 # at an appropriate time per system.  For instance, if
@@ -28,6 +28,7 @@ DEPENDS += "sdbusplus"
 DEPENDS += "phosphor-logging"
 DEPENDS += "libevdev"
 DEPENDS += "nlohmann-json"
+DEPENDS += "cli11"
 
 # We depend on this to be built first so we can build our providers.
 DEPENDS += "phosphor-ipmi-host"
diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb
index dc3665ebe..d2b568239 100644
--- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b"
 SRC_URI = "git://github.com/openbmc/bmcweb.git"
 
 PV = "1.0+git${SRCPV}"
-SRCREV = "be12c7291914b8a6dd7d6e78f1a500708b0f20f9"
+SRCREV = "603a664025801fd02079298374781f49ce816e5b"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb
index 96e76e6f3..7037ef92b 100644
--- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb
+++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb
@@ -22,6 +22,6 @@ SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket"
 
 SRC_URI += "git://github.com/openbmc/rest-dbus.git"
 
-SRCREV = "403ce23066a8b0f0dca23220530b8760748b168e"
+SRCREV = "9273a302e8f2b3c3e939dff77758e90f163bf6a1"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
new file mode 100644
index 000000000..aba85bc71
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
@@ -0,0 +1,15 @@
+HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool"
+SUMMARY = "Library and Host-side tool for talking to OpenBMC IPMI BLOB handlers."
+DESCRIPTION = "This package provides a library for the BMC and host for core blob mechanics and host-side binaries for talking to OpenBMC IPMI BLOB handlers."
+PR = "r1"
+PV = "0.1+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+inherit autotools pkgconfig
+
+DEPENDS += "autoconf-archive-native"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/openbmc/ipmi-blob-tool"
+SRCREV = "a8356420078bb7e7580fe6c42818e20203c7cbfc"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
new file mode 100644
index 000000000..8d45667cd
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
@@ -0,0 +1,26 @@
+HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs-binarystore"
+SUMMARY = "BMC Generic Binary Blob Store via OEM IPMI Blob Transport"
+DESCRIPTION = "This package provides a read/write/serialize abstraction for storing binary data through IPMI blobs"
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+inherit autotools pkgconfig
+inherit obmc-phosphor-ipmiprovider-symlink
+
+DEPENDS += "autoconf-archive-native"
+DEPENDS += "phosphor-ipmi-blobs"
+DEPENDS += "phosphor-logging"
+DEPENDS += "protobuf-native"
+DEPENDS += "protobuf"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore"
+SRCREV = "8ca234e6986763ffaddcf56b49fecdfe96a60182"
+
+FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}"
+FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+
+BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
index 939c9432d..a82e9f611 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
@@ -12,10 +12,11 @@ inherit obmc-phosphor-ipmiprovider-symlink
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "phosphor-ipmi-host"
 DEPENDS += "phosphor-logging"
+DEPENDS += "ipmi-blob-tool"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs"
-SRCREV = "97898c9056e48d2aa0ec1ec8251377c587b7caee"
+SRCREV = "de8a16e2e85f49e142461b7e6fe901d3f8740fdf"
 
 FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
 FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
deleted file mode 100644
index 043200a71..000000000
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Sample channel configuration for phosphor-host-ipmid"
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-inherit native
-inherit phosphor-ipmi-host
-
-PROVIDES += "virtual/phosphor-ipmi-channel-config"
-
-SRC_URI += "file://channel.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-        # This recipe is supposed to create an output yaml file with
-        # a sample output file.
-
-        DEST=${D}${sensor_datadir}
-        install -d ${DEST}
-        install channel.yaml ${DEST}/channel.yaml
-}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
deleted file mode 100644
index 819f25198..000000000
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Channel Number (must be unique) is the key
-1:
-  # ifName the ethernet device name (used in the dbus path)
-  ifName: eth0
-2:
-  ifName: eth1
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
index ac19cf2e8..7157c7e12 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
@@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats"
-SRCREV = "539f03f54621cad9edc7dee5a9b570c96f486dfe"
+SRCREV = "d087d81ae3cad0df1d641c87144909e46fcb20fb"
 
 FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
 FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
index 8484ddf5d..7dd4cfcf2 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
@@ -13,10 +13,11 @@ DEPENDS += "autoconf-archive-native"
 DEPENDS += "phosphor-ipmi-blobs"
 DEPENDS += "phosphor-logging"
 DEPENDS += "sdbusplus"
+DEPENDS += "ipmi-blob-tool"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash"
-SRCREV = "98af2d1d8dcac298fbe793683e70f1766e88856b"
+SRCREV = "2bd7021d9adbcc63fda3d904b24e47820b735bad"
 
 FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
 FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index 574d03b77..ceb3c0d7a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -33,7 +33,6 @@ DEPENDS += "sdbus++-native"
 DEPENDS += "virtual/phosphor-ipmi-inventory-sel"
 DEPENDS += "virtual/phosphor-ipmi-fru-merge-config"
 DEPENDS += "virtual/phosphor-ipmi-sensor-inventory"
-DEPENDS += "virtual/phosphor-ipmi-channel-config"
 DEPENDS += "virtual/phosphor-ipmi-entity-config"
 DEPENDS += "boost"
 DEPENDS += "sdeventplus"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
index 3c04d82ec..1fe13d7e3 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \
 implementing IPMB interfaces"
 
 SRC_URI = "git://github.com/openbmc/ipmbbridge.git"
-SRCREV = "a8c77dc857fdf7fc049b975c3b3a6be11e7ea4c0"
+SRCREV = "25e85c79257723b1cb754c20299196685373ce24"
 PV = "0.1+git${SRCPV}"
 
 LICENSE = "Apache-2.0"
diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb
index 3ebc8e35d..c97afb73b 100644
--- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb
@@ -14,7 +14,7 @@ RDEPENDS_${PN} += " \
 S = "${WORKDIR}/git"
 SRC_URI += "git://github.com/openbmc/phosphor-debug-collector"
 
-SRCREV = "6d7f753ba7ecc2dd062758a46ef77ce5c44b9bdb"
+SRCREV = "fa180596fe2a3c6fe65e48055e02e0c3e4ef5977"
 
 do_install() {
        install -d ${D}${bindir}
diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
index e011a5a90..b00067f3f 100644
--- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
+++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb
@@ -12,7 +12,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 SRC_URI += "git://github.com/openbmc/phosphor-snmp"
-SRCREV = "9d18e562853f522d12fcdfeea59436a848b66c50"
+SRCREV = "7f1c6e1d2e0f3d149574edb610b303aa26bc2078"
 
 DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service"
 
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
index 265abacdc..5892c23db 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb
@@ -8,3 +8,7 @@ PACKAGES = "${PN}-libs"
 
 SUMMARY_${PN}-libs = "Extra providers for ipmid."
 RDEPENDS_${PN}-libs = "${VIRTUAL-RUNTIME_phosphor-ipmi-providers}"
+
+# Warning.  Add additional providers with whitelists to distro or machine
+# configuration and not in recipe context (bbappend) otherwise ipmid will not
+# know about your whitelist.
diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
index 7a1195819..d8e86ccd2 100644
--- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors"
 DESCRIPTION = "Dbus Sensor Services Configured from D-Bus"
 
 SRC_URI = "git://github.com/openbmc/dbus-sensors.git"
-SRCREV = "73ca551df007a372e8a542d1ca5179bcfffc66ae"
+SRCREV = "3a1807e08a024ec712d7bc02ad62629ff76570c8"
 
 PV = "0.1+git${SRCPV}"
 
@@ -15,8 +15,9 @@ SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.hwmontempsensor.service"
 SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.cpusensor.service"
 SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.exitairsensor.service"
 SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.ipmbsensor.service"
+SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.intrusionsensor.service"
 
-DEPENDS = "boost nlohmann-json sdbusplus"
+DEPENDS = "boost nlohmann-json sdbusplus i2c-tools"
 inherit cmake systemd
 
 S = "${WORKDIR}/git/"
diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
index d72a4c1af..ec2c9552a 100644
--- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
+++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb
@@ -38,7 +38,7 @@ SRC_URI += "file://70-hwmon.rules"
 SRC_URI += "file://70-iio.rules"
 SRC_URI += "file://start_hwmon.sh"
 
-SRCREV = "09d9c23699f625479c85724c34421c52be7b17e4"
+SRCREV = "9e997b4da98725401769ef82fe26e11c46a059d9"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
deleted file mode 100644
index 9d1761fd8..000000000
--- a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Phosphor System Manager
-Wants=obmc-mapper.target
-After=obmc-mapper.target
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env system_manager.py
-SyslogIdentifier=system_manager.py
-Type=dbus
-BusName={BUSNAME}
-Environment="PYTHONUNBUFFERED=1"
-TimeoutStartSec=180s
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb
deleted file mode 100644
index fa80d0a68..000000000
--- a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "OpenBMC system manager"
-DESCRIPTION = "OpenBMC system manager."
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-
-inherit skeleton-python
-inherit obmc-phosphor-dbus-service
-
-VIRTUAL-RUNTIME_skeleton_workbook ?= ""
-
-RDEPENDS_${PN} += "\
-        python-dbus \
-        python-json \
-        python-subprocess \
-        python-pygobject \
-        pyphosphor \
-        pyphosphor-dbus \
-        ${VIRTUAL-RUNTIME_skeleton_workbook} \
-        "
-
-SKELETON_DIR = "pysystemmgr"
-
-DBUS_SERVICE_${PN} += "org.openbmc.managers.System.service"
diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
index 235981e7a..646add4a1 100644
--- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
@@ -40,5 +40,5 @@ DBUS_SERVICE_phosphor-ldap = " \
         xyz.openbmc_project.LDAP.PrivilegeMapper.service \
 "
 SRC_URI += "git://github.com/openbmc/phosphor-user-manager"
-SRCREV = "5e8ccb979c80044e0fa608f269f55b3613ecfd1c"
+SRCREV = "95a2931473dfa61a30e7a65606dab15ab24cd5b4"
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
index d1e75fabc..7f44590ed 100644
--- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
+++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb
@@ -22,7 +22,7 @@ RDEPENDS_${PN} += "libsystemd"
 RDEPENDS_${PN} += "phosphor-logging"
 
 SRC_URI += "git://github.com/openbmc/phosphor-watchdog"
-SRCREV = "976764158af29113103a9a6acd8911f4f06c6b27"
+SRCREV = "b93377104292de0f94087c0cbb79d4d6d8516b84"
 S = "${WORKDIR}/git"
 
 # Copies config file having arguments for host watchdog
diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb
index d8453fe9b..5dbf8e4da 100644
--- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb
+++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb
@@ -6,7 +6,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 SRC_URI = "git://github.com/openbmc/phosphor-webui.git"
-SRCREV = "6d1d6005abc6cb48144ad5be9cd8fb094f8ff3c2"
+SRCREV = "511a2bbc5540fccb883b8d0005c2b387a23c9d05"
 S = "${WORKDIR}/git"
 
 DEPENDS_prepend = "nodejs-native "
diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf
index 08e9078fc..96db9907b 100644
--- a/meta-quanta/meta-gsj/conf/machine/gsj.conf
+++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf
@@ -23,4 +23,3 @@ OBMC_MACHINE_FEATURES += "\
 PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps"
 PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps"
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-gsj-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-gsj-apps"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
index cca66390c..322ba35f5 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
@@ -8,18 +8,15 @@ PACKAGES = " \
         ${PN}-chassis \
         ${PN}-fans \
         ${PN}-flash \
-        ${PN}-system \
         "
 
 PROVIDES += "virtual/obmc-chassis-mgmt"
 PROVIDES += "virtual/obmc-fan-mgmt"
 PROVIDES += "virtual/obmc-flash-mgmt"
-PROVIDES += "virtual/obmc-system-mgmt"
 
 RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
 RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
 RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
 
 SUMMARY_${PN}-chassis = "GSJ Chassis"
 RDEPENDS_${PN}-chassis = " \
@@ -37,8 +34,3 @@ RDEPENDS_${PN}-flash = " \
         obmc-mgr-download \
         obmc-control-bmc \
         "
-
-SUMMARY_${PN}-system = "GSJ System"
-RDEPENDS_${PN}-system = " \
-        obmc-mgr-system \
-        "
diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg
new file mode 100644
index 000000000..9435516b4
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg
@@ -0,0 +1,48 @@
+CONFIG_HWMON=y
+CONFIG_SENSORS_LM75=y
+CONFIG_SENSORS_FAN=y
+
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+CONFIG_OVERLAY_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_JFFS2_FS=y
+
+CONFIG_MTD_M25P80=y
+CONFIG_SPI_NPCM_FIU=y
+CONFIG_SPI=y
+CONFIG_SPI_NPCM_PSPI=y
+
+CONFIG_NET_NCSI=y
+
+CONFIG_EEPROM_AT24=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_SLAVE_EEPROM=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCF857X=y
+CONFIG_PMBUS=y
+CONFIG_SENSORS_PMBUS=y
+CONFIG_SENSORS_ADM1275=y
+CONFIG_MUX_MMIO=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
+CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_HID=y
diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend
new file mode 100644
index 000000000..e4ccc6cca
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-nuvoton:"
+SRC_URI += "file://gsj.cfg"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network
new file mode 100644
index 000000000..94839637b
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network
@@ -0,0 +1,7 @@
+[Match]
+Name=usb0
+[Address]
+Address=169.254.95.118/16
+[Network]
+LinkLocalAddressing=yes
+IPv6AcceptRA=no
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service
new file mode 100644
index 000000000..913f5fbee
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=enable usb network
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c '/usr/sbin/usb_network.sh'
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh
new file mode 100644
index 000000000..45fa888be
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+cd /sys/kernel/config/usb_gadget
+
+if [ ! -f "g1" ]; then
+    mkdir g1
+    cd g1
+
+    echo 0x1d6b > idVendor  # Linux foundation
+    echo 0x0104 > idProduct # Multifunction composite gadget
+    mkdir -p strings/0x409
+    echo "Linux" > strings/0x409/manufacturer
+    echo "Ethernet/RNDIS gadget" > strings/0x409/product
+    
+    mkdir -p configs/c.1
+    echo 100 > configs/c.1/MaxPower
+    mkdir -p configs/c.1/strings/0x409
+    echo "RNDIS" > configs/c.1/strings/0x409/configuration
+    
+    mkdir -p functions/rndis.usb0 
+    
+    ln -s functions/rndis.usb0 configs/c.1
+    
+    echo f0839000.udc > UDC
+
+fi
+exit 0
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb
new file mode 100644
index 000000000..591ca5afd
--- /dev/null
+++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb
@@ -0,0 +1,29 @@
+FILESEXTRAPATHS_append := "${THISDIR}/files:"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
+
+DEPENDS += "systemd"
+RDEPENDS_${PN} += "libsystemd"
+RDEPENDS_${PN} += "bash"
+
+SRC_URI += "file://usb_network.sh \
+           file://usb_network.service \
+           file://00-bmc-usb0.network"
+
+do_install() {
+    install -d ${D}/${sbindir}
+    install -m 0755 ${WORKDIR}/usb_network.sh ${D}/${sbindir}
+
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/usb_network.service ${D}${systemd_unitdir}/system
+
+    install -d ${D}${sysconfdir_native}/systemd/network/
+    install -m 0644 ${WORKDIR}/00-bmc-usb0.network ${D}${sysconfdir_native}/systemd/network
+}
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "usb_network.service"
+FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+
+inherit allarch systemd
+\ No newline at end of file
diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index b36a09821..ef127e967 100644
--- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -31,7 +31,6 @@ PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_wo
 # These are meant to include the inventory config.yaml and so on.
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "q71l-ipmi-inventory-map-native"
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "q71l-ipmi-sensor-map-native"
-PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config = "q71l-ipmi-channel-config-native"
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-merge-config = "q71l-ipmi-fru-merge-config-native"
 
 
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
deleted file mode 100644
index 215683bcd..000000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Quanta Q71l IPMI Channel to if_name mapping."
-PR = "r1"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-
-inherit native
-inherit phosphor-ipmi-host
-
-PROVIDES += "virtual/phosphor-ipmi-channel-config"
-
-SRC_URI += "file://channel.yaml"
-
-S = "${WORKDIR}"
-
-do_install() {
-	DEST=${D}${sensor_datadir}
-        install -d ${DEST}
-	install channel.yaml ${DEST}/channel.yaml
-}
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml
deleted file mode 100644
index 3cc2cd242..000000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-1:
-  ifName: eth0
-2:
-  ifName: eth1
-
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py b/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py
deleted file mode 100644
index dd08372b7..000000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright (C) 2017 Google Inc.
-#
-# 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.
-
-#!/usr/bin/env python
-"""Basic utility for reading and writing registers on an ASPEED BMC.
-
-The values hardcoded are for the ASPEED AST2400.
-"""
-
-import subprocess
-import sys
-
-IO_TOOL = 'devmem'
-PROTECTION_KEY = '0x1E6E2000'
-HWTRAP = '0x1E6E2070'
-# The AST2400 SCU Password (as int for write_register)
-SCU_PASSWORD = 0x1688A8A8
-
-# Bits 13:12
-SPI_MASK = 0xffffcfff
-# Enable SPI Master
-SPI_MASTER = 0x1000
-# Enable SPI Master and SPI Slave to AHB Bridge
-SPI_MASTER_SLAVE = 0x2000
-# Enable SPI Pass-through
-SPI_BYPASS = 0x3000
-
-
-def read_register(address):
-    """Run a tool to read a register value.
-
-    This will convert it to an integer.
-    """
-
-    output = subprocess.check_output([IO_TOOL, address]).replace('\n', '')
-    value = int(output, 16)
-    return value
-
-
-def write_register(address, value):
-    """Run a tool to write the 32-bit register value."""
-
-    subprocess.check_output([IO_TOOL, address, '32', '0x%x' % value])
-    return
-
-
-def set_master(value):
-    """Set Hardware Strapping to SPI Master."""
-
-    print 'Setting to "SPI Master"'
-
-    masked = value & SPI_MASK
-    masked |= SPI_MASTER
-
-    print 'setting: 0x%x' % masked
-    write_register(HWTRAP, masked)
-
-
-def set_ahb_bridge(value):
-    """Set hardware strapping to spi master and spi-slave to ahb."""
-
-    print 'Setting to "SPI Master and SPI Slave to AHB Bridge"'
-    masked = value & SPI_MASK
-    masked |= SPI_MASTER_SLAVE
-
-    print 'setting: 0x%x' % masked
-    write_register(HWTRAP, masked)
-
-
-def set_bypass(value):
-    """Set hardware strappign to spi bypass."""
-
-    print 'Setting to "Enable SPI Pass-through"'
-    masked = value & SPI_MASK
-    masked |= SPI_BYPASS
-
-    print 'setting: 0x%x' % masked
-    write_register(HWTRAP, masked)
-
-
-def usage():
-    """Print usage string."""
-
-    print 'usage: %s master|bridge|bypass' % sys.argv[0]
-    print 'master sets the BMC SPI to Master.'
-    print ('bridge sets the BMC SPI to Master-Slave bridge to AHB (for BIOS ' +
-        'Update).')
-    print 'bypass sets the BMC SPI to Bypass (default).'
-
-
-def main():
-    """Main entry point for execution."""
-
-    if len(sys.argv) != 2:
-        usage()
-        sys.exit(-1)
-
-    ctrl = sys.argv[1].lower()
-    if ctrl not in ('master', 'bridge', 'bypass'):
-        usage()
-        sys.exit(-1)
-
-    locked = False
-    # Check if locked
-    value = read_register(PROTECTION_KEY)
-    if value == 1:
-        print 'Presently unlocked'
-    else:
-        print 'Presently locked'
-        locked = True
-
-    # if Locked we need to unlock it.
-    if locked:
-        write_register(PROTECTION_KEY, SCU_PASSWORD)
-
-    # Read the value.
-    value = read_register(HWTRAP)
-    if value & SPI_BYPASS == SPI_BYPASS:
-        print 'Presently set to bypass'
-    elif value & SPI_MASTER == SPI_MASTER:
-        print 'Presently set to master'
-    elif value & SPI_MASTER_SLAVE == SPI_MASTER_SLAVE:
-        print 'Presently set to master-slave'
-
-    if ctrl == 'master':
-        set_master(value)
-    elif ctrl == 'bridge':
-        set_ahb_bridge(value)
-    elif ctrl == 'bypass':
-        set_bypass(value)
-
-    # We leave it unlocked in case it was locked.
-    # we could lock it.
-    # TODO(venture): lock it by writing any non-password value.
-
-if __name__ == '__main__':
-    main()
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb
deleted file mode 100644
index 5b2fcf26c..000000000
--- a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Should RDEPENDS on python at the very least.
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://spimaster.py;beginline=1;endline=13;md5=b86c59990b35609be34a0ec322a3cfff"
-
-S = "${WORKDIR}/"
-
-SRC_URI = "file://spimaster.py"
-
-DEPENDS = "python"
-
-FILES_${PN} += "*"
-
-do_install() {
-    install -d ${D}/home
-    install -d ${D}/home/root
-    install -m 0755 ${S}/spimaster.py ${D}/home/root/.
-}
diff --git a/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch b/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch
new file mode 100644
index 000000000..7243fb417
--- /dev/null
+++ b/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch
@@ -0,0 +1,35 @@
+From 1aec49cc45e7cf5ebc059a77081ac3ea2a5aff7b Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Fri, 1 Mar 2019 13:14:56 -0500
+Subject: [PATCH] Fix DES_LONG breakage
+
+Mimic previous BN_LLONG fix by Khem Raj here. Re-use its description:
+
+opensslconf.h is defining DES_LONG only when included from des.h which
+is not robust at all, especially when include guards are used and
+multiple inclusions of a given header is not allowed. so lets take out
+the nesting constraint and add OPENSSL_SYS_UEFI constraint instead
+
+Upstream-Status: Inappropriate [ fixed differently with OpenSSL 1.1+ ]
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ crypto/opensslconf.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
+index a10c10f..0147a4d 100644
+--- a/crypto/opensslconf.h.in
++++ b/crypto/opensslconf.h.in
+@@ -48,7 +48,7 @@
+ #endif
+ #endif
+ 
+-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
++#if !defined(OPENSSL_SYS_UEFI) && !defined(DES_LONG)
+ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+  * %20 speed up (longs are 8 bytes, int's are 4). */
+ #ifndef DES_LONG
+-- 
+2.7.4
+
diff --git a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
index 355dbdcc6..54af100f9 100644
--- a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
+++ b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb
@@ -41,6 +41,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
            file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
            file://0001-allow-manpages-to-be-disabled.patch \
            file://0001-Fix-BN_LLONG-breakage.patch \
+           file://0001-Fix-DES_LONG-breakage.patch \
            "
 
 SRC_URI_append_class-target = " \
diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc
index 0cc0a82de..f47f1aa20 100644
--- a/poky/meta/recipes-graphics/mesa/mesa.inc
+++ b/poky/meta/recipes-graphics/mesa/mesa.inc
@@ -141,8 +141,6 @@ do_install_append () {
     rm -f ${D}${libdir}/gallium-pipe/*.la
     rm -f ${D}${libdir}/gbm/*.la
 
-    # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 
-    rm -f ${D}${sysconfdir}/drirc
     chrpath --delete ${D}${libdir}/dri/*_dri.so || true
 
     # libwayland-egl has been moved to wayland 1.15+
@@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
 
 PACKAGES_DYNAMIC += "^mesa-driver-.*"
 
-FILES_${PN} += "${sysconfdir}/drirc"
-FILES_mesa-megadriver = "${libdir}/dri/*"
+FILES_${PN} = ""
+FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}"
 FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
 FILES_libegl-mesa = "${libdir}/libEGL.so.*"
 FILES_libgbm = "${libdir}/libgbm.so.*"
diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
index cb8102442..f0355db14 100644
--- a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
+++ b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
@@ -5,7 +5,7 @@ After=systemd-udev-settle.service
 Before=sysinit.target
 
 [Service]
-ExecStart=@SBINDIR@/rngd -f -r /dev/urandom
+ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng
 SuccessExitStatus=66
 
 [Install]
author	Ed Tanous <ed.tanous@intel.com>	2019-03-20 02:01:13 +0300
committer	Ed Tanous <ed.tanous@intel.com>	2019-03-20 02:01:13 +0300
commit	e5c10e334eee83873c5bc09aac722e12c802c5ff (patch)
tree	2b5e2d8fc54e4a6c04836ab2f935a21d661b2c1e
parent	0a33a7ec0b66a3dc40ece30d75cec2afb79ab743 (diff)
parent	a9d9e970071285a9c9fd574774356d4489cce1db (diff)
download	openbmc-e5c10e334eee83873c5bc09aac722e12c802c5ff.tar.xz