Merge branch 'linaro-topic-misc' into release-preplinaro-edk2-2014.10-a3

4 files changed, 25 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..8b6147b123
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+*.d
+*.o
+*.pyc
+BaseTools/Source/C/VfrCompile/EfiVfrParser.cpp
+BaseTools/Source/C/VfrCompile/EfiVfrParser.h
+BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr
+BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg
+BaseTools/Source/C/VfrCompile/VfrLexer.cpp
+BaseTools/Source/C/VfrCompile/VfrLexer.h
+BaseTools/Source/C/VfrCompile/VfrParser.dlg
+BaseTools/Source/C/VfrCompile/VfrSyntax.cpp
+BaseTools/Source/C/VfrCompile/VfrTokens.h
+BaseTools/Source/C/bin/
+BaseTools/Source/C/libs/
+Build/
+Conf/.cache/
+Conf/BuildEnv.sh
+Conf/build_rule.txt
+Conf/target.txt
+Conf/tools_def.txt
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index e12d5cda77..08b68176eb 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -259,6 +259,9 @@
 

 [PcdsFixedAtBuild.common]

   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"

+!ifdef $(FIRMWARE_VER)

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

+!endif

 

   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"

   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 526ab5d41f..a9f6fef47d 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -709,16 +709,9 @@ WriteSections64 (
             }

             break;

 

+	  // These relative relocations do not require fixups 

           case R_AARCH64_CALL26:

-            if  (Rel->r_addend != 0 ) { /* TODO */

-              Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_CALL26 Need to fixup with addend!.");

-            }

-            break;

-

           case R_AARCH64_JUMP26:

-            if  (Rel->r_addend != 0 ) { /* TODO : AArch64 '-O2' optimisation. */

-              Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_JUMP26 Need to fixup with addend!.");

-            }

             break;

 

           case R_AARCH64_ADR_PREL_PG_HI21:

diff --git a/edk2 b/edk2
new file mode 120000
index 0000000000..945c9b46d6
--- /dev/null
+++ b/edk2
@@ -0,0 +1 @@
+.
\ No newline at end of file