Platforms/AMD/Styx: fix broken build due to iasl command line change
The upstream BaseTools where modified to allow the use of PCDs in
ASL source code, but this requires the -P option to be removed from
the iasl command line. The Styx platforms need ARCHCC_FLAGS on the
iasl command line, but since we use the single, additive '=', there
is no need to duplicate the other options, and we can safely remove
them.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
index e668b6b..f833fe2 100644
--- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
+++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc
@@ -254,8 +254,8 @@
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
*_*_*_ASL_FLAGS = -tc -li -l -so
- *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS)
- *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS)
+ *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS)
+ *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS)
GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
index 5fd6d84..1072053 100644
--- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc
@@ -259,8 +259,8 @@
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
*_*_*_ASL_FLAGS = -tc -li -l -so
- *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS)
- *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS)
+ *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS)
+ *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS)
GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
index 70b94df..9272106 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
@@ -261,8 +261,8 @@
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
*_*_*_ASL_FLAGS = -tc -li -l -so
- *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS)
- *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS)
+ *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS)
+ *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS)
GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
