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

11 files changed, 129 insertions, 5 deletions

diff --git a/meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch b/meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch
new file mode 100644
index 000000000..a5c1bb2ae
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch
@@ -0,0 +1,27 @@
+From efc627f4a288ea2e7969407f50fc403bb0264df1 Mon Sep 17 00:00:00 2001
+From: Alexander Filippov <a.filippov@yadro.com>
+Date: Wed, 23 Oct 2019 15:51:25 +0300
+Subject: [PATCH] config/ast-common: set fieldmode to true
+
+Force enables field mode. Our system always in production.
+
+Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
+---
+ include/configs/ast-common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
+index a0243083bd..6285fa4037 100644
+--- a/include/configs/ast-common.h
++++ b/include/configs/ast-common.h
+@@ -117,6 +117,7 @@
+ #define ASPEED_ENV_SETTINGS \
+ 	"verify=yes\0"	\
+ 	"spi_dma=yes\0" \
++	"fieldmode=true\0" \
+ 	""
+ 
+ #endif	/* __AST_COMMON_CONFIG_H */
+-- 
+2.21.0
+
diff --git a/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index f0ff09e02..bf7802a68 100644
--- a/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -2,4 +2,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/files:"
 
 SRC_URI_append = " \
     file://0001-Add-system-reset-status-support.patch \
+    file://0002-config-ast-common-set-fieldmode-to-true.patch \
     "
diff --git a/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
new file mode 120000
index 000000000..742334ade
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
@@ -0,0 +1 @@
+u-boot-aspeed_%.bbappend
\ No newline at end of file
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_git.bb
new file mode 100644
index 000000000..0f1bc3aad
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_git.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Command-line interface"
+DESCRIPTION = "YADRO OpenBMC Command Line Interface for end users"
+HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-cli"
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+
+# License info
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+# Dependencies
+DEPENDS = "phosphor-user-manager"
+RDEPENDS_${PN} = "sudo bash"
+
+# Besides executable file we also have shared help
+FILES_${PN} += "${datadir}/cli.help"
+
+# Custom installation procedure
+do_install() {
+  ${B}/install.sh \
+    --dir ${D} \
+    --machine ${MACHINE} \
+    --admin priv-admin \
+    --operator priv-operator \
+    --user priv-user
+}
+
+# Source code repository
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli"
+SRCREV = "406688be909c702cbaecdf06147dc3b832c37f99"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend
new file mode 100644
index 000000000..a2df9cf70
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG_append = " verify_pnor_signature"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
new file mode 100644
index 000000000..c92b1a89c
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG_append = " verify_signature"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
index b2b27da74..8f69024d1 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,4 +1,8 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd \
-                                    openpower-fru-vpd \
-                                    first-boot-set-mac \
-                                    first-boot-set-hostname"
+OBMC_IMAGE_EXTRA_INSTALL_append = " \
+    admin-account \
+    first-boot-set-hostname \
+    first-boot-set-mac \
+    mboxd \
+    obmc-yadro-cli \
+    openpower-fru-vpd \
+"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb b/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb
index fe9b8fee9..dc6d4b31a 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb
+++ b/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb
@@ -20,4 +20,4 @@ DEPENDS += "autoconf-archive-native \
 # Source code repository
 S = "${WORKDIR}/git"
 SRC_URI = "gitsm://github.com/YADRO-KNS/openpower-esel-parser"
-SRCREV = "c35879fa605f3aa8098fff2c0a395815d8cbfe51"
+SRCREV = "8d25ae3cf40c090dfa17eb30a95c3d844012235f"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 8ad3a91eb..26e64be50 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -2,5 +2,9 @@ RDEPENDS_${PN}-inventory_append = " openpower-occ-control"
 RDEPENDS_${PN}-extras_append = " \
     phosphor-hostlogger \
     openpower-esel-parser \
+    obmc-yadro-lssensors \
+"
+RDEPENDS_${PN}-software_append = " \
     obmc-yadro-fwupdate \
+    phosphor-image-signing \
 "
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb
new file mode 100644
index 000000000..d94952e1f
--- /dev/null
+++ b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb
@@ -0,0 +1,38 @@
+SUMMARY = "Default administrative account"
+DESCRIPTION = "Creating default account for system administrator"
+PR = "r1"
+
+inherit useradd
+
+# License info
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+# Dependencies
+DEPENDS = "sudo \
+           phosphor-ipmi-host \
+           phosphor-user-manager"
+
+# Groups
+GROUP_ADMIN = "priv-admin"
+GROUP_OPERATOR = "priv-operator"
+GROUP_USER = "priv-user"
+GROUP_IPMI = "ipmi"
+GROUP_SUDO = "sudo"
+
+# Default administrative account (login: admin, password: admin)
+ADMIN_LOGIN = "admin"
+ADMIN_PASSW = "\$1\$Fze0kFe8\$sylEANC01t.osF8OewyB/1"
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--gid ${GROUP_ADMIN} \
+                       --groups ${GROUP_ADMIN},${GROUP_OPERATOR},${GROUP_USER},${GROUP_IPMI},${GROUP_SUDO} \
+                       --password '${ADMIN_PASSW}' \
+                       ${ADMIN_LOGIN}"
+
+# We don't have package body
+ALLOW_EMPTY_${PN} = "1"
+
+# Workaround for meta-phosphor/classes/phosphor-rootfs-postcommands.bbclass.
+# The bb-script cannot add root to non-empty groups (invalid sed command).
+GROUPMEMS_PARAM_${PN} = "-a root -g ${GROUP_ADMIN}; \
+                         -a root -g ${GROUP_IPMI}"
diff --git a/meta-yadro/recipes-phosphor/sensors/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-phosphor/sensors/obmc-yadro-lssensors_git.bb
new file mode 100644
index 000000000..55d549500
--- /dev/null
+++ b/meta-yadro/recipes-phosphor/sensors/obmc-yadro-lssensors_git.bb
@@ -0,0 +1,16 @@
+SUMMARY = "OpenBMC YADRO list sensors tool"
+DESCRIPTION = "The command line tool to show detailed information about \
+               all available sensors"
+HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-lssensors"
+PR = "r1"
+PV = "1.0+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+inherit meson
+
+DEPENDS += "sdbusplus"
+
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lssensors.git"
+SRCREV  = "4f55f0e21c5000d7a9e9c49cc2ad16bc6ba6463e"