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

5 files changed, 22 insertions, 23 deletions

diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf
index 2bb67ed08..932ed5e7b 100644
--- a/meta-ibm/conf/machine/mihawk.conf
+++ b/meta-ibm/conf/machine/mihawk.conf
@@ -25,20 +25,20 @@ PHOSPHOR_MRW_REV = "f6ec5aa0f9803d44b147a7670dec7ec935f59582"
 
 
 # Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
 # Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 # Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"
 
 # Inhibit mihawk-led-manager-config-native
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \
     "mihawk-led-manager-config-native"
 
-PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native"
+PREFERRED_PROVIDER_virtual/phosphor-logging-callouts:df-mrw = "mihawk-phosphor-logging-callouts-native"
 
-PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw = "mihawk-openpower-fru-inventory-native"
+PREFERRED_PROVIDER_virtual/openpower-fru-inventory:df-mrw = "mihawk-openpower-fru-inventory-native"
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 49a0bdbd9..4956f8772 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -24,22 +24,19 @@ PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20
 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 SKIP_BROKEN_MRW = "1"
 
-IMAGE_FEATURES_remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-ikvm"
 
 UBOOT_SIGN_ENABLE = "1"
 SPL_SIGN_ENABLE = "1"
-SOCSEC_SIGN_ENABLE = "1"
-SOCSEC_SIGN_EXTRA_OPTS = "--stack_intersects_verification_region=false"
-SOCSEC_SIGN_KEY ?= "${WORKDIR}/rsa_oem_dss_key.pem"
 
 FIT_HASH_ALG = "sha512"
 FIT_SIGN_ALG = "rsa4096"
@@ -55,5 +52,7 @@ SPL_SIGN_KEYNAME = "rsa_oem_fitimage_key"
 UBOOT_SIGN_KEYDIR = "${WORKDIR}"
 SPL_SIGN_KEYDIR = "${WORKDIR}"
 
+SOCSEC_SIGN_ENABLE = "1"
+
 DEBUG_TRIGGERS = "kcs2"
-PACKAGECONFIG_append_pn-debug-trigger = " triggers"
+PACKAGECONFIG:append:pn-debug-trigger = " triggers"
diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
index e8d6dcc90..f4f241395 100644
--- a/meta-ibm/conf/machine/swift.conf
+++ b/meta-ibm/conf/machine/swift.conf
@@ -18,5 +18,5 @@ FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB"
 BMC_RW_SIZE = "0x2000000"
 
 # Inhibit swift-led-manager-config-native
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \
     "swift-led-manager-config-native"
diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
index 7860e3eba..bf10d16ae 100644
--- a/meta-ibm/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -24,11 +24,11 @@ PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20
 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 # The eMMC on Tacoma is just 1GB smaller than Rainier. The template file
@@ -38,7 +38,7 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
 # partition is 5GB, therefore setting it to 4GB for Tacoma.
 WKS_HOSTFW_SIZE = "4G"
 
-IMAGE_FEATURES_remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-ikvm"
 
 DEBUG_TRIGGERS = "kcs2"
-PACKAGECONFIG_append_pn-debug-trigger = " triggers"
+PACKAGECONFIG:append:pn-debug-trigger = " triggers"
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index 08f2935f9..42844c1cc 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -23,12 +23,12 @@ PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 
 # Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
 # Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 # Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"