Merge tag 'wht-0.53' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

14 files changed, 37 insertions, 8 deletions

diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
index 45538ab4e..d37fc56dd 100644
--- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -6,6 +6,8 @@ UBOOT_MACHINE = "ast_g5_ncsi_config"
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 
+SERIAL_CONSOLES = "57600;ttyS4"
+
 OBMC_MACHINE_FEATURES += "\
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-chassis-mgmt \
diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg
index 7ea8dc31a..c093eafc2 100644
--- a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg
+++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg
@@ -1,6 +1,3 @@
-CONFIG_SENSORS_TMP421=y
-CONFIG_SENSORS_MAX31785=y
-CONFIG_RTC_DRV_RV8803=y
-CONFIG_TCG_TPM=y
-CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_NCSI_OEM_CMD_GET_MAC=y
+CONFIG_I2C_SLAVE=y
+CONFIG_IPMB_DEVICE_INTERFACE=y
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf
index 94f1dff85..94f1dff85 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf
new file mode 100644
index 000000000..88aa57cff
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf
@@ -0,0 +1 @@
+socket-id = host0
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf
new file mode 100644
index 000000000..22273d4f3
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf
@@ -0,0 +1 @@
+socket-id = host1
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf
new file mode 100644
index 000000000..0eeb5b785
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf
@@ -0,0 +1 @@
+socket-id = host2
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf
new file mode 100644
index 000000000..be8e82e23
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf
@@ -0,0 +1 @@
+socket-id = host3
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf
new file mode 100644
index 000000000..f800b35a7
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf
@@ -0,0 +1,3 @@
+local-tty = ttyS0
+baud = 57600
+socket-id = host0
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf
new file mode 100644
index 000000000..4a605424b
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf
@@ -0,0 +1,3 @@
+local-tty = ttyS1
+baud = 57600
+socket-id = host1
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf
new file mode 100644
index 000000000..bf37ca363
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf
@@ -0,0 +1,3 @@
+local-tty = ttyS2
+baud = 57600
+socket-id = host2
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf
new file mode 100644
index 000000000..d8c3ebfc5
--- /dev/null
+++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf
@@ -0,0 +1,3 @@
+local-tty = ttyS3
+baud = 57600
+socket-id = host3
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
index 24b52d731..ab61422cb 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,2 +1,16 @@
-FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:"
 OBMC_CONSOLE_HOST_TTY = "ttyS2"
+
+SRC_URI += "file://*.conf"
+SRC_URI_remove = "file://${BPN}.conf"
+
+SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket"
+EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers"
+
+do_install_append() {
+        # Install the server configuration
+        install -m 0755 -d ${D}${sysconfdir}/${BPN}
+        install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/
+        # Remove upstream-provided server configuration
+        rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf
+}
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 8a58a2da2..72d991c7e 100644
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index b3205affa..c2d5ed8b9 100644
--- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_tiogapass = " file://ipmb-channels.json"