X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=EdkShellPkg%2FEdkShellPkg.dsc;h=90eac0f09d4fd6a532a130e50e1205a9fd2966da;hb=dc9d92c274fdecab7c90960bf79ba4117a774de1;hp=a205c6d8bb2973fba9485e0f7ffd23525392d662;hpb=46375807c249b3e7066fcfc5c6d176f0b0cf2b90;p=mirror_edk2.git
diff --git a/EdkShellPkg/EdkShellPkg.dsc b/EdkShellPkg/EdkShellPkg.dsc
index a205c6d8bb..90eac0f09d 100644
--- a/EdkShellPkg/EdkShellPkg.dsc
+++ b/EdkShellPkg/EdkShellPkg.dsc
@@ -1,11 +1,11 @@
-#/** @file
+## @file
# This package build validate file is used to build validate EDK Shell source,
# EDK Compatibility Package and the backward compatibility support of EDK II
# build tool.
#
-# Copyright (c) 2008. Intel Corporation
+# Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.
#
-# All rights reserved. This program and the accompanying materials
+# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
@@ -13,7 +13,7 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#**/
+##
[Defines]
PLATFORM_NAME = EdkShellPkg
@@ -21,7 +21,7 @@
PLATFORM_VERSION = 1.04
DSC_SPECIFICATION = 0x00010005
OUTPUT_DIRECTORY = Build/EdkShellPkg
- SUPPORTED_ARCHITECTURES = IA32|IPF|X64
+ SUPPORTED_ARCHITECTURES = IA32|IPF|X64|ARM|AARCH64
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
#
@@ -32,6 +32,9 @@
#
DEFINE EDK_SHELL_DIR = Shell # when "Shell" directory is directly under $(WORKSPACE)
+DEFINE MSFT_MACRO = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00009000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 /D EFI_DEBUG
+DEFINE INTEL_MACRO = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00009000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 /D EFI_DEBUG
+DEFINE GCC_MACRO = -DEFI_SPECIFICATION_VERSION=0x0002000A -DPI_SPECIFICATION_VERSION=0x00009000 -DTIANO_RELEASE_VERSION=0x00080006 -DPCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 -DEFI_DEBUG -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
[Libraries]
@@ -41,9 +44,7 @@ DEFINE EDK_SHELL_DIR = Shell # when "Shell" directory is directly u
EdkCompatibilityPkg/Foundation/Efi/Guid/EfiGuidLib.inf
EdkCompatibilityPkg/Foundation/Framework/Guid/EdkFrameworkGuidLib.inf
EdkCompatibilityPkg/Foundation/Guid/EdkGuidLib.inf
- EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
- EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib.inf
- EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
+ EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib_Edk2.inf
EdkCompatibilityPkg/Foundation/Library/CustomizedDecompress/CustomizedDecompress.inf
EdkCompatibilityPkg/Foundation/Library/Dxe/Hob/HobLib.inf
#
@@ -80,6 +81,14 @@ DEFINE EDK_SHELL_DIR = Shell # when "Shell" directory is directly u
[Libraries.IA32, Libraries.X64]
EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
+ EdkCompatibilityPkg/Foundation/Cpu/Pentium/CpuIA32Lib/CpuIA32Lib_Edk2.inf
+
+[Libraries.IPF]
+ EdkCompatibilityPkg/Foundation/Cpu/Itanium/CpuIa64Lib/CpuIA64Lib.inf
+
+[Libraries.ARM, Libraries.AARCH64]
+ EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
+ ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
###################################################################################################
#
@@ -101,8 +110,35 @@ DEFINE EDK_SHELL_DIR = Shell # when "Shell" directory is directly u
###################################################################################################
[Components]
- $(EDK_SHELL_DIR)/Shell.inf
- $(EDK_SHELL_DIR)/ShellFull.inf
+ $(EDK_SHELL_DIR)/Shell.inf {
+
+ #
+ # Can not do this in nmake section of edk INF
+ #
+ GCC:*_*_*_CC_FLAGS = -DEFI_MONOSHELL
+ GCC:*_*_*_VFRPP_FLAGS = -DEFI_MONOSHELL
+ GCC:*_*_*_APP_FLAGS = -DEFI_MONOSHELL
+ GCC:*_*_*_PP_FLAGS = -DEFI_MONOSHELL
+
+ RVCT:*_*_ARM_CC_FLAGS = -DEFI_MONOSHELL
+ RVCT:*_*_ARM_VFRPP_FLAGS = -DEFI_MONOSHELL
+ RVCT:*_*_ARM_APP_FLAGS = -DEFI_MONOSHELL
+ RVCT:*_*_ARM_PP_FLAGS = -DEFI_MONOSHELL
+ }
+
+ $(EDK_SHELL_DIR)/ShellFull.inf {
+
+ GCC:*_*_*_CC_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ GCC:*_*_*_VFRPP_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ GCC:*_*_*_APP_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ GCC:*_*_*_PP_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+
+ RVCT:*_*_ARM_CC_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ RVCT:*_*_ARM_VFRPP_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ RVCT:*_*_ARM_APP_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ RVCT:*_*_ARM_PP_FLAGS = -DEFI_MONOSHELL -DEFI_FULLSHELL
+ }
+
$(EDK_SHELL_DIR)/attrib/attrib.inf
$(EDK_SHELL_DIR)/cls/cls.inf
$(EDK_SHELL_DIR)/comp/comp.inf
@@ -152,7 +188,7 @@ DEFINE EDK_SHELL_DIR = Shell # when "Shell" directory is directly u
$(EDK_SHELL_DIR)/ver/Ver.inf
$(EDK_SHELL_DIR)/vol/Vol.inf
-[BuildOptions]
+[BuildOptions.Common.EDK]
MSFT:*_*_IA32_CC_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
MSFT:*_*_IA32_ASM_FLAGS = /DEFI32
MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
@@ -193,4 +229,32 @@ DEFINE EDK_SHELL_DIR = Shell # when "Shell" directory is directly u
INTEL:*_*_*_BUILD_FLAGS = -s
+ GCC:*_*_IA32_CC_FLAGS = -DEFI32 $(GCC_MACRO)
+ GCC:*_*_IA32_VFRPP_FLAGS = -DEFI32 $(GCC_MACRO)
+ GCC:*_*_IA32_APP_FLAGS = -DEFI32 $(GCC_MACRO)
+ GCC:*_*_IA32_PP_FLAGS = -DEFI32 $(GCC_MACRO)
+
+ GCC:*_*_X64_CC_FLAGS = -DEFIX64 $(GCC_MACRO)
+ GCC:*_*_X64_VFRPP_FLAGS = -DEFIX64 $(GCC_MACRO)
+ GCC:*_*_X64_APP_FLAGS = -DEFIX64 $(GCC_MACRO)
+ GCC:*_*_X64_PP_FLAGS = -DEFIX64 $(GCC_MACRO)
+
+ GCC:*_*_IPF_CC_FLAGS = -DEFI64 $(GCC_MACRO)
+ GCC:*_*_IPF_VFRPP_FLAGS = -DEFI64 $(GCC_MACRO)
+ GCC:*_*_IPF_APP_FLAGS = -DEFI64 $(GCC_MACRO)
+ GCC:*_*_IPF_PP_FLAGS = -DEFI64 $(GCC_MACRO)
+
+ GCC:*_*_ARM_CC_FLAGS = -DEFIARM $(GCC_MACRO)
+ GCC:*_*_ARM_VFRPP_FLAGS = -DEFIARM $(GCC_MACRO)
+ GCC:*_*_ARM_APP_FLAGS = -DEFIARM $(GCC_MACRO)
+ GCC:*_*_ARM_PP_FLAGS = -DEFIARM $(GCC_MACRO)
+
+ RVCT:*_*_ARM_CC_FLAGS = -DEFIARM $(GCC_MACRO)
+ RVCT:*_*_ARM_VFRPP_FLAGS = -DEFIARM $(GCC_MACRO)
+ 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)