diff options
Diffstat (limited to 'meta-ibm/conf/machine')
| -rw-r--r-- | meta-ibm/conf/machine/p10bmc.conf | 23 | ||||
| l--------- | meta-ibm/conf/machine/rainier.conf | 1 | ||||
| -rw-r--r-- | meta-ibm/conf/machine/witherspoon-tacoma.conf | 1 |
3 files changed, 22 insertions, 3 deletions
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 2cab74e4d..58319bf84 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -5,8 +5,6 @@ SPL_BINARY = "spl/u-boot-spl.bin" OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" -# TODO remove the MACHINEOVERRIDES when the rainier.conf file is removed. -MACHINEOVERRIDES =. "p10bmc:" require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc @@ -15,6 +13,7 @@ require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc +DISTRO_FEATURES += "ibm-service-account-policy" SERIAL_CONSOLES = "115200;ttyS4" @@ -34,3 +33,23 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ SKIP_BROKEN_MRW = "1" 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" +FIT_SIGN_NUMBITS = "4096" +UBOOT_FITIMAGE_ENABLE = "1" +UBOOT_FIT_HASH_ALG = "sha512" +UBOOT_FIT_SIGN_ALG = "rsa4096" +UBOOT_FIT_SIGN_NUMBITS = "4096" + +UBOOT_SIGN_KEYNAME = "rsa_oem_fitimage_key" +SPL_SIGN_KEYNAME = "rsa_oem_fitimage_key" + +UBOOT_SIGN_KEYDIR = "${WORKDIR}" +SPL_SIGN_KEYDIR = "${WORKDIR}" diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf deleted file mode 120000 index ddfb6ec6d..000000000 --- a/meta-ibm/conf/machine/rainier.conf +++ /dev/null @@ -1 +0,0 @@ -p10bmc.conf
\ No newline at end of file diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 9826d55ec..2d696ecd8 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -14,6 +14,7 @@ require conf/distro/include/ibm-yaml.inc require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc +DISTRO_FEATURES += "ibm-service-account-policy" SERIAL_CONSOLES = "115200;ttyS4" |