[S] Change in coreboot[master]: security/vboot: Update build rules using x86 SHA extension

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68953 )

Change subject: security/vboot: Update build rules using x86 SHA extension
......................................................................

security/vboot: Update build rules using x86 SHA extension

Currently build rules allow using x86 SHA extensions for all coreboot
stages when enabled. On some SoCs where verstage can run in non-x86
environment, x86 SHA extension cannot be used. Update build rules
accordingly such that x86 SHA extensions can be used in AMD SoCs. This
is particularly useful when CBFS verificiation is enabled which verifies
the hash of the CBFS file being loaded.

BUG=b:227809919
TEST=Build and boot to OS in Skyrim. Observe that hardware acceleration
is used when a CBFS file is loaded and observe an overall improvement of
10 ms.

Change-Id: I4f388e963eb82990cda41d3880e66ad937334908
Signed-off-by: Karthikeyan Ramasubramanian 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68953
Reviewed-by: Raul Rangel 
Tested-by: build bot (Jenkins) 
Reviewed-by: Kangheui Won 
Reviewed-by: Yu-Ping Wu 
---
M src/security/vboot/Makefile.inc
1 file changed, 29 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved
  Yu-Ping Wu: Looks good to me, approved
  Kangheui Won: Looks good to me, approved

diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index d38fbac..bd73871 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -28,7 +28,8 @@
    CC="$$(CC_$(1))" \
    CFLAGS="$$(VBOOT_CFLAGS_$(1))" VBOOT2="y" \
    EC_EFS="$(CONFIG_VBOOT_EC_EFS)" \
-	X86_SHA_EXT="$(CONFIG_VBOOT_X86_SHA256_ACCELERATION)" \
+	X86_SHA_EXT="$(if $(CONFIG_ARCH_$(call toupper,$(1))_X86_32)$(CONFIG_ARCH_$(call toupper,$(1))_X86_64),$\
+			$(CONFIG_VBOOT_X86_SHA256_ACCELERATION))" \
    $(MAKE) -C $(VBOOT_SOURCE) \
    	BUILD=$$(abspath $$(dir $$(VBOOT_LIB_$(1)))) \
    	V=$(V) \