IntelFsp2Pkg SecFspSecPlatformLibNull: 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/SecFspSecPlatformLibNull/Ia32/Flat32.asm b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.asm
deleted file mode 100644 (file)
index 9f144fc..0000000
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.asm
+++ /dev/null
@@ -1,131 +0,0 @@
-;; @file\r
-;  This is the code that goes from real-mode to protected mode.\r
-;  It consumes the reset vector, configures the stack.\r
-;\r
-; Copyright (c) 2015 - 2016, 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
-\r
-;\r
-; Define assembler characteristics\r
-;\r
-.586p\r
-.xmm\r
-.model flat, c\r
-\r
-EXTRN   TempRamInitApi:NEAR\r
-\r
-.code \r
-\r
-RET_ESI  MACRO\r
-\r
-  movd    esi, mm7                      ; restore ESP from MM7\r
-  jmp     esi\r
-\r
-ENDM\r
-\r
-;\r
-; Perform early platform initialization\r
-;\r
-SecPlatformInit    PROC    NEAR    PUBLIC\r
-\r
-  RET_ESI\r
-\r
-SecPlatformInit    ENDP\r
-\r
-;\r
-; Protected mode portion initializes stack, configures cache, and calls C entry point\r
-;\r
-\r
-;----------------------------------------------------------------------------\r
-;\r
-; Procedure:    ProtectedModeEntryPoint\r
-;\r
-; Input:        Executing in 32 Bit Protected (flat) mode\r
-;               cs: 0-4GB\r
-;               ds: 0-4GB\r
-;               es: 0-4GB\r
-;               fs: 0-4GB\r
-;               gs: 0-4GB\r
-;               ss: 0-4GB\r
-;\r
-; Output:       This function never returns\r
-;\r
-; Destroys:\r
-;               ecx\r
-;               edi\r
-;               esi\r
-;               esp\r
-;\r
-; Description:\r
-;               Perform any essential early platform initilaisation\r
-;               Setup a stack\r
-;\r
-;----------------------------------------------------------------------------\r
-\r
-ProtectedModeEntryPoint PROC NEAR C PUBLIC\r
-  ;\r
-  ; Dummy function. Consume 2 API to make sure they can be linked.\r
-  ;\r
-  mov  eax, TempRamInitApi\r
-\r
-  ; Should never return\r
-  jmp  $\r
-\r
-ProtectedModeEntryPoint ENDP\r
-\r
-;\r
-; ROM-based Global-Descriptor Table for the PEI Phase\r
-;\r
-align 16\r
-PUBLIC  BootGdtTable\r
-\r
-;\r
-; GDT[0]: 0x00: Null entry, never used.\r
-;\r
-NULL_SEL        equ     $ - GDT_BASE        ; Selector [0]\r
-GDT_BASE:\r
-BootGdtTable    DD      0\r
-                DD      0\r
-;\r
-; Linear code segment descriptor\r
-;\r
-LINEAR_CODE_SEL equ     $ - GDT_BASE        ; Selector [0x8]\r
-        DW      0FFFFh                      ; limit 0xFFFF\r
-        DW      0                           ; base 0\r
-        DB      0\r
-        DB      09Bh                        ; present, ring 0, data, expand-up, not-writable\r
-        DB      0CFh                        ; page-granular, 32-bit\r
-        DB      0\r
-;\r
-; System data segment descriptor\r
-;\r
-SYS_DATA_SEL    equ     $ - GDT_BASE        ; Selector [0x10]\r
-        DW      0FFFFh                      ; limit 0xFFFF\r
-        DW      0                           ; base 0\r
-        DB      0\r
-        DB      093h                        ; present, ring 0, data, expand-up, not-writable\r
-        DB      0CFh                        ; page-granular, 32-bit\r
-        DB      0\r
-\r
-GDT_SIZE        EQU     $ - BootGDTtable    ; Size, in bytes\r
-\r
-;\r
-; GDT Descriptor\r
-;\r
-GdtDesc:                                    ; GDT descriptor\r
-        DW      GDT_SIZE - 1                ; GDT limit\r
-        DD      OFFSET BootGdtTable         ; GDT base address\r
-\r
-ProtectedModeEntryLinearAddress   LABEL   FWORD\r
-ProtectedModeEntryLinearOffset    LABEL   DWORD\r
-  DD      OFFSET ProtectedModeEntryPoint  ; Offset of our 32 bit code\r
-  DW      LINEAR_CODE_SEL\r
-  \r
-END\r

diff --git a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.s b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.s
deleted file mode 100644 (file)
index d46d792..0000000
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.s
+++ /dev/null
@@ -1,110 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2015 - 2016, 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
-#  This is the code that goes from real-mode to protected mode.\r
-#  It consumes the reset vector, configures the stack.\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-\r
-#\r
-# Contrary to the name, this file contains 16 bit code as well.\r
-#\r
-.text\r
-\r
-ASM_GLOBAL ASM_PFX(SecPlatformInit)\r
-ASM_PFX(SecPlatformInit):\r
-  movd    %mm7, %esi                      # restore ESP from MM7\r
-  jmp     *%esi\r
-\r
-#----------------------------------------------------------------------------\r
-#\r
-# Procedure:    ProtectedModeEntryPoint\r
-#\r
-# Input:        Executing in 32 Bit Protected (flat) mode\r
-#               cs: 0-4GB\r
-#               ds: 0-4GB\r
-#               es: 0-4GB\r
-#               fs: 0-4GB\r
-#               gs: 0-4GB\r
-#               ss: 0-4GB\r
-#\r
-# Output:       This function never returns\r
-#\r
-# Destroys:\r
-#               ecx\r
-#               edi\r
-#               esi\r
-#               esp\r
-#\r
-# Description:\r
-#               Perform any essential early platform initilaisation\r
-#               Setup a stack\r
-#\r
-#----------------------------------------------------------------------------\r
-ProtectedModeEntryPoint:\r
-  #\r
-  # Dummy function. Consume 2 API to make sure they can be linked.\r
-  #\r
-  movl   ASM_PFX(TempRamInitApi), %eax\r
-  #\r
-  # Should never return\r
-  #\r
-  jmp     . #'$'\r
-\r
-#\r
-# ROM-based Global-Descriptor Table for the PEI Phase\r
-#\r
-.align 16\r
-#\r
-# GDT[0]: 000h: Null entry, never used.\r
-#\r
-.equ   NULL_SEL, . - GDT_BASE         # Selector [0]\r
-GDT_BASE: \r
-BootGdtTable:   \r
-        .long   0\r
-        .long   0\r
-#\r
-# Linear code segment descriptor\r
-#\r
-.equ     LINEAR_CODE_SEL, . - GDT_BASE         # Selector [08h]\r
-        .word   0xFFFF                      # limit 0FFFFh\r
-        .word   0                           # base 0\r
-        .byte   0\r
-        .byte   0x9B                        # present, ring 0, data, expand-up, not-writable\r
-        .byte   0xCF                        # page-granular, 32-bit\r
-        .byte   0\r
-#\r
-# System data segment descriptor\r
-#\r
-.equ    SYS_DATA_SEL, . - GDT_BASE         # Selector [010h]\r
-        .word   0xFFFF                      # limit 0FFFFh\r
-        .word   0                           # base 0\r
-        .byte   0\r
-        .byte   0x93                        # present, ring 0, data, expand-up, not-writable\r
-        .byte   0xCF                        # page-granular, 32-bit\r
-        .byte   0\r
-\r
-.equ            GDT_SIZE, . - BootGdtTable  # Size, in bytes\r
-\r
-#\r
-# GDT Descriptor\r
-#\r
-GdtDesc:                                     # GDT descriptor\r
-       .word    GDT_SIZE - 1               \r
-       .long    BootGdtTable        \r
-\r
-ProtectedModeEntryLinearAddress:\r
-ProtectedModeEntryLinearOffset:\r
-       .long    ProtectedModeEntryPoint\r
-       .word    LINEAR_CODE_SEL\r

diff --git a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.asm b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.asm
deleted file mode 100644 (file)
index 31296e0..0000000
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.asm
+++ /dev/null
@@ -1,51 +0,0 @@
-;; @file\r
-;  SEC CAR function\r
-;\r
-; Copyright (c) 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
-\r
-;\r
-; Define assembler characteristics\r
-;\r
-.586p\r
-.xmm\r
-.model flat, c\r
-\r
-RET_ESI  MACRO\r
-\r
-  movd    esi, mm7                      ; move ReturnAddress from MM7 to ESI\r
-  jmp     esi\r
-\r
-ENDM\r
-\r
-.code \r
-\r
-;-----------------------------------------------------------------------------\r
-;\r
-;  Section:     SecCarInit\r
-;\r
-;  Description: This function initializes the Cache for Data, Stack, and Code\r
-;\r
-;-----------------------------------------------------------------------------\r
-SecCarInit    PROC    NEAR    PUBLIC\r
-\r
-  ;\r
-  ; Set up CAR\r
-  ;\r
-\r
-  xor    eax, eax\r
-\r
-SecCarInitExit:\r
-\r
-  RET_ESI\r
-\r
-SecCarInit    ENDP\r
-\r
-END\r

diff --git a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.s b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.s
deleted file mode 100644 (file)
index 7bd40df..0000000
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.s
+++ /dev/null
@@ -1,37 +0,0 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 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
-#  SEC CAR function\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-#-----------------------------------------------------------------------------\r
-#\r
-#  Section:     SecCarInit\r
-#\r
-#  Description: This function initializes the Cache for Data, Stack, and Code\r
-#\r
-#-----------------------------------------------------------------------------\r
-ASM_GLOBAL ASM_PFX(SecCarInit)\r
-ASM_PFX(SecCarInit):\r
-\r
-  #\r
-  # Set up CAR\r
-  #\r
-\r
-  xor     %eax, %eax\r
-\r
-SecCarInitExit:\r
-\r
-  movd       %mm7, %esi                      #RET_ESI\r
-  jmp        *%esi\r

diff --git a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf
index 2bc638c776794c5e9a82c82e6e57224e1600fa56..e1cab05232e36d8fe0afada8d8284e19040a710b 100644 (file)
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf
+++ b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  NULL instance of Platform Sec Lib.\r
 #\r
 ## @file\r
 #  NULL instance of Platform Sec Lib.\r
 #\r

-#  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -41,11 +41,7 @@
   PlatformSecLibNull.c\r
 \r
 [Sources.IA32]\r
   PlatformSecLibNull.c\r
 \r
 [Sources.IA32]\r

-  Ia32/Flat32.asm\r

   Ia32/Flat32.nasm\r
   Ia32/Flat32.nasm\r

-  Ia32/Flat32.s\r
-  Ia32/SecCarInit.asm\r
-  Ia32/SecCarInit.s\r

   Ia32/SecCarInit.nasm\r
 \r
 ################################################################################\r
   Ia32/SecCarInit.nasm\r
 \r
 ################################################################################\r