mirror of https://github.com/acidanthera/audk.git
ArmPlatformPkg/patches: Update the 'PendingPatches' on the latest BaseTools syncup
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12680 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin
parent
18d37b829c
commit
09bb585cb2
|
|
@ -1,88 +0,0 @@
|
|||
From 8b6e06bccbf4d405dfec6bd74fd0109b31768688 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Martin <olivier.martin@arm.com>
|
||||
Date: Thu, 22 Sep 2011 20:40:01 +0100
|
||||
Subject: [PATCH 1/3] BaseTools/tools_def.template: Use GCC_ALL_CC_FLAGS for
|
||||
ARMGCC and Clean up flags
|
||||
|
||||
---
|
||||
BaseTools/Conf/tools_def.template | 32 +++++++++++++++++---------------
|
||||
1 files changed, 17 insertions(+), 15 deletions(-)
|
||||
mode change 100644 => 100755 BaseTools/Conf/tools_def.template
|
||||
|
||||
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index fe7900e..4dffd21
|
||||
--- a/BaseTools/Conf/tools_def.template
|
||||
+++ b/BaseTools/Conf/tools_def.template
|
||||
@@ -1976,6 +1976,7 @@ DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-strict-aliasing -
|
||||
DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
|
||||
DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
|
||||
DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
|
||||
+DEFINE GCC_ARMGCC_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer
|
||||
DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie
|
||||
DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections
|
||||
DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
|
||||
@@ -4075,7 +4076,8 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
|
||||
|
||||
####################################################################################
|
||||
#
|
||||
-# ARM GCC (www.codesourcery.com)
|
||||
+#
|
||||
+# ARM EABI GCC (www.codesourcery.com)
|
||||
#
|
||||
####################################################################################
|
||||
# ARMGCC - ARM version of the GCC cross compiler
|
||||
@@ -4089,12 +4091,12 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
|
||||
##################
|
||||
# ASL definitions
|
||||
##################
|
||||
-*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
-*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)
|
||||
-*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
|
||||
-*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P
|
||||
-*_ARMGCC_*_ASLCC_FLAGS = -x c
|
||||
-*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable
|
||||
+*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
+*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)
|
||||
+*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
|
||||
+*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P
|
||||
+*_ARMGCC_*_ASLCC_FLAGS = -x c
|
||||
+*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable
|
||||
|
||||
##################
|
||||
# ARM definitions
|
||||
@@ -4114,22 +4116,22 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
-*_ARMGCC_ARM_ARCHCC_FLAGS = -march=armv7-a -mthumb
|
||||
-*_ARMGCC_ARM_ARCHASM_FLAGS = -march=armv7-a
|
||||
+*_ARMGCC_ARM_ARCHCC_FLAGS = -mthumb
|
||||
+*_ARMGCC_ARM_ARCHASM_FLAGS =
|
||||
*_ARMGCC_ARM_ARCHDLINK_FLAGS =
|
||||
*_ARMGCC_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
|
||||
- DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian -g
|
||||
-RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian
|
||||
+ DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g
|
||||
+RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian
|
||||
|
||||
-*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
|
||||
-*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
|
||||
+*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
|
||||
*_ARMGCC_ARM_SLINK_FLAGS = -rc
|
||||
*_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
|
||||
|
||||
- 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
|
||||
-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
|
||||
+ DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0
|
||||
+RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused
|
||||
|
||||
#################
|
||||
# ASM 16 linker defintions
|
||||
--
|
||||
1.7.5.1
|
||||
|
||||
|
|
@ -1,226 +0,0 @@
|
|||
From c6145f7d18b59722beeed14a1b0a97dcad8456f0 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Martin <olivier.martin@arm.com>
|
||||
Date: Thu, 22 Sep 2011 20:43:54 +0100
|
||||
Subject: [PATCH 2/3] BaseTools/tools_def.template: Replace RVCT31
|
||||
toolchains by Generic RVCT toolchains
|
||||
|
||||
This generic 'RVCT' toolchain is compatible with RVCT 3.1, 4.0, 4.1 and 5.0.
|
||||
---
|
||||
BaseTools/Conf/tools_def.template | 157 ++++++++++++++++++++++++-------------
|
||||
1 files changed, 101 insertions(+), 56 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
||||
index 4dffd21..049f29b 100755
|
||||
--- a/BaseTools/Conf/tools_def.template
|
||||
+++ b/BaseTools/Conf/tools_def.template
|
||||
@@ -161,8 +161,6 @@ DEFINE ICC_WIN_ASLCC_FLAGS = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcp
|
||||
DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc
|
||||
|
||||
DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Developer
|
||||
-DEFINE RVCT31_TOOLS_PATH = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
|
||||
-DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
|
||||
|
||||
DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
|
||||
|
||||
@@ -3986,97 +3984,144 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
|
||||
|
||||
|
||||
####################################################################################
|
||||
+# RVCT Common
|
||||
+####################################################################################
|
||||
+
|
||||
+DEFINE RVCT_ALL_CC_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 --diag_style=ide
|
||||
+DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --diag_style=ide
|
||||
+
|
||||
+
|
||||
+####################################################################################
|
||||
#
|
||||
-# ARM Tools
|
||||
+# ARM RealView Tools - Windows
|
||||
#
|
||||
####################################################################################
|
||||
-# RVCT31 - Tools from ARM
|
||||
+# RVCT - Tools from ARM
|
||||
|
||||
-*_RVCT31_*_*_FAMILY = RVCT
|
||||
+*_RVCT_*_*_FAMILY = RVCT
|
||||
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
-*_RVCT31_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A
|
||||
-*_RVCT31_ARM_ARCHASM_FLAGS = --cpu 7-A
|
||||
-*_RVCT31_ARM_ARCHDLINK_FLAGS =
|
||||
-*_RVCT31_ARM_PLATFORM_FLAGS =
|
||||
+*_RVCT_ARM_ARCHCC_FLAGS = --thumb
|
||||
+*_RVCT_ARM_ARCHASM_FLAGS =
|
||||
+*_RVCT_ARM_ARCHDLINK_FLAGS =
|
||||
+*_RVCT_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
+
|
||||
+ DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+
|
||||
+
|
||||
+*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
|
||||
+*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
|
||||
+*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO
|
||||
+*_RVCT_ARM_SLINK_FLAGS = --partial -o
|
||||
+ DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
|
||||
+RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
|
||||
+
|
||||
+##################
|
||||
+# ARM definitions
|
||||
+##################
|
||||
+*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm
|
||||
+*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf
|
||||
+
|
||||
+####################################################################################
|
||||
+#
|
||||
+# ARM RealView Tools - Linux
|
||||
+#
|
||||
+####################################################################################
|
||||
+# RVCTLINUX - Tools from ARM in a Cygwin environment
|
||||
|
||||
- DEBUG_RVCT31_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 --diag_style=ide
|
||||
-RELEASE_RVCT31_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 --diag_style=ide
|
||||
+*_RVCTLINUX_*_*_FAMILY = RVCT
|
||||
+*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX
|
||||
|
||||
+#
|
||||
+# Use default values, or override in DSC file
|
||||
+#
|
||||
+*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb
|
||||
+*_RVCTLINUX_ARM_ARCHASM_FLAGS =
|
||||
+*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =
|
||||
+*_RVCTLINUX_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
|
||||
-*_RVCT31_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide
|
||||
-*_RVCT31_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide
|
||||
-*_RVCT31_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
-*_RVCT31_ARM_MAKE_PATH = nmake
|
||||
-*_RVCT31_ARM_SLINK_FLAGS = --partial --diag_style=ide -o
|
||||
- DEBUG_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
-RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
+DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+
|
||||
+*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
|
||||
+*_RVCTLINUX_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
|
||||
+*_RVCTLINUX_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+*_RVCTLINUX_ARM_MAKE_PATH = make
|
||||
+*_RVCTLINUX_ARM_SLINK_FLAGS = --partial -o
|
||||
+ DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
|
||||
+RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
|
||||
|
||||
##################
|
||||
# ARM definitions
|
||||
##################
|
||||
-*_RVCT31_ARM_CC_PATH = DEF(RVCT31_TOOLS_PATH)/armcc
|
||||
-*_RVCT31_ARM_SLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink
|
||||
-*_RVCT31_ARM_DLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink
|
||||
-*_RVCT31_ARM_ASM_PATH = DEF(RVCT31_TOOLS_PATH)/armasm
|
||||
-*_RVCT31_ARM_PP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc
|
||||
-*_RVCT31_ARM_VFRPP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc
|
||||
-*_RVCT31_ARM_FROMELF_PATH = DEF(RVCT31_TOOLS_PATH)/fromelf
|
||||
+*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm
|
||||
+*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf
|
||||
|
||||
####################################################################################
|
||||
#
|
||||
-# ARM Tools & Cygwin
|
||||
+# ARM RealView Tools - Cygwin
|
||||
#
|
||||
####################################################################################
|
||||
# ARMCYGWIN - Tools from ARM in a Cygwin environment
|
||||
|
||||
-*_RVCT31CYGWIN_*_*_FAMILY = RVCT
|
||||
-*_RVCT31CYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN
|
||||
+*_RVCTCYGWIN_*_*_FAMILY = RVCT
|
||||
+*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN
|
||||
|
||||
-*_RVCT31CYGWIN_ARM_CCPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc
|
||||
-*_RVCT31CYGWIN_ARM_SLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink
|
||||
-*_RVCT31CYGWIN_ARM_DLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink
|
||||
-*_RVCT31CYGWIN_ARM_ASMPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armasm
|
||||
-*_RVCT31CYGWIN_ARM_PPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc
|
||||
-*_RVCT31CYGWIN_ARM_VFRPPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc
|
||||
-*_RVCT31CYGWIN_ARM_FROMELFPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/fromelf
|
||||
+*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm
|
||||
+*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf
|
||||
|
||||
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
-*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A
|
||||
-*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS = --cpu 7-A
|
||||
-*_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS =
|
||||
-*_RVCT31CYGWIN_ARM_PLATFORM_FLAGS =
|
||||
+*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb
|
||||
+*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =
|
||||
+*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =
|
||||
+*_RVCTCYGWIN_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
|
||||
- DEBUG_RVCT31CYGWIN_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` --diag_style=ide
|
||||
-RELEASE_RVCT31CYGWIN_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` --diag_style=ide
|
||||
+ DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map`
|
||||
+RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map`
|
||||
|
||||
-*_RVCT31CYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide
|
||||
-*_RVCT31CYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide
|
||||
-*_RVCT31CYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
|
||||
-*_RVCT31CYGWIN_ARM_MAKE_PATH = make
|
||||
-*_RVCT31CYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial --diag_style=ide -o
|
||||
- DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
-RELEASE_RVCT31CYGWIN_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 --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
+*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
|
||||
+*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
|
||||
+*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
|
||||
+*_RVCTCYGWIN_ARM_MAKE_PATH = make
|
||||
+*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o
|
||||
+ DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
|
||||
+RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
|
||||
|
||||
##################
|
||||
# ARM definitions
|
||||
##################
|
||||
-*_RVCT31CYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
|
||||
####################################################################################
|
||||
#
|
||||
-#
|
||||
# ARM EABI GCC (www.codesourcery.com)
|
||||
#
|
||||
####################################################################################
|
||||
--
|
||||
1.7.5.1
|
||||
|
||||
|
|
@ -1,144 +0,0 @@
|
|||
From 289ebaebf3c8c60c5cf09b53108c3ef671b64afe Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Martin <olivier.martin@arm.com>
|
||||
Date: Thu, 22 Sep 2011 20:46:41 +0100
|
||||
Subject: [PATCH 3/3] BaseTools/Conf: Add support for ARM GCC Linux EABI
|
||||
toolchain
|
||||
|
||||
---
|
||||
BaseTools/Conf/build_rule.template | 12 ++++----
|
||||
BaseTools/Conf/tools_def.template | 58 ++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 64 insertions(+), 6 deletions(-)
|
||||
mode change 100644 => 100755 BaseTools/Conf/build_rule.template
|
||||
|
||||
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index ff5af1c..c54b091
|
||||
--- a/BaseTools/Conf/build_rule.template
|
||||
+++ b/BaseTools/Conf/build_rule.template
|
||||
@@ -129,7 +129,7 @@
|
||||
"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
|
||||
"$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}
|
||||
|
||||
- <Command.ARMGCC>
|
||||
+ <Command.ARMGCC, Command.ARMLINUXGCC>
|
||||
"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
|
||||
|
||||
|
||||
@@ -217,7 +217,7 @@
|
||||
<Command.RVCT>
|
||||
"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
|
||||
|
||||
- <Command.RVCTCYGWIN, Command.ARMGCC>
|
||||
+ <Command.RVCTCYGWIN, Command.ARMGCC, Command.ARMLINUXGCC>
|
||||
# $(OBJECT_FILES_LIST) has wrong paths for cygwin
|
||||
"$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)
|
||||
|
||||
@@ -241,7 +241,7 @@
|
||||
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)
|
||||
"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
|
||||
|
||||
- <Command.ARMGCC>
|
||||
+ <Command.ARMGCC, Command.ARMLINUXGCC>
|
||||
"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)
|
||||
|
||||
<Command.RVCT>
|
||||
@@ -271,7 +271,7 @@
|
||||
<Command.GCC>
|
||||
"$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)
|
||||
|
||||
- <Command.ARMGCC>
|
||||
+ <Command.ARMGCC, Command.ARMLINUXGCC>
|
||||
"$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)
|
||||
|
||||
<Command.RVCT>
|
||||
@@ -292,7 +292,7 @@
|
||||
<OutputFile>
|
||||
$(DEBUG_DIR)(+)$(MODULE_NAME).efi
|
||||
|
||||
- <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC>
|
||||
+ <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC>
|
||||
"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
|
||||
$(CP) ${dst} $(OUTPUT_DIR)
|
||||
$(CP) ${dst} $(BIN_DIR)
|
||||
@@ -536,7 +536,7 @@
|
||||
"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
|
||||
"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}
|
||||
|
||||
- <Command.XCODE, Command.RVCT, Command.ARMGCC>
|
||||
+ <Command.XCODE, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC>
|
||||
GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)
|
||||
|
||||
|
||||
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
||||
index 049f29b..20c0033 100755
|
||||
--- a/BaseTools/Conf/tools_def.template
|
||||
+++ b/BaseTools/Conf/tools_def.template
|
||||
@@ -4178,6 +4178,64 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-end
|
||||
DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0
|
||||
RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused
|
||||
|
||||
+####################################################################################
|
||||
+#
|
||||
+# ARM GNU/Linux GCC
|
||||
+#
|
||||
+####################################################################################
|
||||
+# ARMLINUXGCC - ARM version of the GCC cross compiler
|
||||
+
|
||||
+*_ARMLINUXGCC_*_*_FAMILY = GCC
|
||||
+*_ARMLINUXGCC_*_*_BUILDRULEFAMILY = ARMLINUXGCC
|
||||
+
|
||||
+*_ARMLINUXGCC_*_MAKE_PATH = make
|
||||
+*_ARMLINUXGCC_*_MAKE_FLAGS = --no-print-directory
|
||||
+
|
||||
+##################
|
||||
+# ASL definitions
|
||||
+##################
|
||||
+*_ARMLINUXGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
+*_ARMLINUXGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)
|
||||
+*_ARMLINUXGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
|
||||
+*_ARMLINUXGCC_*_ASLPP_FLAGS = -x c -E -P
|
||||
+*_ARMLINUXGCC_*_ASLCC_FLAGS = -x c
|
||||
+*_ARMLINUXGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable
|
||||
+
|
||||
+##################
|
||||
+# ARM definitions
|
||||
+##################
|
||||
+
|
||||
+*_ARMLINUXGCC_ARM_ASLCC_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc
|
||||
+*_ARMLINUXGCC_ARM_ASLDLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld
|
||||
+*_ARMLINUXGCC_ARM_ASLPP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc
|
||||
+
|
||||
+*_ARMLINUXGCC_ARM_CC_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc
|
||||
+*_ARMLINUXGCC_ARM_SLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ar
|
||||
+*_ARMLINUXGCC_ARM_DLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld
|
||||
+*_ARMLINUXGCC_ARM_ASM_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-as
|
||||
+*_ARMLINUXGCC_ARM_PP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc
|
||||
+*_ARMLINUXGCC_ARM_VFRPP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc
|
||||
+
|
||||
+#
|
||||
+# Use default values, or override in DSC file
|
||||
+#
|
||||
+*_ARMLINUXGCC_ARM_ARCHCC_FLAGS = -mthumb
|
||||
+*_ARMLINUXGCC_ARM_ARCHASM_FLAGS =
|
||||
+*_ARMLINUXGCC_ARM_ARCHDLINK_FLAGS =
|
||||
+*_ARMLINUXGCC_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
+
|
||||
+ DEBUG_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g
|
||||
+RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian
|
||||
+
|
||||
+*_ARMLINUXGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
|
||||
+*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+
|
||||
+*_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc
|
||||
+*_ARMLINUXGCC_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
|
||||
+
|
||||
+ DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0
|
||||
+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
|
||||
+
|
||||
#################
|
||||
# ASM 16 linker defintions
|
||||
#################
|
||||
--
|
||||
1.7.5.1
|
||||
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
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:
|
||||
|
||||
EFI_STATUS
|
||||
AddPadFile (
|
||||
+ IN FV_INFO *FvInfo,
|
||||
IN OUT MEMORY_FILE *FvImage,
|
||||
IN UINT32 DataAlignment,
|
||||
IN VOID *FvEnd,
|
||||
@@ -536,6 +537,8 @@ Returns:
|
||||
{
|
||||
EFI_FFS_FILE_HEADER *PadFile;
|
||||
UINTN PadFileSize;
|
||||
+ UINTN PadFileOffset;
|
||||
+ UINTN ExtHeaderSize;
|
||||
|
||||
//
|
||||
// Verify input parameters.
|
||||
@@ -558,32 +561,29 @@ Returns:
|
||||
// This is the earliest possible valid offset (current plus pad file header
|
||||
// plus the next file header)
|
||||
//
|
||||
- PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);
|
||||
+ // The padding is added into its own FFS file (which requires a header) added before the aligned file:
|
||||
+ // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData
|
||||
|
||||
//
|
||||
- // Add whatever it takes to get to the next aligned address
|
||||
+ // Calculate the Offset of the Pad File from the beginning of the FV file
|
||||
//
|
||||
- while ((PadFileSize % DataAlignment) != 0) {
|
||||
- PadFileSize++;
|
||||
- }
|
||||
- //
|
||||
- // Subtract the next file header size
|
||||
- //
|
||||
- PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);
|
||||
-
|
||||
- //
|
||||
- // Subtract the starting offset to get size
|
||||
- //
|
||||
- PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;
|
||||
+ PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;
|
||||
|
||||
//
|
||||
- // Append extension header size
|
||||
+ // Get the size of the extension header if exists
|
||||
//
|
||||
if (ExtHeader != NULL) {
|
||||
- PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;
|
||||
+ ExtHeaderSize = ExtHeader->ExtHeaderSize;
|
||||
+ } else {
|
||||
+ ExtHeaderSize = 0;
|
||||
}
|
||||
|
||||
//
|
||||
+ // Calculate the Size of the Padding to ensure the alignment of the data of the Next file
|
||||
+ //
|
||||
+ PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));
|
||||
+
|
||||
+ //
|
||||
// Verify that we have enough space for the file header
|
||||
//
|
||||
if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {
|
||||
@@ -1110,7 +1110,7 @@ Returns:
|
||||
//
|
||||
// Add pad file if necessary
|
||||
//
|
||||
- Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);
|
||||
+ Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);
|
||||
if (EFI_ERROR (Status)) {
|
||||
Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");
|
||||
free (FileBuffer);
|
||||
@@ -2295,7 +2295,7 @@ Returns:
|
||||
//
|
||||
// Add FV Extended Header contents to the FV as a PAD file
|
||||
//
|
||||
- AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);
|
||||
+ AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);
|
||||
|
||||
//
|
||||
// Fv Extension header change update Fv Header Check sum
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
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:
|
||||
);
|
||||
} else {
|
||||
VerboseMsg ("Create Fv image and its map file");
|
||||
- if (mFvDataInfo.BaseAddress != 0) {
|
||||
+ if (mFvDataInfo.BaseAddressSet) {
|
||||
VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);
|
||||
}
|
||||
//
|
||||
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);
|
||||
|
||||
FvInfo->BaseAddress = Value64;
|
||||
+ FvInfo->BaseAddressSet = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2820,7 +2821,7 @@ Returns:
|
||||
//
|
||||
// Don't need to relocate image when BaseAddress is not set.
|
||||
//
|
||||
- if (FvInfo->BaseAddress == 0) {
|
||||
+ if (FvInfo->BaseAddressSet == FALSE) {
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
XipBase = FvInfo->BaseAddress + XipOffset;
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
|
@ -1,24 +1,7 @@
|
|||
From bda353ccfef6e63726352ab2bb15bea4798ea89b Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Martin <olivier.martin@arm.com>
|
||||
Date: Thu, 22 Sep 2011 20:40:01 +0100
|
||||
Subject: [PATCH] BaseTools/Conf: Contain all the changes added by the pending
|
||||
patches
|
||||
|
||||
---
|
||||
BaseTools/Conf/build_rule.template | 12 +-
|
||||
BaseTools/Conf/tools_def.template | 245 +++++++++++++++++++--------
|
||||
BaseTools/Source/C/GenFv/GenFv.c | 2 +-
|
||||
BaseTools/Source/C/GenFv/GenFvInternalLib.c | 39 +++--
|
||||
4 files changed, 202 insertions(+), 96 deletions(-)
|
||||
mode change 100644 => 100755 BaseTools/Conf/build_rule.template
|
||||
mode change 100644 => 100755 BaseTools/Conf/tools_def.template
|
||||
|
||||
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index ff5af1c..c54b091
|
||||
--- a/BaseTools/Conf/build_rule.template
|
||||
+++ b/BaseTools/Conf/build_rule.template
|
||||
Index: BaseTools/Conf/build_rule.template
|
||||
===================================================================
|
||||
--- BaseTools/Conf/build_rule.template (revision 12664)
|
||||
+++ BaseTools/Conf/build_rule.template (working copy)
|
||||
@@ -129,7 +129,7 @@
|
||||
"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
|
||||
"$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}
|
||||
|
|
@ -73,277 +56,28 @@ index ff5af1c..c54b091
|
|||
GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)
|
||||
|
||||
|
||||
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index fe7900e..20c0033
|
||||
--- a/BaseTools/Conf/tools_def.template
|
||||
+++ b/BaseTools/Conf/tools_def.template
|
||||
@@ -161,8 +161,6 @@ DEFINE ICC_WIN_ASLCC_FLAGS = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcp
|
||||
DEFINE ICC_WIN_ASLDLINK_FLAGS = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc
|
||||
|
||||
DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Developer
|
||||
-DEFINE RVCT31_TOOLS_PATH = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
|
||||
-DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
|
||||
|
||||
DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
|
||||
|
||||
@@ -1976,6 +1974,7 @@ DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-strict-aliasing -
|
||||
DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
|
||||
DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
|
||||
DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
|
||||
+DEFINE GCC_ARMGCC_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer
|
||||
DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie
|
||||
DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections
|
||||
DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
|
||||
@@ -3985,97 +3984,145 @@ RELEASE_XCLANG_X64_CC_FLAGS = -ccc-host-triple x86_64-pc-win32-macho -c -Os
|
||||
|
||||
|
||||
Index: BaseTools/Conf/tools_def.template
|
||||
===================================================================
|
||||
--- BaseTools/Conf/tools_def.template (revision 12664)
|
||||
+++ BaseTools/Conf/tools_def.template (working copy)
|
||||
@@ -467,6 +467,7 @@
|
||||
# MSFT - Microsoft
|
||||
# GCC - GNU GCC
|
||||
# INTEL - INTEL
|
||||
+# RVCT - ARM RealView Toolchain
|
||||
####################################################################################
|
||||
+# RVCT Common
|
||||
+####################################################################################
|
||||
+
|
||||
+DEFINE RVCT_ALL_CC_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 --diag_style=ide
|
||||
+DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --diag_style=ide
|
||||
+
|
||||
+
|
||||
+####################################################################################
|
||||
#
|
||||
-# ARM Tools
|
||||
+# ARM RealView Tools - Windows
|
||||
#
|
||||
####################################################################################
|
||||
-# RVCT31 - Tools from ARM
|
||||
+# RVCT - Tools from ARM
|
||||
|
||||
-*_RVCT31_*_*_FAMILY = RVCT
|
||||
+*_RVCT_*_*_FAMILY = RVCT
|
||||
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
-*_RVCT31_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A
|
||||
-*_RVCT31_ARM_ARCHASM_FLAGS = --cpu 7-A
|
||||
-*_RVCT31_ARM_ARCHDLINK_FLAGS =
|
||||
-*_RVCT31_ARM_PLATFORM_FLAGS =
|
||||
+*_RVCT_ARM_ARCHCC_FLAGS = --thumb
|
||||
+*_RVCT_ARM_ARCHASM_FLAGS =
|
||||
+*_RVCT_ARM_ARCHDLINK_FLAGS =
|
||||
+*_RVCT_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
|
||||
- DEBUG_RVCT31_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 --diag_style=ide
|
||||
-RELEASE_RVCT31_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 --diag_style=ide
|
||||
+ DEBUG_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+RELEASE_RVCT_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
|
||||
|
||||
-*_RVCT31_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide
|
||||
-*_RVCT31_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide
|
||||
-*_RVCT31_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
-*_RVCT31_ARM_MAKE_PATH = nmake
|
||||
-*_RVCT31_ARM_SLINK_FLAGS = --partial --diag_style=ide -o
|
||||
- DEBUG_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
-RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
+*_RVCT_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
|
||||
+*_RVCT_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
|
||||
+*_RVCT_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+*_RVCT_ARM_MAKE_PATH = nmake /NOLOGO
|
||||
+*_RVCT_ARM_SLINK_FLAGS = --partial -o
|
||||
+ DEBUG_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
|
||||
+RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
|
||||
|
||||
##################
|
||||
# ARM definitions
|
||||
##################
|
||||
-*_RVCT31_ARM_CC_PATH = DEF(RVCT31_TOOLS_PATH)/armcc
|
||||
-*_RVCT31_ARM_SLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink
|
||||
-*_RVCT31_ARM_DLINK_PATH = DEF(RVCT31_TOOLS_PATH)/armlink
|
||||
-*_RVCT31_ARM_ASM_PATH = DEF(RVCT31_TOOLS_PATH)/armasm
|
||||
-*_RVCT31_ARM_PP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc
|
||||
-*_RVCT31_ARM_VFRPP_PATH = DEF(RVCT31_TOOLS_PATH)/armcc
|
||||
-*_RVCT31_ARM_FROMELF_PATH = DEF(RVCT31_TOOLS_PATH)/fromelf
|
||||
+*_RVCT_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCT_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCT_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCT_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm
|
||||
+*_RVCT_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCT_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCT_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf
|
||||
|
||||
####################################################################################
|
||||
#
|
||||
-# ARM Tools & Cygwin
|
||||
+# ARM RealView Tools - Linux
|
||||
+#
|
||||
+####################################################################################
|
||||
+# RVCTLINUX - Tools from ARM in a Cygwin environment
|
||||
+
|
||||
+*_RVCTLINUX_*_*_FAMILY = RVCT
|
||||
+*_RVCTLINUX_*_*_BUILDRULEFAMILY = RVCTLINUX
|
||||
+
|
||||
+#
|
||||
+# Use default values, or override in DSC file
|
||||
+#
|
||||
+*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb
|
||||
+*_RVCTLINUX_ARM_ARCHASM_FLAGS =
|
||||
+*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =
|
||||
+*_RVCTLINUX_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
+
|
||||
+DEBUG_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+RELEASE_RVCTLINUX_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+
|
||||
+*_RVCTLINUX_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
|
||||
+*_RVCTLINUX_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
|
||||
+*_RVCTLINUX_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+*_RVCTLINUX_ARM_MAKE_PATH = make
|
||||
+*_RVCTLINUX_ARM_SLINK_FLAGS = --partial -o
|
||||
+ DEBUG_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
|
||||
+RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
|
||||
+
|
||||
+##################
|
||||
+# ARM definitions
|
||||
+##################
|
||||
+*_RVCTLINUX_ARM_CC_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTLINUX_ARM_SLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTLINUX_ARM_DLINK_PATH = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTLINUX_ARM_ASM_PATH = ENV(RVCT_TOOLS_PATH)armasm
|
||||
+*_RVCTLINUX_ARM_PP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTLINUX_ARM_VFRPP_PATH = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTLINUX_ARM_FROMELF_PATH = ENV(RVCT_TOOLS_PATH)fromelf
|
||||
+
|
||||
+####################################################################################
|
||||
+#
|
||||
+# ARM RealView Tools - Cygwin
|
||||
#
|
||||
####################################################################################
|
||||
# ARMCYGWIN - Tools from ARM in a Cygwin environment
|
||||
|
||||
-*_RVCT31CYGWIN_*_*_FAMILY = RVCT
|
||||
-*_RVCT31CYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN
|
||||
+*_RVCTCYGWIN_*_*_FAMILY = RVCT
|
||||
+*_RVCTCYGWIN_*_*_BUILDRULEFAMILY = RVCTCYGWIN
|
||||
|
||||
-*_RVCT31CYGWIN_ARM_CCPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc
|
||||
-*_RVCT31CYGWIN_ARM_SLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink
|
||||
-*_RVCT31CYGWIN_ARM_DLINKPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armlink
|
||||
-*_RVCT31CYGWIN_ARM_ASMPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armasm
|
||||
-*_RVCT31CYGWIN_ARM_PPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc
|
||||
-*_RVCT31CYGWIN_ARM_VFRPPPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/armcc
|
||||
-*_RVCT31CYGWIN_ARM_FROMELFPATH_FLAG = DEF(RVCT31CYGWIN_TOOLS_PATH)/fromelf
|
||||
+*_RVCTCYGWIN_ARM_CCPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTCYGWIN_ARM_SLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTCYGWIN_ARM_DLINKPATH_FLAG = ENV(RVCT_TOOLS_PATH)armlink
|
||||
+*_RVCTCYGWIN_ARM_ASMPATH_FLAG = ENV(RVCT_TOOLS_PATH)armasm
|
||||
+*_RVCTCYGWIN_ARM_PPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTCYGWIN_ARM_VFRPPPATH_FLAG = ENV(RVCT_TOOLS_PATH)armcc
|
||||
+*_RVCTCYGWIN_ARM_FROMELFPATH_FLAG = ENV(RVCT_TOOLS_PATH)fromelf
|
||||
|
||||
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
-*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS = --thumb --cpu 7-A
|
||||
-*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS = --cpu 7-A
|
||||
-*_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS =
|
||||
-*_RVCT31CYGWIN_ARM_PLATFORM_FLAGS =
|
||||
+*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb
|
||||
+*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =
|
||||
+*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =
|
||||
+*_RVCTCYGWIN_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
|
||||
- DEBUG_RVCT31CYGWIN_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` --diag_style=ide
|
||||
-RELEASE_RVCT31CYGWIN_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` --diag_style=ide
|
||||
+ DEBUG_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map`
|
||||
+RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) DEF(RVCT_ALL_DLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map`
|
||||
|
||||
-*_RVCT31CYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide
|
||||
-*_RVCT31CYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide
|
||||
-*_RVCT31CYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
|
||||
-*_RVCT31CYGWIN_ARM_MAKE_PATH = make
|
||||
-*_RVCT31CYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial --diag_style=ide -o
|
||||
- DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
-RELEASE_RVCT31CYGWIN_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 --preinclude AutoGen.h --diag_warning 167 --diag_style=ide
|
||||
+*_RVCTCYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) --apcs /interwork
|
||||
+*_RVCTCYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E
|
||||
+*_RVCTCYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
|
||||
+*_RVCTCYGWIN_ARM_MAKE_PATH = make
|
||||
+*_RVCTCYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o
|
||||
+ DEBUG_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g
|
||||
+RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O2
|
||||
|
||||
##################
|
||||
# ARM definitions
|
||||
##################
|
||||
-*_RVCT31CYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
-*_RVCT31CYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_CC_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_SLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_DLINK_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_ASM_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_PP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_VFRPP_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
+*_RVCTCYGWIN_ARM_FROMELF_PATH = ENV(WORKSPACE)/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py
|
||||
|
||||
####################################################################################
|
||||
#
|
||||
-# ARM GCC (www.codesourcery.com)
|
||||
+# ARM EABI GCC (www.codesourcery.com)
|
||||
#
|
||||
####################################################################################
|
||||
# ARMGCC - ARM version of the GCC cross compiler
|
||||
@@ -4089,12 +4136,12 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
|
||||
##################
|
||||
# ASL definitions
|
||||
##################
|
||||
-*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
-*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)
|
||||
-*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
|
||||
-*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P
|
||||
-*_ARMGCC_*_ASLCC_FLAGS = -x c
|
||||
-*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable
|
||||
+*_ARMGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
||||
+*_ARMGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)
|
||||
+*_ARMGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
|
||||
+*_ARMGCC_*_ASLPP_FLAGS = -x c -E -P
|
||||
+*_ARMGCC_*_ASLCC_FLAGS = -x c
|
||||
+*_ARMGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable
|
||||
|
||||
##################
|
||||
# ARM definitions
|
||||
@@ -4114,22 +4161,80 @@ RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
-*_ARMGCC_ARM_ARCHCC_FLAGS = -march=armv7-a -mthumb
|
||||
-*_ARMGCC_ARM_ARCHASM_FLAGS = -march=armv7-a
|
||||
+*_ARMGCC_ARM_ARCHCC_FLAGS = -mthumb
|
||||
+*_ARMGCC_ARM_ARCHASM_FLAGS =
|
||||
*_ARMGCC_ARM_ARCHDLINK_FLAGS =
|
||||
*_ARMGCC_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
|
||||
- DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian -g
|
||||
-RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian
|
||||
+ DEBUG_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g
|
||||
+RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian
|
||||
|
||||
-*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
|
||||
-*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+*_ARMGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
|
||||
+*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
@@ -4173,11 +4174,69 @@
|
||||
*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
|
||||
*_ARMGCC_ARM_SLINK_FLAGS = -rc
|
||||
*_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
|
||||
-*_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
|
||||
+*_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
|
||||
DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0
|
||||
RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused
|
||||
|
||||
- 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
|
||||
-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
|
||||
+ DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0
|
||||
+RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused
|
||||
+
|
||||
+####################################################################################
|
||||
+#
|
||||
+# ARM GNU/Linux GCC
|
||||
|
|
@ -397,39 +131,135 @@ index fe7900e..20c0033
|
|||
+*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
+
|
||||
+*_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc
|
||||
+*_ARMLINUXGCC_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
|
||||
+*_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
+
|
||||
+ DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0
|
||||
+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
|
||||
|
||||
+
|
||||
#################
|
||||
# ASM 16 linker defintions
|
||||
diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
|
||||
index 8f452c7..a095220 100644
|
||||
--- a/BaseTools/Source/C/GenFv/GenFv.c
|
||||
+++ b/BaseTools/Source/C/GenFv/GenFv.c
|
||||
@@ -597,7 +597,7 @@ Returns:
|
||||
#################
|
||||
Index: BaseTools/Source/Python/Workspace/MetaFileParser.py
|
||||
===================================================================
|
||||
--- BaseTools/Source/Python/Workspace/MetaFileParser.py (revision 12664)
|
||||
+++ BaseTools/Source/Python/Workspace/MetaFileParser.py (working copy)
|
||||
@@ -1280,6 +1280,9 @@
|
||||
Records = IncludedFileTable.GetAll()
|
||||
if Records:
|
||||
self._Content[self._ContentIndex:self._ContentIndex] = Records
|
||||
+ self._Content.pop(self._ContentIndex-1)
|
||||
+ self._ValueList = None
|
||||
+ self._ContentIndex -= 1
|
||||
|
||||
def __ProcessSkuId(self):
|
||||
self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)
|
||||
Index: BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
|
||||
===================================================================
|
||||
--- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (revision 12664)
|
||||
+++ BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (working copy)
|
||||
@@ -2319,7 +2319,7 @@
|
||||
# @param GlobalMacros Global macros used for replacement during file parsing
|
||||
# @prarm RenewDb=False Create new database file if it's already there
|
||||
#
|
||||
- def __init__(self, DbPath, RenewDb=False):
|
||||
+ def __init__(self, DbPath, RenewDb=False, DbSignature={}):
|
||||
self._DbClosedFlag = False
|
||||
if not DbPath:
|
||||
DbPath = os.path.normpath(os.path.join(GlobalData.gWorkspace, self._DB_PATH_))
|
||||
@@ -2331,7 +2331,7 @@
|
||||
os.makedirs(DbDir)
|
||||
|
||||
# remove db file in case inconsistency between db and file in file system
|
||||
- if self._CheckWhetherDbNeedRenew(RenewDb, DbPath):
|
||||
+ if self._CheckWhetherDbNeedRenew(RenewDb, DbPath, DbSignature):
|
||||
os.remove(DbPath)
|
||||
|
||||
# create db with optimized parameters
|
||||
@@ -2367,7 +2367,38 @@
|
||||
#
|
||||
# @return Bool value for whether need renew workspace databse
|
||||
#
|
||||
- def _CheckWhetherDbNeedRenew (self, force, DbPath):
|
||||
+ def _CheckWhetherDbNeedRenew (self, force, DbPath, DbSignature):
|
||||
+ DbDir = os.path.split(DbPath)[0]
|
||||
+ MacroFilePath = os.path.normpath(os.path.join(DbDir, "build.mac"))
|
||||
+ MacroMatch = False
|
||||
+ if os.path.exists(MacroFilePath) and os.path.isfile(MacroFilePath):
|
||||
+ LastMacros = None
|
||||
+ try:
|
||||
+ f = open(MacroFilePath,'r')
|
||||
+ LastMacros = pickle.load(f)
|
||||
+ f.close()
|
||||
+ except IOError:
|
||||
+ pass
|
||||
+ except:
|
||||
+ f.close()
|
||||
+
|
||||
+ if LastMacros != None and type(LastMacros) is DictType:
|
||||
+ if LastMacros == DbSignature:
|
||||
+ MacroMatch = True
|
||||
+
|
||||
+ if not MacroMatch:
|
||||
+ # save command line macros to file
|
||||
+ try:
|
||||
+ f = open(MacroFilePath,'w')
|
||||
+ pickle.dump(DbSignature, f, 2)
|
||||
+ f.close()
|
||||
+ except IOError:
|
||||
+ pass
|
||||
+ except:
|
||||
+ f.close()
|
||||
+
|
||||
+ force = True
|
||||
+
|
||||
# if database does not exist, we need do nothing
|
||||
if not os.path.exists(DbPath): return False
|
||||
|
||||
Index: BaseTools/Source/Python/build/build.py
|
||||
===================================================================
|
||||
--- BaseTools/Source/Python/build/build.py (revision 12664)
|
||||
+++ BaseTools/Source/Python/build/build.py (working copy)
|
||||
@@ -704,6 +704,8 @@
|
||||
#
|
||||
def __init__(self, Target, WorkspaceDir, BuildOptions):
|
||||
self.WorkspaceDir = WorkspaceDir
|
||||
+ DbSignature = {'Target': Target, 'BuildOptions': BuildOptions }
|
||||
+
|
||||
self.Target = Target
|
||||
self.PlatformFile = BuildOptions.PlatformFile
|
||||
self.ModuleFile = BuildOptions.ModuleFile
|
||||
@@ -726,7 +728,7 @@
|
||||
if BuildOptions.DisableCache:
|
||||
self.Db = WorkspaceDatabase(":memory:")
|
||||
else:
|
||||
- self.Db = WorkspaceDatabase(None, self.Reparse)
|
||||
+ self.Db = WorkspaceDatabase(None, self.Reparse, DbSignature)
|
||||
self.BuildDatabase = self.Db.BuildObject
|
||||
self.Platform = None
|
||||
self.LoadFixAddress = 0
|
||||
Index: BaseTools/Source/C/GenFv/GenFv.c
|
||||
===================================================================
|
||||
--- BaseTools/Source/C/GenFv/GenFv.c (revision 12664)
|
||||
+++ BaseTools/Source/C/GenFv/GenFv.c (working copy)
|
||||
@@ -623,12 +623,7 @@
|
||||
);
|
||||
} else {
|
||||
VerboseMsg ("Create Fv image and its map file");
|
||||
- if (mFvDataInfo.BaseAddress != 0) {
|
||||
- //
|
||||
- // Will take rebase action at below situation:
|
||||
- // 1. ForceRebase Flag specified to TRUE;
|
||||
- // 2. ForceRebase Flag not specified, BaseAddress greater than zero.
|
||||
- //
|
||||
- if (((mFvDataInfo.BaseAddress > 0) && (mFvDataInfo.ForceRebase == -1)) || (mFvDataInfo.ForceRebase == 1)) {
|
||||
+ if (mFvDataInfo.BaseAddressSet) {
|
||||
VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);
|
||||
}
|
||||
//
|
||||
diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
|
||||
index d86909b..5aa1a08 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);
|
||||
|
||||
FvInfo->BaseAddress = Value64;
|
||||
+ FvInfo->BaseAddressSet = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -505,6 +506,7 @@ Returns:
|
||||
Index: BaseTools/Source/C/GenFv/GenFvInternalLib.c
|
||||
===================================================================
|
||||
--- BaseTools/Source/C/GenFv/GenFvInternalLib.c (revision 12664)
|
||||
+++ BaseTools/Source/C/GenFv/GenFvInternalLib.c (working copy)
|
||||
@@ -506,6 +506,7 @@
|
||||
|
||||
EFI_STATUS
|
||||
AddPadFile (
|
||||
|
|
@ -437,7 +267,7 @@ index d86909b..5aa1a08 100644
|
|||
IN OUT MEMORY_FILE *FvImage,
|
||||
IN UINT32 DataAlignment,
|
||||
IN VOID *FvEnd,
|
||||
@@ -536,6 +538,8 @@ Returns:
|
||||
@@ -537,6 +538,8 @@
|
||||
{
|
||||
EFI_FFS_FILE_HEADER *PadFile;
|
||||
UINTN PadFileSize;
|
||||
|
|
@ -446,7 +276,7 @@ index d86909b..5aa1a08 100644
|
|||
|
||||
//
|
||||
// Verify input parameters.
|
||||
@@ -558,32 +562,29 @@ Returns:
|
||||
@@ -559,32 +562,29 @@
|
||||
// This is the earliest possible valid offset (current plus pad file header
|
||||
// plus the next file header)
|
||||
//
|
||||
|
|
@ -492,7 +322,7 @@ index d86909b..5aa1a08 100644
|
|||
// Verify that we have enough space for the file header
|
||||
//
|
||||
if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {
|
||||
@@ -1114,7 +1115,7 @@ Returns:
|
||||
@@ -1115,7 +1115,7 @@
|
||||
//
|
||||
// Add pad file if necessary
|
||||
//
|
||||
|
|
@ -501,7 +331,7 @@ index d86909b..5aa1a08 100644
|
|||
if (EFI_ERROR (Status)) {
|
||||
Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");
|
||||
free (FileBuffer);
|
||||
@@ -2303,7 +2304,7 @@ Returns:
|
||||
@@ -2304,7 +2304,7 @@
|
||||
//
|
||||
// Add FV Extended Header contents to the FV as a PAD file
|
||||
//
|
||||
|
|
@ -510,15 +340,26 @@ index d86909b..5aa1a08 100644
|
|||
|
||||
//
|
||||
// Fv Extension header change update Fv Header Check sum
|
||||
@@ -2828,7 +2829,7 @@ Returns:
|
||||
@@ -2825,20 +2825,12 @@
|
||||
PeFileBuffer = NULL;
|
||||
|
||||
//
|
||||
// Don't need to relocate image when BaseAddress is not set.
|
||||
- // Don't need to relocate image when BaseAddress is zero and no ForceRebase Flag specified.
|
||||
+ // Don't need to relocate image when BaseAddress is not set.
|
||||
//
|
||||
- if (FvInfo->BaseAddress == 0) {
|
||||
- if ((FvInfo->BaseAddress == 0) && (FvInfo->ForceRebase == -1)) {
|
||||
+ if (FvInfo->BaseAddressSet == FALSE) {
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
-
|
||||
- //
|
||||
- // If ForceRebase Flag specified to FALSE, will always not take rebase action.
|
||||
- //
|
||||
- if (FvInfo->ForceRebase == 0) {
|
||||
- return EFI_SUCCESS;
|
||||
- }
|
||||
|
||||
-
|
||||
XipBase = FvInfo->BaseAddress + XipOffset;
|
||||
--
|
||||
1.7.5.1
|
||||
|
||||
|
||||
//
|
||||
|
|
|
|||
Loading…
Reference in New Issue