From: "Samer El-Haj-Mahmoud" <samer.el-haj-mahmoud@arm.com>
To: devel@edk2.groups.io
Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>,
Eric Jin <eric.jin@intel.com>, Irene Park <ipark@nvidia.com>,
Heinrich Schuchardt <xypron.glpk@gmx.de>
Subject: [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros
Date: Thu, 23 Jul 2020 22:29:00 -0400 [thread overview]
Message-ID: <20200724022900.30826-4-Samer.El-Haj-Mahmoud@arm.com> (raw)
In-Reply-To: <20200724022900.30826-1-Samer.El-Haj-Mahmoud@arm.com>
Remove the obsolete EFI_SPECIFICATION_VERSION and
TIANO_RELEASE_VERSION macros, which are not passed in as command line
arguments anymore.
Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
Cc: Eric Jin <eric.jin@intel.com>
Cc: Irene Park <ipark@nvidia.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
---
uefi-sct/SctPkg/UEFI/IHV_SCT.dsc | 20 +++++++-------
uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc | 28 ++++++++++----------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
index 6904dbe89bac..b9dba02e1748 100644
--- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
@@ -56,25 +56,25 @@
0|DEFAULT # The entry: 0|DEFAULT is reserved and always required.
[BuildOptions]
- MSFT:*_*_IA32_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 /wd4133 /Od
+ MSFT:*_*_IA32_CC_FLAGS = /D EFI32 /wd4133 /Od
MSFT:*_*_IA32_ASM_FLAGS = /DEFI32
- MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
- MSFT:*_*_IA32_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
- MSFT:*_*_IA32_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
+ MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32
+ MSFT:*_*_IA32_APP_FLAGS = /D EFI32
+ MSFT:*_*_IA32_PP_FLAGS = /D EFI32
- MSFT:*_*_X64_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 /wd4133 /Od
+ MSFT:*_*_X64_CC_FLAGS = /D EFIX64 /wd4133 /Od
MSFT:*_*_X64_ASM_FLAGS = /DEFIX64
- MSFT:*_*_X64_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
- MSFT:*_*_X64_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
- MSFT:*_*_X64_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
+ MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64
+ MSFT:*_*_X64_APP_FLAGS = /D EFIX64
+ MSFT:*_*_X64_PP_FLAGS = /D EFIX64
-# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
+# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
GCC:*_*_IA32_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error
# GCC:*_*_IA32_VFRPP_FLAGS = -D EFI32 $(GCC_VER_MACRO)
# GCC:*_*_IA32_APP_FLAGS = -D EFI32 $(GCC_VER_MACRO)
# GCC:*_*_IA32_PP_FLAGS = -D EFI32 $(GCC_VER_MACRO)
-# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
+# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error
# GCC:*_*_X64_VFRPP_FLAGS = -D EFIX64 $(GCC_VER_MACRO)
diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
index eebed7507184..cc8ff4a65a78 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
@@ -46,8 +46,8 @@
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
- DEFINE GCC_VER_MACRO = -D EFI_SPECIFICATION_VERSION=0x00020028 -D TIANO_RELEASE_VERSION=0x00080006
- DEFINE MSFT_VER_MACRO = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006
+ DEFINE GCC_VER_MACRO =
+ DEFINE MSFT_VER_MACRO =
################################################################################
@@ -60,25 +60,25 @@
0|DEFAULT # The entry: 0|DEFAULT is reserved and always required.
[BuildOptions]
- MSFT:*_*_IA32_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 /wd4133 /Od
- MSFT:*_*_IA32_ASM_FLAGS = /DEFI32
- MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
- MSFT:*_*_IA32_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
- MSFT:*_*_IA32_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
+ MSFT:*_*_IA32_CC_FLAGS = /D EFI32 /wd4133 /Od
+ MSFT:*_*_IA32_ASM_FLAGS = /D EFI32
+ MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32
+ MSFT:*_*_IA32_APP_FLAGS = /D EFI32
+ MSFT:*_*_IA32_PP_FLAGS = /D EFI32
- MSFT:*_*_X64_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 /wd4133 /Od
- MSFT:*_*_X64_ASM_FLAGS = /DEFIX64
- MSFT:*_*_X64_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
- MSFT:*_*_X64_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
- MSFT:*_*_X64_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
+ MSFT:*_*_X64_CC_FLAGS = /D EFIX64 /wd4133 /Od
+ MSFT:*_*_X64_ASM_FLAGS = /D EFIX64
+ MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64
+ MSFT:*_*_X64_APP_FLAGS = /D EFIX64
+ MSFT:*_*_X64_PP_FLAGS = /D EFIX64
-# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
+# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
GCC:*_*_IA32_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error
# GCC:*_*_IA32_VFRPP_FLAGS = -D EFI32 $(GCC_VER_MACRO)
# GCC:*_*_IA32_APP_FLAGS = -D EFI32 $(GCC_VER_MACRO)
# GCC:*_*_IA32_PP_FLAGS = -D EFI32 $(GCC_VER_MACRO)
-# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
+# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error
# GCC:*_*_X64_VFRPP_FLAGS = -D EFIX64 $(GCC_VER_MACRO)
# GCC:*_*_X64_APP_FLAGS = -D EFIX64 $(GCC_VER_MACRO)
--
2.17.1
next prev parent reply other threads:[~2020-07-24 2:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 2:28 [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 Samer El-Haj-Mahmoud
2020-07-24 2:28 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " Samer El-Haj-Mahmoud
2020-08-10 11:56 ` G Edhaya Chandran
2020-08-11 18:48 ` [edk2-devel] " G Edhaya Chandran
2020-07-24 2:28 ` [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions " Samer El-Haj-Mahmoud
2020-08-11 18:49 ` [edk2-devel] " G Edhaya Chandran
2020-07-24 2:29 ` Samer El-Haj-Mahmoud [this message]
2020-08-11 18:50 ` [edk2-devel] [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros G Edhaya Chandran
2020-08-11 18:44 ` [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 G Edhaya Chandran
2020-08-11 18:46 ` G Edhaya Chandran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200724022900.30826-4-Samer.El-Haj-Mahmoud@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox