diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-ibm/conf/machine/p10bmc.conf | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/conf/machine/p10bmc.conf')
-rw-r--r-- | meta-ibm/conf/machine/p10bmc.conf | 15 |
1 files changed, 7 insertions, 8 deletions
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" |