Sync EDKII BaseTools to BaseTools project r1988
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10607 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
Functions to get info and load PE/COFF image.
|
||||
|
||||
Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
@@ -629,15 +629,10 @@ Returns:
|
||||
}
|
||||
|
||||
//
|
||||
// If the destination address is not 0, use that rather than the
|
||||
// image address as the relocation target.
|
||||
// Use DestinationAddress field of ImageContext as the relocation address even if it is 0.
|
||||
//
|
||||
if (ImageContext->DestinationAddress) {
|
||||
BaseAddress = ImageContext->DestinationAddress;
|
||||
} else {
|
||||
BaseAddress = ImageContext->ImageAddress;
|
||||
}
|
||||
|
||||
BaseAddress = ImageContext->DestinationAddress;
|
||||
|
||||
if (!(ImageContext->IsTeImage)) {
|
||||
PeHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)((UINTN)ImageContext->ImageAddress +
|
||||
ImageContext->PeCoffHeaderOffset);
|
||||
|
@@ -68,7 +68,7 @@ SUBDIRS := $(LIBRARIES) $(APPLICATIONS)
|
||||
|
||||
.PHONY: outputdirs
|
||||
makerootdir:
|
||||
-mkdir $(MAKEROOT)
|
||||
-mkdir -p $(MAKEROOT)
|
||||
|
||||
.PHONY: subdirs $(SUBDIRS)
|
||||
subdirs: $(SUBDIRS)
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/**@file
|
||||
Header file for EFI Variable Services.
|
||||
|
||||
Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
|
||||
This program and the accompanying materials are licensed and made available
|
||||
under the terms and conditions of the BSD License which accompanies this
|
||||
@@ -18,8 +18,6 @@
|
||||
#ifndef __VARIABLE_FORMAT_H__
|
||||
#define __VARIABLE_FORMAT_H__
|
||||
|
||||
#define VARIABLE_STORE_SIGNATURE EFI_SIGNATURE_32 ('$', 'V', 'S', 'S')
|
||||
|
||||
#define VARIABLE_DATA 0x55AA
|
||||
|
||||
//
|
||||
@@ -31,12 +29,12 @@
|
||||
#pragma pack(1)
|
||||
|
||||
typedef struct {
|
||||
UINT32 Signature;
|
||||
UINT32 Size;
|
||||
UINT8 Format;
|
||||
UINT8 State;
|
||||
UINT16 Reserved;
|
||||
UINT32 Reserved1;
|
||||
EFI_GUID Signature;
|
||||
UINT32 Size;
|
||||
UINT8 Format;
|
||||
UINT8 State;
|
||||
UINT16 Reserved;
|
||||
UINT32 Reserved1;
|
||||
} VARIABLE_STORE_HEADER;
|
||||
|
||||
typedef struct {
|
||||
|
@@ -4,7 +4,7 @@
|
||||
working block, the header structure of the variable block, FTW
|
||||
working block, or event log block.
|
||||
|
||||
Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
|
||||
This program and the accompanying materials are licensed and made available
|
||||
under the terms and conditions of the BSD License which accompanies this
|
||||
@@ -34,7 +34,7 @@ typedef struct {
|
||||
#define WORKING_BLOCK_INVALID 0x2
|
||||
UINT8 Reserved : 6;
|
||||
UINT8 Reserved3[3];
|
||||
UINT32 WriteQueueSize;
|
||||
UINT64 WriteQueueSize;
|
||||
//
|
||||
// UINT8 WriteQueue[WriteQueueSize];
|
||||
//
|
||||
|
Reference in New Issue
Block a user