IntelFsp2Pkg BaseFspSwitchStackLib: Remove MASM/GAS files

Keep NASM file only for new added modules.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Giri Mudusuru <giri.p.mudusuru@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>

diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf
index cef8d68f8f68b8162075be5a28f1e72c3fc1ad66..b3c673a0acff8fb548707aaed3ac0893ba6900a8 100644 (file)
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf
+++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/BaseFspSwitchStackLib.inf
@@ -24,8 +24,6 @@
   FspSwitchStackLib.c\r
 \r
 [Sources.IA32]\r
-  Ia32/Stack.asm\r
-  Ia32/Stack.s\r
   Ia32/Stack.nasm\r
 \r
 [Packages]\r

diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm
deleted file mode 100644 (file)
index 1efab52..0000000
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.asm
+++ /dev/null
@@ -1,77 +0,0 @@
-;------------------------------------------------------------------------------\r
-;\r
-; Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
-; This program and the accompanying materials\r
-; are licensed and made available under the terms and conditions of the BSD License\r
-; which accompanies this distribution.  The full text of the license may be found at\r
-; http://opensource.org/licenses/bsd-license.php.\r
-;\r
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-;\r
-; Abstract:\r
-;\r
-;   Switch the stack from temporary memory to permenent memory.\r
-;\r
-;------------------------------------------------------------------------------\r
-\r
-    .586p\r
-    .model  flat,C\r
-    .code\r
-\r
-;------------------------------------------------------------------------------\r
-; UINT32\r
-; EFIAPI\r
-; Pei2LoaderSwitchStack (\r
-;   VOID\r
-;   )\r
-;------------------------------------------------------------------------------\r
-EXTERNDEF  C   MeasurePoint:PROC\r
-Pei2LoaderSwitchStack   PROC C PUBLIC\r
-    xor     eax, eax\r
-    jmp     FspSwitchStack\r
-Pei2LoaderSwitchStack   ENDP\r
-\r
-;------------------------------------------------------------------------------\r
-; UINT32\r
-; EFIAPI\r
-; Loader2PeiSwitchStack (\r
-;   VOID\r
-;   )\r
-;------------------------------------------------------------------------------\r
-Loader2PeiSwitchStack   PROC C PUBLIC\r
-    jmp     FspSwitchStack\r
-Loader2PeiSwitchStack   ENDP\r
-\r
-;------------------------------------------------------------------------------\r
-; UINT32\r
-; EFIAPI\r
-; FspSwitchStack (\r
-;   VOID\r
-;   )\r
-;------------------------------------------------------------------------------\r
-EXTERNDEF  C   SwapStack:PROC\r
-FspSwitchStack   PROC C PUBLIC\r
-    ; Save current contexts\r
-    push    eax\r
-    pushfd\r
-    cli\r
-    pushad\r
-    sub     esp, 8\r
-    sidt    fword ptr [esp]\r
-\r
-    ; Load new stack\r
-    push    esp\r
-    call    SwapStack\r
-    mov     esp, eax\r
-\r
-    ; Restore previous contexts\r
-    lidt    fword ptr [esp]\r
-    add     esp, 8\r
-    popad\r
-    popfd\r
-    add     esp, 4\r
-    ret\r
-FspSwitchStack   ENDP\r
-\r
-    END\r

diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
deleted file mode 100644 (file)
index a21a5b6..0000000
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/Ia32/Stack.s
+++ /dev/null
@@ -1,78 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php.\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-# Abstract:\r
-#\r
-#   Switch the stack from temporary memory to permenent memory.\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-#------------------------------------------------------------------------------\r
-# UINT32\r
-# EFIAPI\r
-# Pei2LoaderSwitchStack (\r
-#   VOID\r
-#   )\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(Pei2LoaderSwitchStack)\r
-ASM_PFX(Pei2LoaderSwitchStack):\r
-    xorl    %eax, %eax\r
-    jmp     ASM_PFX(FspSwitchStack)\r
-\r
-#------------------------------------------------------------------------------\r
-# UINT32\r
-# EFIAPI\r
-# Loader2PeiSwitchStack (\r
-#   VOID\r
-#   )\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(Loader2PeiSwitchStack)\r
-ASM_PFX(Loader2PeiSwitchStack):\r
-    jmp     ASM_PFX(FspSwitchStack)\r
-\r
-#------------------------------------------------------------------------------\r
-# UINT32\r
-# EFIAPI\r
-# FspSwitchStack (\r
-#   VOID\r
-#   )\r
-#------------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(FspSwitchStack)\r
-ASM_PFX(FspSwitchStack):\r
-    #\r
-    #Save current contexts\r
-    #\r
-    push    %eax\r
-    pushf\r
-    cli\r
-    pusha\r
-    sub     $0x08, %esp\r
-    sidt    (%esp)\r
-\r
-    #\r
-    # Load new stack\r
-    #\r
-    push   %esp\r
-    call   ASM_PFX(SwapStack)\r
-    movl   %eax, %esp\r
-\r
-    #\r
-    # Restore previous contexts\r
-    #\r
-    lidt    (%esp)\r
-    add     $0x08,%esp\r
-    popa\r
-    popf\r
-    add     $0x04,%esp\r
-    ret\r
-\r
-\r