From d6af9cabad68a356a171ca24247f2b136b15c8ed Mon Sep 17 00:00:00 2001 From: Michael Kinney Date: Wed, 16 Dec 2015 17:34:23 +0000 Subject: [PATCH] QuarkPlatformPkg/PlatformSecLib: Sync Flat32.S with Flat32.asm Update Flat32.S to match Flat32.asm. A sync was missed, so Flat32.S is calling SecStartup instead of PlatformSecLibStartup which is causing a boot failures with GCC builds because the caches are not initialized correctly when the call to PlatformSecLibStartup is not performed. Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney Reviewed-by: Kelly Steele git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19306 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/PlatformSecLib/Ia32/Flat32.S | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/QuarkPlatformPkg/Library/PlatformSecLib/Ia32/Flat32.S b/QuarkPlatformPkg/Library/PlatformSecLib/Ia32/Flat32.S index fbdad53aa0..2bb503f6a4 100644 --- a/QuarkPlatformPkg/Library/PlatformSecLib/Ia32/Flat32.S +++ b/QuarkPlatformPkg/Library/PlatformSecLib/Ia32/Flat32.S @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ # -# Copyright (c) 2013 Intel Corporation. +# Copyright (c) 2013 - 2015 Intel Corporation. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -301,35 +301,10 @@ PushBist: pushl %ebp loop PushBist - # - # Pass entry point of the PEI core - # - movl $0xFFFFFFE0, %edi - pushl %ds:(%edi) - - # - # Pass BFV into the PEI Core - # - movl $0xFFFFFFFC, %edi - pushl %ds:(%edi) - - # - # Pass Temp Ram Base into the PEI Core - # - movl ASM_PFX(PcdGet32(PcdEsramStage1Base)), %eax - addl $(QUARK_ESRAM_MEM_SIZE_BYTES - QUARK_STACK_SIZE_BYTES), %eax - pushl %eax - - - # - # Pass stack size into the PEI Core - # - pushl $QUARK_STACK_SIZE_BYTES - # # Pass Control into the PEI Core # - call SecStartup + call PlatformSecLibStartup # # PEI Core should never return to here, this is just to capture an invalid return. -- 2.39.2