Howto build UEFI RealView EB for RealTime System Model\r
------------------------------------------------------\r
\r
-1. Set up the environment. And build the EDK2\92s tools\r
+For Linux\r
+---------\r
+\r
+1. Get EDK2 from Tianocore Subversion repository\r
+svn co https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2 edk2 --username guest\r
+ \r
+2. Get FatPkg from EDK2 SVN repository: \r
+cd edk2\r
+svn co https://edk2-fatdriver2.svn.sourceforge.net/svnroot/edk2-fatdriver2/trunk/FatPkg FatPkg --username guest\r
+\r
+3. Apply BaseTools patches (BaseTools-Pending-Patches.patch combines all the currently pending BaseTools patches)\r
+patch -p1 < ArmPlatformPkg/Documentation/patches/BaseTools-Pending-Patches.patch\r
+\r
+4. Set up the environment. And build the EDK2\92s tools\r
export EDK_TOOLS_PATH=`pwd`/BaseTools\r
. edksetup.sh `pwd`/BaseTools/\r
make -C $EDK_TOOLS_PATH\r
\r
-2. Build the ARM RealView EB UEFI Firmware\r
-build -a ARM -p ArmPlatformPkg/ArmRealViewEBPkg/ArmRealViewEb-RTSM-A8.dsc -t RVCT\r
+5. Build the ARM RealView EB UEFI Firmware\r
+build -a ARM -p ArmPlatformPkg/ArmRealViewEBPkg/ArmRealViewEb-RTSM-A8.dsc -t RVCTLINUX\r
\r
\r
Howto test UEFI RealView EB on RealTime System Model - Example Cortex A8\r
cd edk2\r
svn co https://edk2-fatdriver2.svn.sourceforge.net/svnroot/edk2-fatdriver2/trunk/FatPkg FatPkg --username guest\r
\r
-3. Apply some BaseTools patches\r
-patch -p0 < ArmPlatformPkg/Documentation/patches/BaseTools-armgcc_build_rule_template.patch\r
-patch -p1 < ArmPlatformPkg/Documentation/patches/BaseTools-Define-the-CodeSourcery-toolchain-path-with-ENV.patch\r
-patch -p1 < ArmPlatformPkg/Documentation/patches/BaseTools-Add-mword-relocations-to-ARMGCC.patch\r
+3. Apply BaseTools patches (BaseTools-Pending-Patches.patch combines all the currently pending BaseTools patches)\r
+patch -p1 < ArmPlatformPkg/Documentation/patches/BaseTools-Pending-Patches.patch\r
\r
4. Set up the environment. And build the EDK2\92s tools\r
export EDK_TOOLS_PATH=`pwd`/BaseTools\r
--- /dev/null
+From 7241330bc45c2e03e8edaf4282f22be204f22d22 Mon Sep 17 00:00:00 2001
+From: Olivier Martin <olivier.martin@arm.com>
+Date: Fri, 14 Jan 2011 11:53:24 +0000
+Subject: [PATCH 33/37] BaseTools: Add new 'RVCT' & 'RVCTLINUX' toolchains
+
+These toolchains use the fix for the ENV() macro. There is no need of hardcoded path.
+That will remove the update of tools_def for any single new toolchain build number.
+---
+ BaseTools/Conf/tools_def.template | 154 +++++++++++++++++++++++++++++++++----
+ 1 files changed, 140 insertions(+), 14 deletions(-)
+
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index 0645d6f..f9db7db 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -164,8 +164,6 @@ DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Develope
+ DEFINE RVCT31_TOOLS_PATH = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
+ DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
+ \r
+-DEFINE SOURCERY_TOOLS = c:/Program Files/CodeSourcery/Sourcery G++ Lite/bin\r
+-DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin\r
+ \r
+ ####################################################################################\r
+ #\r
+@@ -3020,6 +3018,45 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL
+ *_ICC11x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
+ *_ICC11x86_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP\r
+ \r
++####################################################################################\r
++#\r
++# ARM RealView 4.0 Tools & Linux\r
++#\r
++####################################################################################\r
++# ARMCYGWIN - Tools from ARM in a Cygwin environment\r
++\r
++*_RVCTLINUX_*_*_FAMILY = RVCT\r
++*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX\r
++\r
++#\r
++# Use default values, or override in DSC file\r
++#\r
++*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r
++*_RVCTLINUX_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r
++*_RVCTLINUX_ARM_ARCHDLINK_FLAGS = \r
++*_RVCTLINUX_ARM_PLATFORM_FLAGS =\r
++\r
++DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(DLINKPATH_FLAG) $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
++RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(DLINKPATH_FLAG) $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
++\r
++*_RVCTLINUX_ARM_ASM_FLAGS = $(ASMPATH_FLAG) $(ARCHASM_FLAGS) --apcs /interwork\r
++*_RVCTLINUX_ARM_PP_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
++*_RVCTLINUX_ARM_VFRPP_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
++*_RVCTLINUX_ARM_MAKE_PATH = make\r
++*_RVCTLINUX_ARM_SLINK_FLAGS = $(SLINKPATH_FLAG) --partial -o\r
++ DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
++RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
++\r
++##################\r
++# ARM definitions\r
++##################\r
++*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
++*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
+ \r
+ ####################################################################################\r
+ #\r
+@@ -3387,7 +3424,7 @@ RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter
+ \r
+ ####################################################################################\r
+ #\r
+-# ARM Tools\r
++# ARM RealView 3.1 Tools\r
+ #\r
+ ####################################################################################\r
+ # RVCT31 - Tools from ARM\r
+@@ -3427,7 +3464,7 @@ RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospac
+ \r
+ ####################################################################################\r
+ #\r
+-# ARM Tools & Cygwin\r
++# ARM RealView 3.1 Tools & Cygwin\r
+ #\r
+ ####################################################################################\r
+ # ARMCYGWIN - Tools from ARM in a Cygwin environment\r
+@@ -3476,6 +3513,95 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
+ \r
+ ####################################################################################\r
+ #\r
++# ARM RealView 4.0 Tools\r
++#\r
++####################################################################################\r
++# RVCT - Tools from ARM\r
++\r
++*_RVCT_*_*_FAMILY = RVCT\r
++\r
++#\r
++# Use default values, or override in DSC file\r
++#\r
++*_RVCT_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r
++*_RVCT_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r
++*_RVCT_ARM_ARCHDLINK_FLAGS = \r
++*_RVCT_ARM_PLATFORM_FLAGS =\r
++\r
++ DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
++RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
++\r
++\r
++*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork\r
++*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
++*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
++*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO\r
++*_RVCT_ARM_SLINK_FLAGS = --partial -o\r
++ DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++\r
++##################\r
++# ARM definitions\r
++##################\r
++*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
++*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
++\r
++####################################################################################\r
++#\r
++# ARM RealView 4.0 Tools & Cygwin\r
++#\r
++####################################################################################\r
++# ARMCYGWIN - Tools from ARM in a Cygwin environment\r
++\r
++*_RVCTCYGWIN_*_*_FAMILY = RVCT\r
++*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
++\r
++*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm\r
++*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf\r
++\r
++\r
++#\r
++# Use default values, or override in DSC file\r
++#\r
++*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r
++*_RVCTCYGWIN_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r
++*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS = \r
++*_RVCTCYGWIN_ARM_PLATFORM_FLAGS =\r
++\r
++ DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
++RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
++\r
++*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork\r
++*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
++*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
++*_RVCTCYGWIN_ARM_MAKE_PATH = make\r
++*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o\r
++ DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O2 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
++RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
++\r
++##################\r
++# ARM definitions\r
++##################\r
++*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++\r
++####################################################################################\r
++#\r
+ # ARM GCC (www.codesourcery.com)\r
+ #\r
+ ####################################################################################\r
+@@ -3484,7 +3610,7 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
+ *_ARMGCC_*_*_FAMILY = GCC\r
+ *_ARMGCC_*_*_BUILDRULEFAMILY = ARMGCC\r
+ \r
+-*_ARMGCC_*_MAKE_PATH = DEF(SOURCERY_TOOLS)/cs-make\r
++*_ARMGCC_*_MAKE_PATH = make\r
+ *_ARMGCC_*_MAKE_FLAGS = --no-print-directory\r
+ \r
+ ##################\r
+@@ -3501,16 +3627,16 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
+ # ARM definitions\r
+ ##################\r
+ \r
+-*_ARMGCC_ARM_ASLCC_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
+-*_ARMGCC_ARM_ASLDLINK_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld\r
+-*_ARMGCC_ARM_ASLPP_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
++*_ARMGCC_ARM_ASLCC_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
++*_ARMGCC_ARM_ASLDLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld\r
++*_ARMGCC_ARM_ASLPP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
+ \r
+-*_ARMGCC_ARM_CC_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
+-*_ARMGCC_ARM_SLINK_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-ar\r
+-*_ARMGCC_ARM_DLINK_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld\r
+-*_ARMGCC_ARM_ASM_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-as\r
+-*_ARMGCC_ARM_PP_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
+-*_ARMGCC_ARM_VFRPP_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
++*_ARMGCC_ARM_CC_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
++*_ARMGCC_ARM_SLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar\r
++*_ARMGCC_ARM_DLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld\r
++*_ARMGCC_ARM_ASM_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as\r
++*_ARMGCC_ARM_PP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
++*_ARMGCC_ARM_VFRPP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
+ \r
+ #\r
+ # Use default values, or override in DSC file\r
+--
+1.6.3.3
+
--- /dev/null
+diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
+index e6e8847..6a78d01 100644
+--- a/BaseTools/Source/Python/AutoGen/GenC.py
++++ b/BaseTools/Source/Python/AutoGen/GenC.py
+@@ -67,11 +67,11 @@ typedef UINT8 SKU_ID;
+
+ #define PCD_TYPE_SHIFT 28
+
+-#define PCD_TYPE_DATA (0x0 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_HII (0x8 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_VPD (0x4 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_SKU_ENABLED (0x2 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_STRING (0x1 << PCD_TYPE_SHIFT)
++#define PCD_TYPE_DATA (0x0u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_HII (0x8u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_VPD (0x4u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_SKU_ENABLED (0x2u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_STRING (0x1u << PCD_TYPE_SHIFT)
+
+ #define PCD_TYPE_ALL_SET (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
+
--- /dev/null
+diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+old mode 100644
+new mode 100755
+index 189dc43..af47709
+--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
++++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+@@ -505,6 +505,7 @@ Returns:
+ \r
+ EFI_STATUS\r
+ AddPadFile (\r
++ IN FV_INFO *FvInfo,\r
+ IN OUT MEMORY_FILE *FvImage,\r
+ IN UINT32 DataAlignment,\r
+ IN VOID *FvEnd,\r
+@@ -536,6 +537,8 @@ Returns:
+ {\r
+ EFI_FFS_FILE_HEADER *PadFile;\r
+ UINTN PadFileSize;\r
++ UINTN PadFileOffset;\r
++ UINTN ExtHeaderSize;\r
+ \r
+ //\r
+ // Verify input parameters.\r
+@@ -558,32 +561,29 @@ Returns:
+ // This is the earliest possible valid offset (current plus pad file header\r
+ // plus the next file header)\r
+ //\r
+- PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);\r
++ // The padding is added into its own FFS file (which requires a header) added before the aligned file:\r
++ // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData\r
+ \r
+ //\r
+- // Add whatever it takes to get to the next aligned address\r
++ // Calculate the Offset of the Pad File from the beginning of the FV file\r
+ //\r
+- while ((PadFileSize % DataAlignment) != 0) {\r
+- PadFileSize++;\r
+- }\r
+- //\r
+- // Subtract the next file header size\r
+- //\r
+- PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
+-\r
+- //\r
+- // Subtract the starting offset to get size\r
+- //\r
+- PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
++ PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
+ \r
+ //\r
+- // Append extension header size\r
++ // Get the size of the extension header if exists\r
+ //\r
+ if (ExtHeader != NULL) {\r
+- PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;\r
++ ExtHeaderSize = ExtHeader->ExtHeaderSize;\r
++ } else {\r
++ ExtHeaderSize = 0;\r
+ }\r
+ \r
+ //\r
++ // Calculate the Size of the Padding to ensure the alignment of the data of the Next file\r
++ //\r
++ PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));\r
++\r
++ //\r
+ // Verify that we have enough space for the file header\r
+ //\r
+ if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {\r
+@@ -1110,7 +1110,7 @@ Returns:
+ //\r
+ // Add pad file if necessary\r
+ //\r
+- Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
++ Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
+ if (EFI_ERROR (Status)) {\r
+ Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");\r
+ free (FileBuffer);\r
+@@ -2295,7 +2295,7 @@ Returns:
+ //\r
+ // Add FV Extended Header contents to the FV as a PAD file\r
+ //\r
+- AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
++ AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
+ \r
+ //\r
+ // Fv Extension header change update Fv Header Check sum\r
--- /dev/null
+From 5552b8d1c885b1215cec72b8e21b5816a4511737 Mon Sep 17 00:00:00 2001
+From: Olivier Martin <olivier.martin@arm.com>
+Date: Wed, 8 Jun 2011 19:30:49 +0100
+Subject: [PATCH] Fix GenFv for FV files located at 0x0
+
+Fix GenFv for FV file rebased at 0x0 by using the more appropriate attribute 'BaseAddressSet' already defined in the FV_INFO structure.
+---
+ BaseTools/Source/C/GenFv/GenFv.c | 2 +-
+ BaseTools/Source/C/GenFv/GenFvInternalLib.c | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 BaseTools/Source/C/GenFv/GenFv.c
+
+diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
+old mode 100644
+new mode 100755
+index 2cb8771..4662461
+--- a/BaseTools/Source/C/GenFv/GenFv.c
++++ b/BaseTools/Source/C/GenFv/GenFv.c
+@@ -598,7 +598,7 @@ Returns:
+ );\r
+ } else {\r
+ VerboseMsg ("Create Fv image and its map file");\r
+- if (mFvDataInfo.BaseAddress != 0) {\r
++ if (mFvDataInfo.BaseAddressSet) {\r
+ VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);\r
+ }\r
+ //\r
+diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+index 189dc43..985e4d8 100644
+--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
++++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+@@ -209,6 +209,7 @@ Returns:
+ DebugMsg (NULL, 0, 9, "rebase address", "%s = %s", EFI_FV_BASE_ADDRESS_STRING, Value);\r
+ \r
+ FvInfo->BaseAddress = Value64;\r
++ FvInfo->BaseAddressSet = TRUE;\r
+ }\r
+ }\r
+ \r
+@@ -2820,7 +2821,7 @@ Returns:
+ //\r
+ // Don't need to relocate image when BaseAddress is not set.\r
+ //\r
+- if (FvInfo->BaseAddress == 0) {\r
++ if (FvInfo->BaseAddressSet == FALSE) {\r
+ return EFI_SUCCESS;\r
+ }\r
+ XipBase = FvInfo->BaseAddress + XipOffset;\r
+--
+1.6.3.3
+
--- /dev/null
+diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
+index 528bdb9..c201d3e 100644
+--- a/BaseTools/Conf/build_rule.template
++++ b/BaseTools/Conf/build_rule.template
+@@ -242,7 +242,7 @@
+ "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
+ \r
+ <Command.ARMGCC>\r
+- "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -) $(DLINK2_FLAGS)\r
++ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
+ \r
+ <Command.RVCT>\r
+ "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
+@@ -272,7 +272,7 @@
+ "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
+ \r
+ <Command.ARMGCC>\r
+- "$(DLINK)" $(DLINK_FLAGS) -( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -) $(DLINK2_FLAGS)\r
++ "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
+ \r
+ <Command.RVCT>\r
+ "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
+@@ -425,7 +425,7 @@
+ "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+ Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+ "$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
+- "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj -)\r
++ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj -\)\r
+ \r
+ <Command.XCODE>\r
+ "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+old mode 100644
+new mode 100755
+index 495f55d..09af677
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -164,8 +164,6 @@ DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Develope
+ DEFINE RVCT31_TOOLS_PATH = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
+ DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium\r
+ \r
+-DEFINE SOURCERY_TOOLS = c:/Program Files/CodeSourcery/Sourcery G++ Lite/bin\r
+-DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin\r
+ \r
+ #\r
+ # Change to the location clang was built\r
+@@ -3031,6 +3029,45 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL
+ *_ICC11x86_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC\r
+ *_ICC11x86_EBC_DLINK_FLAGS = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP\r
+ \r
++####################################################################################\r
++#\r
++# ARM RealView 4.0 Tools & Linux\r
++#\r
++####################################################################################\r
++# ARMCYGWIN - Tools from ARM in a Cygwin environment\r
++\r
++*_RVCTLINUX_*_*_FAMILY = RVCT\r
++*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX\r
++\r
++#\r
++# Use default values, or override in DSC file\r
++#\r
++*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r
++*_RVCTLINUX_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r
++*_RVCTLINUX_ARM_ARCHDLINK_FLAGS = \r
++*_RVCTLINUX_ARM_PLATFORM_FLAGS =\r
++\r
++DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(DLINKPATH_FLAG) $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
++RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(DLINKPATH_FLAG) $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
++\r
++*_RVCTLINUX_ARM_ASM_FLAGS = $(ASMPATH_FLAG) $(ARCHASM_FLAGS) --apcs /interwork\r
++*_RVCTLINUX_ARM_PP_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
++*_RVCTLINUX_ARM_VFRPP_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
++*_RVCTLINUX_ARM_MAKE_PATH = make\r
++*_RVCTLINUX_ARM_SLINK_FLAGS = $(SLINKPATH_FLAG) --partial -o\r
++ DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O1 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(CCPATH_FLAG) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167\r
++\r
++##################\r
++# ARM definitions\r
++##################\r
++*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
++*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
+ \r
+ ####################################################################################\r
+ #\r
+@@ -3463,7 +3500,7 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
+ \r
+ ####################################################################################\r
+ #\r
+-# ARM Tools\r
++# ARM RealView 3.1 Tools\r
+ #\r
+ ####################################################################################\r
+ # RVCT31 - Tools from ARM\r
+@@ -3503,7 +3540,7 @@ RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospac
+ \r
+ ####################################################################################\r
+ #\r
+-# ARM Tools & Cygwin\r
++# ARM RealView 3.1 Tools & Cygwin\r
+ #\r
+ ####################################################################################\r
+ # ARMCYGWIN - Tools from ARM in a Cygwin environment\r
+@@ -3552,6 +3589,95 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
+ \r
+ ####################################################################################\r
+ #\r
++# ARM RealView 4.0 Tools\r
++#\r
++####################################################################################\r
++# RVCT - Tools from ARM\r
++\r
++*_RVCT_*_*_FAMILY = RVCT\r
++\r
++#\r
++# Use default values, or override in DSC file\r
++#\r
++*_RVCT_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r
++*_RVCT_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r
++*_RVCT_ARM_ARCHDLINK_FLAGS = \r
++*_RVCT_ARM_PLATFORM_FLAGS =\r
++\r
++ DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
++RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map \r
++\r
++\r
++*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork\r
++*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
++*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
++*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO\r
++*_RVCT_ARM_SLINK_FLAGS = --partial -o\r
++ DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O1 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++\r
++##################\r
++# ARM definitions\r
++##################\r
++*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm\r
++*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf\r
++\r
++####################################################################################\r
++#\r
++# ARM RealView 4.0 Tools & Cygwin\r
++#\r
++####################################################################################\r
++# ARMCYGWIN - Tools from ARM in a Cygwin environment\r
++\r
++*_RVCTCYGWIN_*_*_FAMILY = RVCT\r
++*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN\r
++\r
++*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink\r
++*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm\r
++*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc\r
++*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf\r
++\r
++\r
++#\r
++# Use default values, or override in DSC file\r
++#\r
++*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu ARM1176JZF-S\r
++*_RVCTCYGWIN_ARM_ARCHASM_FLAGS = --cpu ARM1176JZF-S\r
++*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS = \r
++*_RVCTCYGWIN_ARM_PLATFORM_FLAGS =\r
++\r
++ DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
++RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` \r
++\r
++*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork\r
++*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E\r
++*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`\r
++*_RVCTCYGWIN_ARM_MAKE_PATH = make\r
++*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o\r
++ DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -O1 --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167\r
++\r
++##################\r
++# ARM definitions\r
++##################\r
++*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py\r
++\r
++####################################################################################\r
++#\r
+ # ARM GCC (www.codesourcery.com)\r
+ #\r
+ ####################################################################################\r
+@@ -3560,7 +3686,7 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
+ *_ARMGCC_*_*_FAMILY = GCC\r
+ *_ARMGCC_*_*_BUILDRULEFAMILY = ARMGCC\r
+ \r
+-*_ARMGCC_*_MAKE_PATH = DEF(SOURCERY_TOOLS)/cs-make\r
++*_ARMGCC_*_MAKE_PATH = make\r
+ *_ARMGCC_*_MAKE_FLAGS = --no-print-directory\r
+ \r
+ ##################\r
+@@ -3577,22 +3703,22 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
+ # ARM definitions\r
+ ##################\r
+ \r
+-*_ARMGCC_ARM_ASLCC_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
+-*_ARMGCC_ARM_ASLDLINK_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld\r
+-*_ARMGCC_ARM_ASLPP_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
++*_ARMGCC_ARM_ASLCC_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
++*_ARMGCC_ARM_ASLDLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld\r
++*_ARMGCC_ARM_ASLPP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
+ \r
+-*_ARMGCC_ARM_CC_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
+-*_ARMGCC_ARM_SLINK_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-ar\r
+-*_ARMGCC_ARM_DLINK_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-ld\r
+-*_ARMGCC_ARM_ASM_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-as\r
+-*_ARMGCC_ARM_PP_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
+-*_ARMGCC_ARM_VFRPP_PATH = DEF(SOURCERY_TOOLS)/arm-none-eabi-gcc\r
++*_ARMGCC_ARM_CC_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
++*_ARMGCC_ARM_SLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ar\r
++*_ARMGCC_ARM_DLINK_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-ld\r
++*_ARMGCC_ARM_ASM_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-as\r
++*_ARMGCC_ARM_PP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
++*_ARMGCC_ARM_VFRPP_PATH = ENV(ARMGCC_TOOLS_PATH)arm-none-eabi-gcc\r
+ \r
+ #\r
+ # Use default values, or override in DSC file\r
+ #\r
+-*_ARMGCC_ARM_ARCHCC_FLAGS = -march=armv7-a -mthumb\r
+-*_ARMGCC_ARM_ARCHASM_FLAGS = -march=armv7-a\r
++*_ARMGCC_ARM_ARCHCC_FLAGS = -march=armv7-a -mthumb -mthumb-interwork\r
++*_ARMGCC_ARM_ARCHASM_FLAGS = -march=armv7-a -mthumb-interwork\r
+ *_ARMGCC_ARM_ARCHDLINK_FLAGS =\r
+ *_ARMGCC_ARM_PLATFORM_FLAGS = -march=armv7-a\r
+ \r
+@@ -3603,10 +3729,10 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian
+ *_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
+ \r
+ *_ARMGCC_ARM_SLINK_FLAGS = -rc\r
+-*_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
++*_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --oformat=elf32-littlearm -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+ \r
+- DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g -O0 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
+-RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -Os -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
++ DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mword-relocations -mlittle-endian -g -O0 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
++RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mword-relocations -mlittle-endian -Os -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
+ \r
+ #################\r
+ # ASM 16 linker defintions\r
+diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
+index 2cb8771..4662461 100644
+--- a/BaseTools/Source/C/GenFv/GenFv.c
++++ b/BaseTools/Source/C/GenFv/GenFv.c
+@@ -598,7 +598,7 @@ Returns:
+ );\r
+ } else {\r
+ VerboseMsg ("Create Fv image and its map file");\r
+- if (mFvDataInfo.BaseAddress != 0) {\r
++ if (mFvDataInfo.BaseAddressSet) {\r
+ VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);\r
+ }\r
+ //\r
+diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+old mode 100644
+new mode 100755
+index 189dc43..496b96c
+--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
++++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+@@ -209,6 +209,7 @@ Returns:
+ DebugMsg (NULL, 0, 9, "rebase address", "%s = %s", EFI_FV_BASE_ADDRESS_STRING, Value);\r
+ \r
+ FvInfo->BaseAddress = Value64;\r
++ FvInfo->BaseAddressSet = TRUE;\r
+ }\r
+ }\r
+ \r
+@@ -505,6 +506,7 @@ Returns:
+ \r
+ EFI_STATUS\r
+ AddPadFile (\r
++ IN FV_INFO *FvInfo,\r
+ IN OUT MEMORY_FILE *FvImage,\r
+ IN UINT32 DataAlignment,\r
+ IN VOID *FvEnd,\r
+@@ -536,6 +538,8 @@ Returns:
+ {\r
+ EFI_FFS_FILE_HEADER *PadFile;\r
+ UINTN PadFileSize;\r
++ UINTN PadFileOffset;\r
++ UINTN ExtHeaderSize;\r
+ \r
+ //\r
+ // Verify input parameters.\r
+@@ -558,32 +562,29 @@ Returns:
+ // This is the earliest possible valid offset (current plus pad file header\r
+ // plus the next file header)\r
+ //\r
+- PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);\r
++ // The padding is added into its own FFS file (which requires a header) added before the aligned file:\r
++ // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData\r
+ \r
+ //\r
+- // Add whatever it takes to get to the next aligned address\r
++ // Calculate the Offset of the Pad File from the beginning of the FV file\r
+ //\r
+- while ((PadFileSize % DataAlignment) != 0) {\r
+- PadFileSize++;\r
+- }\r
+- //\r
+- // Subtract the next file header size\r
+- //\r
+- PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
+-\r
+- //\r
+- // Subtract the starting offset to get size\r
+- //\r
+- PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
++ PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
+ \r
+ //\r
+- // Append extension header size\r
++ // Get the size of the extension header if exists\r
+ //\r
+ if (ExtHeader != NULL) {\r
+- PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;\r
++ ExtHeaderSize = ExtHeader->ExtHeaderSize;\r
++ } else {\r
++ ExtHeaderSize = 0;\r
+ }\r
+ \r
+ //\r
++ // Calculate the Size of the Padding to ensure the alignment of the data of the Next file\r
++ //\r
++ PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));\r
++\r
++ //\r
+ // Verify that we have enough space for the file header\r
+ //\r
+ if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {\r
+@@ -1110,7 +1111,7 @@ Returns:
+ //\r
+ // Add pad file if necessary\r
+ //\r
+- Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
++ Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
+ if (EFI_ERROR (Status)) {\r
+ Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");\r
+ free (FileBuffer);\r
+@@ -2295,7 +2296,7 @@ Returns:
+ //\r
+ // Add FV Extended Header contents to the FV as a PAD file\r
+ //\r
+- AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
++ AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
+ \r
+ //\r
+ // Fv Extension header change update Fv Header Check sum\r
+@@ -2820,7 +2821,7 @@ Returns:
+ //\r
+ // Don't need to relocate image when BaseAddress is not set.\r
+ //\r
+- if (FvInfo->BaseAddress == 0) {\r
++ if (FvInfo->BaseAddressSet == FALSE) {\r
+ return EFI_SUCCESS;\r
+ }\r
+ XipBase = FvInfo->BaseAddress + XipOffset;\r
+diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
+index e6e8847..6a78d01 100644
+--- a/BaseTools/Source/Python/AutoGen/GenC.py
++++ b/BaseTools/Source/Python/AutoGen/GenC.py
+@@ -67,11 +67,11 @@ typedef UINT8 SKU_ID;
+
+ #define PCD_TYPE_SHIFT 28
+
+-#define PCD_TYPE_DATA (0x0 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_HII (0x8 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_VPD (0x4 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_SKU_ENABLED (0x2 << PCD_TYPE_SHIFT)
+-#define PCD_TYPE_STRING (0x1 << PCD_TYPE_SHIFT)
++#define PCD_TYPE_DATA (0x0u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_HII (0x8u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_VPD (0x4u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_SKU_ENABLED (0x2u << PCD_TYPE_SHIFT)
++#define PCD_TYPE_STRING (0x1u << PCD_TYPE_SHIFT)
+
+ #define PCD_TYPE_ALL_SET (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
+
projects / mirror_edk2.git / commitdiff