mirror of https://github.com/acidanthera/audk.git
Revert "BaseTools/BfmLib: Add a tool BfmLib"
This reverts commit dc7b0dc8d6.
There are the concerns on code design and code quality, and
request to rewrite FCE, BfmLib and FMMT for the review.
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Feng Bob C <bob.c.feng@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Feng Bob C <bob.c.feng@intel.com>
This commit is contained in:
Liming Gao
parent
064daac0c6
commit
28781fd52a
|
|
@ -1,29 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
|
||||
dir=$(dirname "$full_cmd")
|
||||
cmd=${full_cmd##*/}
|
||||
|
||||
if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
|
||||
then
|
||||
exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
|
||||
elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
|
||||
then
|
||||
if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
|
||||
then
|
||||
echo "BaseTools C Tool binary was not found ($cmd)"
|
||||
echo "You may need to run:"
|
||||
echo " make -C $EDK_TOOLS_PATH/Source/C"
|
||||
else
|
||||
exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
|
||||
fi
|
||||
elif [ -e "$dir/../../Source/C/bin/$cmd" ]
|
||||
then
|
||||
exec "$dir/../../Source/C/bin/$cmd" "$@"
|
||||
else
|
||||
echo "Unable to find the real '$cmd' to run"
|
||||
echo "This message was printed by"
|
||||
echo " $0"
|
||||
exit 127
|
||||
fi
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,439 +0,0 @@
|
|||
/** @file
|
||||
|
||||
The header of BinFileManager.c.
|
||||
|
||||
Copyright (c) 2011-2019, Intel Corporation. All rights reserved.<BR>
|
||||
SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
**/
|
||||
|
||||
#ifndef _BIN_FILE_MANAGER_
|
||||
#define _BIN_FILE_MANAGER_
|
||||
|
||||
#ifdef __GNUC__
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#include <io.h>
|
||||
#include <direct.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <FvLib.h>
|
||||
#include <Common/UefiBaseTypes.h>
|
||||
#include <Common/PiFirmwareVolume.h>
|
||||
#include <Common/PiFirmwareFile.h>
|
||||
|
||||
#include "CommonLib.h"
|
||||
#include "EfiUtilityMsgs.h"
|
||||
#include "ParseGuidedSectionTools.h"
|
||||
#include "StringFuncs.h"
|
||||
#include "Compress.h"
|
||||
#include "Decompress.h"
|
||||
#include "ParseInf.h"
|
||||
|
||||
#ifndef _MAX_PATH
|
||||
#define _MAX_PATH 500
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define OS_SEP '/'
|
||||
#define OS_SEP_STR "/"
|
||||
#define COPY_STR "cp \"%s\" \"%s\" > /dev/null"
|
||||
#define RMDIR_STR "rm -r \"%s\" > /dev/null"
|
||||
#define DEL_STR "rm \"%s\" > /dev/null"
|
||||
#else
|
||||
#define OS_SEP '\\'
|
||||
#define OS_SEP_STR "\\"
|
||||
#define COPY_STR "copy \"%s\" \"%s\" > NUL"
|
||||
#define RMDIR_STR "rmdir /S /Q \"%s\" > NUL"
|
||||
#define DEL_STR "del \"%s\" > NUL"
|
||||
#endif
|
||||
|
||||
#define TEMP_DIR_NAME "Temp"
|
||||
#define UTILITY_NAME "Binary File Manager (BFM)"
|
||||
#define UTILITY_SHORT_NAME "BFM"
|
||||
#define UTILITY_MAJOR_VERSION 0
|
||||
#define UTILITY_MINOR_VERSION 1
|
||||
#define MAX_BASENAME_LEN 60 // not good to HardCode, but let's be reasonable
|
||||
#define EFI_SECTION_ERROR EFIERR (100)
|
||||
//
|
||||
// The maximum number of Pad file guid entries.
|
||||
//
|
||||
#define MAX_NUMBER_OF_PAD_FILE_GUIDS 1024
|
||||
|
||||
//
|
||||
// The maximum number of block map entries supported by the library
|
||||
//
|
||||
#define MAX_NUMBER_OF_FV_BLOCKS 100
|
||||
|
||||
|
||||
//
|
||||
// The maximum number of sections in an FFS file.
|
||||
//
|
||||
#define MAX_NUMBER_OF_SECTION_IN_FFS 100
|
||||
|
||||
//
|
||||
// The maximum number of files in the FV supported by the library
|
||||
//
|
||||
#define MAX_NUMBER_OF_FILES_IN_FV 1000
|
||||
#define MAX_NUMBER_OF_FILES_IN_CAP 1000
|
||||
|
||||
|
||||
|
||||
///
|
||||
/// If present, this must be the first and only opcode,
|
||||
/// EFI_DEP_BEFORE is only used by DXE driver.
|
||||
///
|
||||
#define EFI_DEP_BEFORE 0x00
|
||||
|
||||
///
|
||||
/// If present, this must be the first and only opcode,
|
||||
/// EFI_DEP_AFTER is only used by DXE driver.
|
||||
///
|
||||
#define EFI_DEP_AFTER 0x01
|
||||
|
||||
#define EFI_DEP_PUSH 0x02
|
||||
#define EFI_DEP_AND 0x03
|
||||
#define EFI_DEP_OR 0x04
|
||||
#define EFI_DEP_NOT 0x05
|
||||
#define EFI_DEP_TRUE 0x06
|
||||
#define EFI_DEP_FALSE 0x07
|
||||
#define EFI_DEP_END 0x08
|
||||
|
||||
|
||||
///
|
||||
/// If present, this must be the first opcode,
|
||||
/// EFI_DEP_SOR is only used by DXE driver.
|
||||
///
|
||||
#define EFI_DEP_SOR 0x09
|
||||
|
||||
//
|
||||
// INF file strings
|
||||
//
|
||||
#define OPTIONS_SECTION_STRING "[options]"
|
||||
#define ATTRIBUTES_SECTION_STRING "[attributes]"
|
||||
#define FILES_SECTION_STRING "[files]"
|
||||
#define FV_BASE_ADDRESS_STRING "[FV_BASE_ADDRESS]"
|
||||
|
||||
//
|
||||
// Options section
|
||||
//
|
||||
#define EFI_FV_BASE_ADDRESS_STRING "EFI_BASE_ADDRESS"
|
||||
#define EFI_FV_FILE_NAME_STRING "EFI_FILE_NAME"
|
||||
#define EFI_NUM_BLOCKS_STRING "EFI_NUM_BLOCKS"
|
||||
#define EFI_BLOCK_SIZE_STRING "EFI_BLOCK_SIZE"
|
||||
#define EFI_GUID_STRING "EFI_GUID"
|
||||
#define EFI_FV_FILESYSTEMGUID_STRING "EFI_FV_GUID"
|
||||
#define EFI_FV_NAMEGUID_STRING "EFI_FVNAME_GUID"
|
||||
#define EFI_CAPSULE_GUID_STRING "EFI_CAPSULE_GUID"
|
||||
#define EFI_CAPSULE_HEADER_SIZE_STRING "EFI_CAPSULE_HEADER_SIZE"
|
||||
#define EFI_CAPSULE_FLAGS_STRING "EFI_CAPSULE_FLAGS"
|
||||
#define EFI_CAPSULE_VERSION_STRING "EFI_CAPSULE_VERSION"
|
||||
|
||||
#define EFI_FV_TOTAL_SIZE_STRING "EFI_FV_TOTAL_SIZE"
|
||||
#define EFI_FV_TAKEN_SIZE_STRING "EFI_FV_TAKEN_SIZE"
|
||||
#define EFI_FV_SPACE_SIZE_STRING "EFI_FV_SPACE_SIZE"
|
||||
|
||||
|
||||
typedef UINT32 BFM_ENCAP_TYPE;
|
||||
|
||||
#define MAX_LEVEL_IN_FV_FILE 32
|
||||
|
||||
//
|
||||
// Types of BFM_ENCAP_TREENODE_TYPE
|
||||
//
|
||||
#define BFM_ENCAP_TREE_FV 0x1
|
||||
#define BFM_ENCAP_TREE_FFS 0x2
|
||||
#define BFM_ENCAP_TREE_GUIDED_SECTION 0x3
|
||||
#define BFM_ENCAP_TREE_COMPRESS_SECTION 0x4
|
||||
#define BFM_ENCAP_TREE_FV_SECTION 0x5
|
||||
|
||||
extern EFI_HANDLE mParsedGuidedSectionTools;
|
||||
extern BOOLEAN mFvGuidIsSet;
|
||||
extern EFI_GUID mFvNameGuid;
|
||||
|
||||
//
|
||||
// Structure to keep a list of GUID-To-BaseNames
|
||||
//
|
||||
typedef struct _GUID_TO_BASENAME {
|
||||
struct _GUID_TO_BASENAME *Next;
|
||||
INT8 Guid[PRINTED_GUID_BUFFER_SIZE];
|
||||
INT8 BaseName[MAX_BASENAME_LEN];
|
||||
} GUID_TO_BASENAME;
|
||||
|
||||
typedef struct _GUID_SEC_TOOL_ENTRY {
|
||||
EFI_GUID Guid;
|
||||
CHAR8* Name;
|
||||
CHAR8* Path;
|
||||
struct _GUID_SEC_TOOL_ENTRY *Next;
|
||||
} GUID_SEC_TOOL_ENTRY;
|
||||
|
||||
//
|
||||
// Private data types
|
||||
//
|
||||
//
|
||||
// Component information
|
||||
//
|
||||
typedef struct {
|
||||
UINTN Size;
|
||||
CHAR8 ComponentName[_MAX_PATH];
|
||||
} COMPONENT_INFO;
|
||||
|
||||
typedef struct {
|
||||
CHAR8 FfsName[_MAX_PATH];
|
||||
|
||||
//
|
||||
// UI Name for this FFS file, if has.
|
||||
//
|
||||
CHAR16 UiName[_MAX_PATH];
|
||||
|
||||
//
|
||||
// Total section number in this FFS.
|
||||
//
|
||||
UINT32 TotalSectionNum;
|
||||
|
||||
//
|
||||
// Describe the position of the FFS file.
|
||||
//
|
||||
UINT8 Level;
|
||||
//
|
||||
// If this FFS has no encapsulate section, this flag will set to True.
|
||||
//
|
||||
BOOLEAN IsLeaf;
|
||||
//
|
||||
// Section type for each section in FFS.
|
||||
//
|
||||
EFI_SECTION_TYPE SectionType[MAX_NUMBER_OF_SECTION_IN_FFS];
|
||||
|
||||
}FFS_ATTRIBUTES;
|
||||
|
||||
|
||||
typedef struct __ENCAP_INFO_DATA{
|
||||
//
|
||||
// Now Level
|
||||
//
|
||||
UINT8 Level;
|
||||
|
||||
//
|
||||
// Encapsulate type.
|
||||
//
|
||||
BFM_ENCAP_TYPE Type;
|
||||
|
||||
//
|
||||
// Data, if it's FV, should be FV header.
|
||||
//
|
||||
VOID *Data;
|
||||
|
||||
//
|
||||
// if FV ExtHeaderOffset not to zero, should also have FvExtHeader information
|
||||
//
|
||||
EFI_FIRMWARE_VOLUME_EXT_HEADER *FvExtHeader;
|
||||
|
||||
|
||||
//
|
||||
// Next node.
|
||||
//
|
||||
struct __ENCAP_INFO_DATA *NextNode;
|
||||
}ENCAP_INFO_DATA;
|
||||
|
||||
|
||||
//
|
||||
// Contain Offset and Data for PAD FFS contain reset vector or FIT data.
|
||||
//
|
||||
typedef struct _PATCH_DATA_PAD_FFS {
|
||||
//
|
||||
// The offset of data relative to FV start address;
|
||||
//
|
||||
UINT32 Offset;
|
||||
//
|
||||
// Data
|
||||
//
|
||||
VOID *Data;
|
||||
//
|
||||
// Length of Data
|
||||
//
|
||||
UINT32 Length;
|
||||
//
|
||||
// Next node.
|
||||
//
|
||||
struct _PATCH_DATA_PAD_FFS *NextNode;
|
||||
} PATCH_DATA_PAD_FFS;
|
||||
|
||||
|
||||
//
|
||||
// FV and capsule information holder
|
||||
//
|
||||
typedef struct _FV_INFOMATION{
|
||||
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
|
||||
EFI_FIRMWARE_VOLUME_EXT_HEADER *FvExtHeader;
|
||||
UINT32 ImageAddress;
|
||||
UINT32 FfsNumbers;
|
||||
CHAR8 FvName[_MAX_PATH];
|
||||
EFI_FV_BLOCK_MAP_ENTRY FvBlocks[MAX_NUMBER_OF_FV_BLOCKS];
|
||||
FFS_ATTRIBUTES FfsAttuibutes[MAX_NUMBER_OF_FILES_IN_FV];
|
||||
EFI_FFS_FILE_HEADER2 FfsHeader[MAX_NUMBER_OF_FILES_IN_FV];
|
||||
struct _FV_INFOMATION *FvNext;
|
||||
ENCAP_INFO_DATA *EncapData;
|
||||
UINT8 FvLevel;
|
||||
PATCH_DATA_PAD_FFS *PatchData;
|
||||
BOOLEAN IsBfvFlag;
|
||||
BOOLEAN IsInputFvFlag;
|
||||
|
||||
} FV_INFORMATION;
|
||||
|
||||
typedef struct _FIRMWARE_DEVICE {
|
||||
///
|
||||
/// Size of FD file
|
||||
///
|
||||
UINT32 Size;
|
||||
FV_INFORMATION *Fv;
|
||||
} FIRMWARE_DEVICE;
|
||||
|
||||
VOID
|
||||
Usage (
|
||||
VOID
|
||||
);
|
||||
|
||||
|
||||
CHAR8 *
|
||||
GenTempFile (
|
||||
VOID
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
LibFindFvInFd (
|
||||
IN FILE *InputFile,
|
||||
IN OUT FIRMWARE_DEVICE **FdData
|
||||
);
|
||||
|
||||
/**
|
||||
|
||||
Add function description
|
||||
|
||||
@param[in] Fv - Firmware Volume to get information from
|
||||
|
||||
@return EFI_STATUS
|
||||
|
||||
**/
|
||||
EFI_STATUS
|
||||
LibGetFvInfo (
|
||||
IN VOID *Fv,
|
||||
IN OUT FV_INFORMATION *CurrentFv,
|
||||
IN CHAR8 *FvName,
|
||||
IN UINT8 Level,
|
||||
IN UINT32 *FfsCount,
|
||||
IN BOOLEAN ViewFlag,
|
||||
IN BOOLEAN IsChildFv
|
||||
);
|
||||
|
||||
/*
|
||||
Get size info from FV file.
|
||||
|
||||
@param[in]
|
||||
@param[out]
|
||||
|
||||
@retval
|
||||
|
||||
*/
|
||||
EFI_STATUS
|
||||
LibGetFvSize (
|
||||
IN FILE *InputFile,
|
||||
OUT UINT32 *FvSize
|
||||
);
|
||||
|
||||
/**
|
||||
|
||||
This function returns the next larger size that meets the alignment
|
||||
requirement specified.
|
||||
|
||||
@param[in] ActualSize The size.
|
||||
@param[in] Alignment The desired alignment.
|
||||
|
||||
@retval EFI_SUCCESS Function completed successfully.
|
||||
@retval EFI_ABORTED The function encountered an error.
|
||||
|
||||
**/
|
||||
UINT32
|
||||
GetOccupiedSize (
|
||||
IN UINT32 ActualSize,
|
||||
IN UINT32 Alignment
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
LibCreateNewFdCopy(
|
||||
IN CHAR8* OldFd,
|
||||
IN CHAR8* NewFd
|
||||
);
|
||||
|
||||
/**
|
||||
Delete a directory and files in it.
|
||||
|
||||
@param[in] DirName Name of the directory need to be deleted.
|
||||
|
||||
@return EFI_INVALID_PARAMETER
|
||||
@return EFI_SUCCESS
|
||||
**/
|
||||
EFI_STATUS
|
||||
LibRmDir (
|
||||
IN CHAR8* DirName
|
||||
);
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Free the whole Fd data structure.
|
||||
|
||||
@param[in] Fd The pointer point to the Fd data structure.
|
||||
|
||||
**/
|
||||
VOID
|
||||
LibBfmFreeFd (
|
||||
FIRMWARE_DEVICE *Fd
|
||||
);
|
||||
|
||||
EFI_HANDLE
|
||||
LibPreDefinedGuidedTools (
|
||||
VOID
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
LibEncapNewFvFile(
|
||||
IN FV_INFORMATION *FvInFd,
|
||||
IN CHAR8 *TemDir,
|
||||
OUT CHAR8 **OutputFile
|
||||
);
|
||||
|
||||
EFI_STATUS
|
||||
LibLocateBfv(
|
||||
IN FIRMWARE_DEVICE *FdData,
|
||||
IN OUT CHAR8 **FvId,
|
||||
IN OUT FV_INFORMATION **FvInFd
|
||||
);
|
||||
|
||||
/**
|
||||
|
||||
Get the length of a file.
|
||||
|
||||
@param[in] FileName The name of a file.
|
||||
|
||||
@retval The length of file.
|
||||
|
||||
**/
|
||||
UINT64
|
||||
GetFileSize (
|
||||
IN CHAR8 *FileName
|
||||
);
|
||||
|
||||
/**
|
||||
|
||||
Get the length of BFV PAD file.
|
||||
|
||||
@retval The length of PAD file.
|
||||
|
||||
**/
|
||||
UINT32
|
||||
GetBfvPadSize (
|
||||
VOID
|
||||
);
|
||||
#endif
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
## @file
|
||||
# GNU/Linux makefile for 'BfmLib' module build.
|
||||
#
|
||||
# Copyright (c) 2011-2019, Intel Corporation. All rights reserved.<BR>
|
||||
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
#
|
||||
MAKEROOT ?= ..
|
||||
|
||||
APPNAME = BfmLib
|
||||
|
||||
LIBS = -lCommon
|
||||
|
||||
OBJECTS = BinFileManager.o BfmLib.o
|
||||
|
||||
include $(MAKEROOT)/Makefiles/app.makefile
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
## @file
|
||||
#
|
||||
# Windows makefile for 'BfmLib' module build.
|
||||
#
|
||||
# Copyright (c) 2011-2019, Intel Corporation. All rights reserved.<BR>
|
||||
# SPDX-License-Identifier: BSD-2-Clause-Patent#
|
||||
##
|
||||
!INCLUDE ..\Makefiles\ms.common
|
||||
|
||||
APPNAME = BfmLib
|
||||
|
||||
LIBS = $(LIB_PATH)\Common.lib
|
||||
|
||||
OBJECTS = BinFileManager.obj BfmLib.obj
|
||||
|
||||
!INCLUDE ..\Makefiles\ms.app
|
||||
|
||||
|
|
@ -47,7 +47,6 @@ VFRAUTOGEN = VfrCompile/VfrLexer.h
|
|||
APPLICATIONS = \
|
||||
BrotliCompress \
|
||||
VfrCompile \
|
||||
BfmLib \
|
||||
EfiRom \
|
||||
GenFfs \
|
||||
GenFv \
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ LIBRARIES = Common
|
|||
APPLICATIONS = \
|
||||
VfrCompile \
|
||||
BrotliCompress \
|
||||
BfmLib \
|
||||
EfiRom \
|
||||
GenCrc32 \
|
||||
GenFfs \
|
||||
|
|
|
|||
Loading…
Reference in New Issue