VirtualBox

Ignore:
Timestamp:
Oct 29, 2015 4:30:44 AM (9 years ago)
Author:
vboxsync
Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge /vendor/edk2/UDK2014.SP1 /vendor/edk2/current .

Location:
trunk/src/VBox/Devices/EFI/Firmware
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspDxeIpl/FspDxeIpl.inf

    r58464 r58466  
    6464
    6565[FixedPcd]
    66   gIntelFspPkgTokenSpaceGuid.PcdFspMaxPatchEntry    ## CONSUMES 
    67   gIntelFspPkgTokenSpaceGuid.PcdFspMaxPerfEntry     ## CONSUMES 
     66  gIntelFspPkgTokenSpaceGuid.PcdFspMaxPatchEntry    ## CONSUMES
     67  gIntelFspPkgTokenSpaceGuid.PcdFspMaxPerfEntry     ## CONSUMES
    6868
    6969[Depex]

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/FspSecCore.inf

    r58464 r58466  
    7676
    7777[Ppis]
    78   gEfiTemporaryRamSupportPpiGuid                ## PRODUCES 
     78  gEfiTemporaryRamSupportPpiGuid                ## PRODUCES
    7979

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm

    r58464 r58466  
    9191   ;   eax is cleared and ebp is used for return address.
    9292   ;   All others reserved.
    93    
     93
    9494   ; Save return address to EBP
    9595   movd  ebp, mm7
    … …  
    307307  ; Save API entry/exit timestamp into stack
    308308  ;
    309   push      DATA_LEN_OF_PER0     ; Size of the data region 
     309  push      DATA_LEN_OF_PER0     ; Size of the data region
    310310  push      30524550h            ; Signature of the  data region 'PER0'
    311311  LOAD_EDX
    … …  
    319319  ;
    320320  ; Terminator for the data on stack
    321   ; 
     321  ;
    322322  push      0
    323323
    … …  
    477477  ;
    478478  ; Stack must be ready
    479   ; 
     479  ;
    480480  push   eax
    481481  add    esp, 4
    … …  
    514514  ; FspInit and FspMemoryInit APIs, setup the initial stack frame
    515515  ;
    516  
     516
    517517  ;
    518518  ; Place holder to store the FspInfoHeader pointer
    … …  
    551551  ;
    552552  push    eax
    553  
     553
    554554  ;
    555555  ; Pass the BootLoader stack to SecStartup
    … …  
    562562  call    AsmGetFspBaseAddress
    563563  mov     edi, eax
    564   add     edi, PcdGet32 (PcdFspAreaSize) 
     564  add     edi, PcdGet32 (PcdFspAreaSize)
    565565  sub     edi, 20h
    566566  add     eax, DWORD PTR ds:[edi]

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.s

    r58464 r58466  
    8787.macro LOAD_REGS
    8888  pshufd     $0xe4, %xmm7, %xmm7
    89   movd       %xmm7, %ebp 
     89  movd       %xmm7, %ebp
    9090  pshufd     $0xe4, %xmm7, %xmm7
    9191#
    … …  
    148148    #
    149149ASM_PFX(mMmxControlWord): .long     0x01F80
    150 SseError:     
     150SseError:
    151151    #
    152152    # Processor has to support SSE
    153153    #
    154     jmp     SseError     
    155 NextAddress:           
     154    jmp     SseError
     155NextAddress:
    156156    #
    157157    # Initialize floating point units
    … …  
    691691  #
    692692  # Stack must be ready
    693   # 
     693  #
    694694  pushl   %eax
    695695  addl    $0x04, %esp
    … …  
    726726  #
    727727  # FspInit and FspMemoryInit APIs, setup the initial stack frame
    728   # 
    729  
     728  #
     729
    730730  #
    731731  # Place holder to store the FspInfoHeader pointer
    … …  
    766766  #
    767767  pushl   %eax
    768  
     768
    769769  #
    770770  # Pass the BootLoader stack to SecStartup

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/FspHelper.asm

    r58464 r58466  
    1717
    1818;
    19 ; FspInfoHeaderRelativeOff is patched during build process and initialized to offset of the  AsmGetFspBaseAddress 
    20 ; from the FSP Info header. 
     19; FspInfoHeaderRelativeOff is patched during build process and initialized to offset of the  AsmGetFspBaseAddress
     20; from the FSP Info header.
    2121;
    2222FspInfoHeaderRelativeOff    PROC      NEAR    PUBLIC
    … …  
    2828
    2929;
    30 ; Returns FSP Base Address. 
     30; Returns FSP Base Address.
    3131;
    3232; This function gets the FSP Info Header using relative addressing and returns the FSP Base from the header structure
    … …  
    4646   mov   eax, AsmGetFspBaseAddress
    4747   sub   eax, dword ptr [FspInfoHeaderRelativeOff]
    48    add   eax, 01Ch   
     48   add   eax, 01Ch
    4949   mov   eax, dword ptr [eax]
    5050   jmp   edi
    … …  
    5252
    5353;
    54 ; Returns FSP Info Header. 
     54; Returns FSP Info Header.
    5555;
    5656; This function gets the FSP Info Header using relative addressing and returns it

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/FspHelper.s

    r58464 r58466  
    1717
    1818#
    19 # FspInfoHeaderRelativeOff is patched during build process and initialized to offset of the  AsmGetFspBaseAddress 
    20 # from the FSP Info header. 
     19# FspInfoHeaderRelativeOff is patched during build process and initialized to offset of the  AsmGetFspBaseAddress
     20# from the FSP Info header.
    2121#
    2222ASM_GLOBAL ASM_PFX(FspInfoHeaderRelativeOff)
    … …  
    2828
    2929#
    30 # Returns FSP Base Address. 
     30# Returns FSP Base Address.
    3131#
    3232# This function gets the FSP Info Header using relative addressing and returns the FSP Base from the header structure
    … …  
    4747   mov    $AsmGetFspBaseAddress, %eax
    4848   sub    FspInfoHeaderRelativeOff, %eax
    49    add    $0x01C, %eax 
     49   add    $0x01C, %eax
    5050   mov    (%eax), %eax
    5151   jmp    *%edi
    5252
    5353#
    54 # Returns FSP Info Header. 
     54# Returns FSP Info Header.
    5555#
    5656# This function gets the FSP Info Header using relative addressing and returns it
    … …  
    6161   sub    FspInfoHeaderRelativeOff, %eax
    6262   ret
    63    
     63
    6464#
    6565# No stack counter part of AsmGetFspInfoHeader. Return address is in edi.

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/MicrocodeLoad.inc

    • Property svn:eol-style set to native

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/SaveRestoreSse.inc

    • Property svn:eol-style set to native
    r58464 r58466  
    5050;
    5151; XMM7 to save/restore EBP, EBX, ESI, EDI
    52 ; 
     52;
    5353SAVE_REGS    MACRO
    5454  SXMMN      xmm7, 0, ebp
    … …  
    6969;
    7070; XMM6 to save/restore EAX, EDX, ECX, ESP
    71 ; 
     71;
    7272LOAD_EAX     MACRO
    7373  LXMMN      xmm6, eax, 1
    … …  
    101101  movd       esp,  xmm6
    102102             ENDM
    103              
     103
    104104;
    105105; XMM5 for calling stack
    … …  
    111111IFDEF USE_SSE41_FLAG
    112112             pinsrd  xmm5, esi, 0
    113 ELSE             
     113ELSE
    114114             pinsrw  xmm5, esi, 0
    115115             ror     esi,  16
    116              pinsrw  xmm5, esi, 1                       
    117 ENDIF             
     116             pinsrw  xmm5, esi, 1
     117ENDIF
    118118             mov     esi,  Entry
    119119             jmp     esi
    120 ReturnAddress:             
     120ReturnAddress:
    121121             ENDM
    122            
    123 RET_XMM      MACRO               
     122
     123RET_XMM      MACRO
    124124             movd    esi, xmm5
    125125             psrldq  xmm5, 4
    126126             jmp     esi
    127127             ENDM
    128              
     128
    129129ENABLE_SSE   MACRO
    130130            ;
    131131            ; Initialize floating point units
    132132            ;
    133             local   NextAddress           
     133            local   NextAddress
    134134            jmp     NextAddress
    135135ALIGN 4
    … …  
    143143            ; all exceptions masked, round-to-nearest, flush to zero for masked underflow
    144144            ;
    145 MmxControlWord       DD      01F80h 
    146 SseError:     
     145MmxControlWord       DD      01F80h
     146SseError:
    147147            ;
    148148            ; Processor has to support SSE
    149149            ;
    150             jmp     SseError     
    151 NextAddress:           
     150            jmp     SseError
     151NextAddress:
    152152            finit
    153153            fldcw   FpuControlWord
    … …  
    166166            ; SSE 4.1 support
    167167            ;
    168             bt      ecx, 19   
     168            bt      ecx, 19
    169169            jnc     SseError
    170170ENDIF

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/Ia32/Stacks.s

    r58464 r58466  
    8383    popl   %ecx
    8484    popl   %ebx
    85     popl   %eax   
     85    popl   %eax
    8686    ret

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/SecFsp.c

    r58464 r58466  
    330330  VOID
    331331  )
    332 { 
     332{
    333333  return PcdGet32 (PcdFspBootFirmwareVolumeBase) - PcdGet32 (PcdFspAreaBaseAddress);
    334334}

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/FspSecCore/SecMain.c

    r58464 r58466  
    124124  //
    125125  // Call PeiCore Entry
    126   // 
     126  //
    127127  PeiCore (&SecCoreData, mPeiSecPlatformInformationPpi);
    128128

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Include/FspApi.h

    r58464 r58466  
    222222  each FSP release.
    223223  After FspMemInit completes its execution, it passes the pointer to the HobList and
    224   returns to the boot loader from where it was called. BootLoader is responsible to 
     224  returns to the boot loader from where it was called. BootLoader is responsible to
    225225  migrate it's stack and data to Memory.
    226226  FspMemoryInit, TempRamExit and FspSiliconInit APIs provide an alternate method to

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Include/FspInfoHeader.h

    r58464 r58466  
    147147  UINT8   Reserved;
    148148  ///
    149   /// Byte 0x0A: FSP producer identification string 
     149  /// Byte 0x0A: FSP producer identification string
    150150  ///
    151151  CHAR8   FspProducerId[6];

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/IntelFspPkg.dec

    r58464 r58466  
    2222  Include
    2323  Include/Private
    24  
     24
    2525[LibraryClasses]
    2626  ##  @libraryclass  Provides cache-as-ram support.
    … …  
    4141  ##  @libraryclass  Provides FSP switch stack function.
    4242  FspSwitchStackLib|Include/Library/FspSwitchStackLib.h
    43  
     43
    4444  ##  @libraryclass  Provides FSP platform sec related actions.
    4545  FspSecPlatformLib|Include/Library/FspSecPlatformLib.h

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/IntelFspPkg.dsc

    • Property svn:eol-style set to native

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf

    r58464 r58466  
    11## @file
    2 #  Instance of FspCommonLib 
     2#  Instance of FspCommonLib
    33#  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
    44#

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformMemory.c

    r58464 r58466  
    9292  VOID                      *PlatformDataPtr;
    9393  UINT8                      ApiMode;
    94    
     94
    9595  ApiMode = GetFspApiCallingMode ();
    9696

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformNotify.c

    r58464 r58466  
    106106    //
    107107    FspInitParams   = (FSP_INIT_PARAMS *)GetFspApiParameter ();
    108  
     108
    109109    //
    110110    // Modify the parameters for ContinuationFunc
    … …  
    112112    SetFspContinuationFuncParameter(EFI_SUCCESS, 0);
    113113    SetFspContinuationFuncParameter((UINT32)GetHobList(), 1);
    114  
     114
    115115    //
    116116    // Modify the return address to ContinuationFunc
    117117    //
    118118    SetFspApiReturnAddress((UINT32)FspInitParams->ContinuationFunc);
    119  
     119
    120120    //
    121121    // Give control back to the boot loader framework caller after FspInit is done

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.asm

    r58464 r58466  
    7171  ; Now we're in 16 bit protected mode
    7272  ; Set up the selectors for 32 bit protected mode entry
    73   ; 
     73  ;
    7474  mov     ax, SYS_DATA_SEL
    7575  mov     ds, ax
    … …  
    9090_TEXT_REALMODE      ENDS
    9191
    92 .code 
     92.code
    9393;
    9494; Protected mode portion initializes stack, configures cache, and calls C entry point
    … …  
    180180  DD      OFFSET ProtectedModeEntryPoint  ; Offset of our 32 bit code
    181181  DW      LINEAR_CODE_SEL
    182  
     182
    183183END

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Library/SecFspSecPlatformLibNull/Ia32/Flat32.s

    r58464 r58466  
    5353  .byte   0x66,0xbe        #movl    $GdtDesc, %esi
    5454  .long   GdtDesc
    55  
     55
    5656  .byte   0x66,0x2e,0x0f,0x01,0x14   #lgdt    %cs:(%si)
    5757
    … …  
    6666  # Now we're in 16 bit protected mode
    6767  # Set up the selectors for 32 bit protected mode entry
    68   # 
     68  #
    6969  .byte   0xb8                 #movw    SYS_DATA_SEL, %ax
    7070  .word   SYS_DATA_SEL
    71  
     71
    7272  .byte   0x8e,0xd8            #movw    %ax, %ds
    7373  .byte   0x8e,0xc0            #movw    %ax, %es
    … …  
    8181  #
    8282  .byte   0x66,0xbe            #movl   ProtectedModeEntryLinearAddress, %esi
    83   .long   ProtectedModeEntryLinearAddress 
     83  .long   ProtectedModeEntryLinearAddress
    8484  .byte   0x66,0x2e,0xff,0x2c  #jmp    %cs:(%esi)
    8585
    … …  
    132132#
    133133.equ   NULL_SEL, . - GDT_BASE         # Selector [0]
    134 GDT_BASE: 
    135 BootGdtTable:   
     134GDT_BASE:
     135BootGdtTable:
    136136        .long   0
    137137        .long   0
    … …  
    163163#
    164164GdtDesc:                                     # GDT descriptor
    165        .word    GDT_SIZE - 1               
    166        .long    BootGdtTable       
     165       .word    GDT_SIZE - 1
     166       .long    BootGdtTable
    167167
    168168ProtectedModeEntryLinearAddress:

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Library/SecFspSecPlatformLibNull/Ia32/SecCarInit.asm

    r58464 r58466  
    2626ENDM
    2727
    28 .code 
     28.code
    2929
    3030;-----------------------------------------------------------------------------

  • trunk/src/VBox/Devices/EFI/Firmware/IntelFspPkg/Tools/GenCfgOpt.py

    r58464 r58466  
    895895               OldTextBody.append (Line)
    896896
    897            if Match and Match.group(3) == 'END': 
     897           if Match and Match.group(3) == 'END':
    898898               if (StructName != Match.group(1)) or (VariableName != Match.group(2)):
    899899                   print "Unmatched struct name '%s' and '%s' !"  % (StructName, Match.group(1))
    … …  
    10031003                if Offset != Item["offset"]:
    10041004                    self.Error = "Unsorted offset 0x%04X\n" % Item["offset"]
    1005                     return 3                   
     1005                    return 3
    10061006
    10071007                LastVisible = NextVisible
    … …  
    10231023                    Line = Marker + self.CreateField (Item, Item["cname"], Item["length"], Item["offset"], Item['struct'], Item['name'], Item['help'])
    10241024                    TxtBody.append(Line)
    1025                    
     1025
    10261026            TxtBody.append("} " + Region[0] + "PD_DATA_REGION;\n\n")
    1027        
     1027
    10281028        # Handle the embedded data structure
    10291029        TxtBody = self.PostProcessBody (TxtBody)
    … …  
    10591059                    HeaderFd.write(Line)
    10601060            HeaderFd.write("\n\n")
    1061            
     1061
    10621062        for Line in TxtBody:
    10631063            HeaderFd.write (Line)
    … …  
    11231123                BsfFd.write(',\n')
    11241124                WriteHelp = 1
    1125            
     1125
    11261126        if WriteHelp  > 0:
    11271127            HelpLines = Item['help'].split('\\n\\r')
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette