Merge pull request #72 from Intel-BMC/update2021-0.751-0.75

Update

15 files changed, 108 insertions, 91 deletions

diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
index affbcf727..f7daa94a8 100644
--- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb
@@ -20,10 +20,10 @@ SRC_URI = "file://ampere-host-shutdown.service \
           "
 
 DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
         ampere-host-shutdown.service \
         ampere-host-reset.service \
         ampere-chassis-poweroff.service \
@@ -37,42 +37,42 @@ SYSTEMD_SERVICE_${PN} = " \
 HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service"
 HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target"
 HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}"
 
 # Force the power cycle target to run the ampere power cycle
 HOST_REBOOT_SVC = "ampere-host-power-cycle.service"
 HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target"
 HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}"
 
 # overwrite the host reset to graceful reset
 HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service"
 HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target"
 HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}"
 
 # overwrite force reboot
 HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service"
 HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target"
 HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}"
 
 # chassis power control
 CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service"
 CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target"
 CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
 
 CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service"
 CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target"
 CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}"
 
 TMPL = "phosphor-gpio-monitor@.service"
 INSTFMT = "phosphor-gpio-monitor@{0}.service"
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}"
 
 do_install() {
     install -d ${D}/usr/sbin
diff --git a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
index d01b898a9..12098adfa 100644
--- a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append_kudo = " file://hotswap-power-cycle.service"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append:kudo = " file://hotswap-power-cycle.service"
 
 do_install() {
     install -d ${D}${systemd_unitdir}/system/
@@ -18,4 +18,4 @@ do_install() {
 }
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " hotswap-power-cycle.service"
+SYSTEMD_SERVICE:${PN} = " hotswap-power-cycle.service"
diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
index c0793adf6..b56ce441e 100644
--- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb
@@ -20,7 +20,7 @@ SRCREV = "35c1ac40e476caa19c84a546d4f85ba96cb5dbbd"
 HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
 NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
 
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
index b126bfc8c..9fb7d243c 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb
@@ -10,18 +10,18 @@ inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json"
 
-SRC_URI_append_kudo = " \ 
+SRC_URI:append:kudo = " \
     file://phosphor-ipmi-flash-bios-update.service \
     file://config-bios.json \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
     phosphor-ipmi-flash-bios-update.service \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
index 184f3efc6..0b7cfbee0 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb
@@ -6,11 +6,11 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
+RPROVIDES:${PN} += "virtual/bmc-update"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
-
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://config-bmc.json \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
index b2fd8209d..d32b280ea 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb
@@ -10,13 +10,13 @@ inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://phosphor-ipmi-flash-bmccpld-update.service \
     file://phosphor-ipmi-flash-mbcpld-update.service \
     file://config-bmccpld.json \
@@ -24,7 +24,7 @@ SRC_URI_append_kudo = " \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
     phosphor-ipmi-flash-bmccpld-update.service \
     phosphor-ipmi-flash-mbcpld-update.service \
     "
@@ -36,4 +36,4 @@ do_install () {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-bmccpld-update.service ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-mbcpld-update.service ${D}${systemd_system_unitdir}
-}
\ No newline at end of file
+}
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
index 03ce088fc..28d276f96 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb
@@ -10,8 +10,8 @@ inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
 
 SRC_URI = " \
@@ -22,7 +22,7 @@ SRC_URI = " \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     kudo-fw-ver.service \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh
index a63c3e61c..5e0763a64 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh
@@ -23,14 +23,14 @@ function fwbios() {
 
   if [ ! -f $1 ]; then
     echo " Cannot find the" $1 "image file"
-    exit 1
+    return 1
 
   fi
   echo "Flashing BIOS @/dev/$BIOS_MTD"
   flashcp -v $1 /dev/$BIOS_MTD
   if [ $? -ne  0 ]; then
     echo "Flashing the bios failed " >&2
-    exit 1
+    return 1
   fi
   wait
 
@@ -47,17 +47,19 @@ function fwbios() {
   # nvparm -s 0x1 -o 0x5F0638
   if [ $? -ne  0 ]; then
     echo "Setting default nvparms failed " >&2
-    exit 1
+    return 1
   fi
 
   if [[ $(find ${1} -type f -size +17156k 2>/dev/null) ]]; then
     echo "Extracting the SCP from the image"
     dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img
+    # Update both primary and backup EEPROM
     fwscp /run/initramfs/myscp.img
+    fwscpback /run/initramfs/myscp.img
   fi
 
-  rm -f $1
-  exit 0
+
+  return 0
 }
 
 function fwbmccpld() {
@@ -66,12 +68,12 @@ function fwbmccpld() {
   loadsvf -d /dev/jtag0 -s $1 -m 0
   if [ $? -ne  0 ]; then
     echo "BMC CPLD update failed" >&2
-    exit 1
+    return 1
   fi
   wait
   set_gpio_ctrl 218 out 1
-  rm -f $1
-  exit 0
+
+  return 0
 }
 
 function fwmbcpld() {
@@ -82,47 +84,49 @@ function fwmbcpld() {
   loadsvf -d /dev/jtag0 -s $1 -m 0
   if [ $? -ne  0 ]; then
     echo "Mobo CPLD update failed" >&2
-    exit 1
+    return 1
   fi
   wait
-  rm -f $1
-  exit 0
+
+  return 0
 }
 
 function fwscp() {
   # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main
   # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU
+  scp_eeprom_sel=`get_gpio_ctrl 168`
   set_gpio_ctrl 168 out 1
   set_gpio_ctrl 85 out 0
   I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-)
   ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1
   if [ $? -ne  0 ]; then
     echo "SCP eeprom update failed" >&2
-    exit 1
+    return 1
   fi
   wait
   set_gpio_ctrl 85 out 1
-  set_gpio_ctrl 168 out 1
-  rm -f $1
-  exit 0
+  set_gpio_ctrl 168 out $scp_eeprom_sel
+
+  return 0
 }
 
 function fwscpback() {
   # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main
   # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU
+  scp_eeprom_sel=`get_gpio_ctrl 168`
   set_gpio_ctrl 168 out 0
   set_gpio_ctrl 85 out 0
   I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-)
   ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1
   if [ $? -ne  0 ]; then
     echo "SCP BACKUP eeprom update failed" >&2
-    exit 1
+    return 1
   fi
   wait
   set_gpio_ctrl 85 out 1
-  set_gpio_ctrl 168 out 1
-  rm -f $1
-  exit 0
+  set_gpio_ctrl 168 out $scp_eeprom_sel
+
+  return 0
 }
 
 function fwmb_pwr_seq(){
@@ -130,24 +134,23 @@ function fwmb_pwr_seq(){
   #$2 0x41 seq config file
   if [[ ! -e $1 ]]; then
     echo "$1 file does not exist"
-    exit 1
+    return 1
   fi
   if [[ ! -e $2 ]]; then
     echo "$2 file does not exist"
-    exit 1
+    return 1
   fi
   echo 32-0040 > /sys/bus/i2c/drivers/adm1266/unbind
   echo 32-0041 > /sys/bus/i2c/drivers/adm1266/unbind
   adm1266_fw_fx $1 $2
   if [ $? -ne  0 ]; then
     echo "The power seq flash failed" >&2
-    exit 1
+    return 1
   fi
   echo 32-0040 > /sys/bus/i2c/drivers/adm1266/bind
   echo 32-0041 > /sys/bus/i2c/drivers/adm1266/bind
-  rm -f $1
-  rm -f $2
-  exit 0
+
+  return 0
 }
 
 if [[ ! $(which flashcp) ]]; then
@@ -189,3 +192,8 @@ case $1 in
   *)
     ;;
 esac
+ret=$?
+
+rm -f $2 $3
+
+exit $ret
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
index 2c82ac8f6..70c40e631 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb
@@ -10,13 +10,13 @@ inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-flash"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json"
 
-SRC_URI_append_kudo = " \
+SRC_URI:append:kudo = " \
     file://phosphor-ipmi-flash-scp-update.service \
     file://phosphor-ipmi-flash-scpback-update.service \
     file://config-scp.json \
@@ -24,7 +24,7 @@ SRC_URI_append_kudo = " \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append_kudo = " \
+SYSTEMD_SERVICE:${PN}:append:kudo = " \
     phosphor-ipmi-flash-scp-update.service \
     phosphor-ipmi-flash-scpback-update.service \
     "
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
index 87e4f747b..c800f266e 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb
@@ -9,8 +9,8 @@ inherit systemd
 inherit obmc-phosphor-systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = " \
     file://init_once.sh \
@@ -18,7 +18,7 @@ SRC_URI = " \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     host-powerctrl.service \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
index 5145009a6..adb86f238 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh
@@ -1,15 +1,23 @@
 #!/bin/bash
 
 source /usr/sbin/kudo-lib.sh
+# 0 for EVT. DVT will have a non-zero board version
+boardver=$(printf '%d' `cat /sys/bus/i2c/drivers/fiicpld/34-0076/CMD00 | awk '{print $6}'`)
 # sleep so that FRU and all ipmitool Devices are ready before HOST OS
 # gpio 143 for HPM_STBY_RST_N do to DC-SCM spec
 set_gpio_ctrl 143 out 1
-sleep 5 # for the MUX to get ready 
+sleep 5 # for the MUX to get ready
 # set all mux route to CPU before power on host
 # BMC_CPU_RTC_I2C_SEL #120
 set_gpio_ctrl 120 out 1
 # BMC_CPU_DDR_I2C_SEL #84
 set_gpio_ctrl 84 out 1
+# On EVT machines, the secondary SCP EEPROM is used.
+# Set BMC_I2C_BACKUP_SEL to secondary.
+if [[ $boardver == 0 ]]; then
+    echo "EVT system. Choosing secondary SCP EEPROM."
+    set_gpio_ctrl 168 out 0
+fi
 # BMC_CPU_EEPROM_I2C_SEL #85
 set_gpio_ctrl 85 out 1
 # BMC_CPU_PMBUS_SEL #86
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
index f4e0bb09f..324bd640c 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb
@@ -5,7 +5,7 @@ PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI = " \
     file://kudo.sh \
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
index 85006dadc..0b0ac37c6 100644
--- a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 
 SRC_URI += "file://kudo_entity_association_map.json"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${datadir}/ipmi-entity-association/entity_association_map.json \
     "
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
index 249e454ae..6e7be67c2 100644
--- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
@@ -4,18 +4,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit allarch systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-SRC_URI_append += " \
+SRC_URI:append += " \
     file://usb_network.sh \
     file://usb_network.service \
     file://00-bmc-usb0.network \
     "
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN}_append = " usb_network.service"
-FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+SYSTEMD_SERVICE:${PN}:append = " usb_network.service"
+FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
 
 do_install() {
     install -d ${D}/${sbindir}
diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
index cc32052c5..800efde74 100644
--- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb
@@ -11,23 +11,23 @@ PACKAGES = " \
     ${PN}-fan-mgmt \
     "
 
+PROVIDES += "virtual/obmc-chassis-mgmt"
 PROVIDES += "virtual/obmc-system-mgmt"
 PROVIDES += "virtual/obmc-fan-mgmt"
 
-RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt"
-RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt"
+RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt"
 
-SUMMARY_${PN}-kudo-chassis = "kudo chassis"
-RDEPENDS_${PN}-kudo-chassis = " \
+SUMMARY:${PN}-kudo-chassis = "kudo chassis"
+RDEPENDS:${PN}-kudo-chassis = " \
     phosphor-hostlogger \
     obmc-op-control-power \
-    obmc-phosphor-buttons-signals \
-    obmc-phosphor-buttons-handler \
     "
 
-SUMMARY_${PN}-kudo-system = "kudo System"
-RDEPENDS_${PN}-kudo-system = " \
+SUMMARY:${PN}-kudo-system = "kudo System"
+RDEPENDS:${PN}-kudo-system = " \
     ipmitool \
     ethtool \
     memtester \
@@ -42,10 +42,11 @@ RDEPENDS_${PN}-kudo-system = " \
     kudo-boot \
     kudo-cmd \
     phosphor-state-manager \
+    smbios-mdr \
     "
 
-SUMMARY_${PN}-kudo-fw = "kudo Firmware"
-RDEPENDS_${PN}-kudo-fw = " \
+SUMMARY:${PN}-kudo-fw = "kudo Firmware"
+RDEPENDS:${PN}-kudo-fw = " \
     kudo-fw \
     kudo-bios-update \
     kudo-bmc-update \
@@ -53,8 +54,8 @@ RDEPENDS_${PN}-kudo-fw = " \
     kudo-scp-update \
     "
 
-SUMMARY_${PN}-fan-mgmt = "kudo fan mgmt"
-RDEPENDS_${PN}-fan-mgmt = " \
+SUMMARY:${PN}-fan-mgmt = "kudo fan mgmt"
+RDEPENDS:${PN}-fan-mgmt = " \
     pwm-init \
     phosphor-pid-control \
     "