EdkShellPkg: Add Aarch64 support

* Update the EFI Shell patch to use SVN rev 64 (was rev 61) * Modify build system to enable compilation targeting Aarch64 platform. * Modify patch to apply on EdkShell sources to add support for Aarch64. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <[email protected]> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14699 6f19259b-4bc3-4df7-8a09-765794883524
gaozhangfei · Sep 23, 2013 · 2bba8d5 · 2bba8d5
1 parent d45c8c3
commit 2bba8d5
Show file tree

Hide file tree

Showing 3 changed files with 7,547 additions and 4,727 deletions.
diff --git a/EdkShellPkg/EdkShellPkg.dsc b/EdkShellPkg/EdkShellPkg.dsc
@@ -21,7 +21,7 @@
   PLATFORM_VERSION               = 1.04
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/EdkShellPkg
-  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|ARM
+  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|ARM|AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
 # 
@@ -86,7 +86,7 @@ DEFINE GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S
 [Libraries.IPF]
   EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
 
-[Libraries.ARM]
+[Libraries.ARM, Libraries.AARCH64]
   EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
   ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
 
@@ -254,5 +254,7 @@ DEFINE GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_S
   RVCT:*_*_ARM_APP_FLAGS    = -DEFIARM $(GCC_MACRO)
   RVCT:*_*_ARM_PP_FLAGS     = -DEFIARM $(GCC_MACRO)
 
-
-
+  GCC:*_*_AARCH64_CC_FLAGS     = -DEFIAARCH64 $(GCC_MACRO)
+  GCC:*_*_AARCH64_VFRPP_FLAGS  = -DEFIAARCH64 $(GCC_MACRO)
+  GCC:*_*_AARCH64_APP_FLAGS    = -DEFIAARCH64 $(GCC_MACRO)
+  GCC:*_*_AARCH64_PP_FLAGS     = -DEFIAARCH64 $(GCC_MACRO)
diff --git a/EdkShellPkg/ReadMe.txt b/EdkShellPkg/ReadMe.txt
@@ -15,8 +15,8 @@ This is EDK style package and the following steps can help to build the package:
    To use this file, execute the following command under workspace to build EDK Shell source:
    build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc
 
-4. If you need to compile for GCC or ARM you will need to apply ShellR61.patch.
-   cd $(WORKSPACE)/Shell and execute patch -p1 < $(WORKSPACE)/EdkShellPkg/ShellR61.patch.
+4. If you need to compile for GCC or ARM you will need to apply ShellR64.patch.
+   cd $(WORKSPACE)/Shell and execute patch -p0 < $(WORKSPACE)/EdkShellPkg/ShellR64.patch.
    If you are using a case sensative file system there are a few case bugs that patch 
    would not fix. Just fix the case of the file to match its usage and you should be 
    able to compile.