summaryrefslogtreecommitdiff
path: root/Platform
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@kernel.org>2026-09-25 17:27:59 +0300
committerSami Mujawar <sami.mujawar@arm.com>2026-09-28 17:38:13 +0300
commit19fe904ad99f7190342542eb6c985edd277a2068 (patch)
tree6e5cc8595db55c556a265328b8b0af7938c289fe /Platform
parent9c2cdde2d73d6bf0261e57b79bfb68cd98fccc1f (diff)
downloadedk2-platforms-master.tar.xz
Platform/ARM: Share output directory selectionHEADmaster
Use a common DSC include to honor EDK2_OUT_DIR across all ARM platforms. Keep the existing default paths, including the Juno and VExpress Standalone MM paths, when no override is supplied. Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org>
Diffstat (limited to 'Platform')
-rw-r--r--Platform/ARM/ArmPlatformOutput.dsc.inc17
-rw-r--r--Platform/ARM/JunoPkg/ArmJuno.dsc6
-rw-r--r--Platform/ARM/JunoPkg/PlatformStandaloneMm.dsc7
-rw-r--r--Platform/ARM/Morello/MorelloPlatformFvp.dsc6
-rw-r--r--Platform/ARM/Morello/MorelloPlatformSoc.dsc6
-rw-r--r--Platform/ARM/N1Sdp/N1SdpPlatform.dsc2
-rw-r--r--Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc2
-rw-r--r--Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdN2/RdN2.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdV3/RdV3.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdV3Cfg1/RdV3Cfg1.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdV3Cfg2/RdV3Cfg2.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdV3R1/RdV3R1.dsc2
-rw-r--r--Platform/ARM/SgiPkg/RdV3R1Cfg1/RdV3R1Cfg1.dsc2
-rw-r--r--Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc6
-rw-r--r--Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc7
19 files changed, 37 insertions, 42 deletions
diff --git a/Platform/ARM/ArmPlatformOutput.dsc.inc b/Platform/ARM/ArmPlatformOutput.dsc.inc
new file mode 100644
index 0000000000..9df92590b4
--- /dev/null
+++ b/Platform/ARM/ArmPlatformOutput.dsc.inc
@@ -0,0 +1,17 @@
+## @file
+# Common output directory for Arm platform DSC files.
+#
+# Copyright (c) 2026, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+
+!ifdef $(EDK2_OUT_DIR)
+ OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
+!else
+!ifdef $(ARM_DEFAULT_OUTPUT_DIRECTORY)
+ OUTPUT_DIRECTORY = $(ARM_DEFAULT_OUTPUT_DIRECTORY)
+!else
+ OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!endif
+!endif
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index d3c8f06bea..3f4bcf77d8 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -15,11 +15,7 @@
PLATFORM_GUID = ca0722fd-7d3d-45ea-948c-d62b2199807d
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x00010005
-!ifdef EDK2_OUT_DIR
- OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
-!else
- OUTPUT_DIRECTORY = Build/ArmJuno
-!endif
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = DEBUG|RELEASE|NOOPT
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/JunoPkg/PlatformStandaloneMm.dsc b/Platform/ARM/JunoPkg/PlatformStandaloneMm.dsc
index 9085a53fd2..41fc4c58f9 100644
--- a/Platform/ARM/JunoPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/JunoPkg/PlatformStandaloneMm.dsc
@@ -24,11 +24,8 @@
PLATFORM_GUID = 667ffb82-9128-11ef-8299-cfafe2cc85b5
PLATFORM_VERSION = 1.0
DSC_SPECIFICATION = 0x0001001C
-!ifdef $(EDK2_OUT_DIR)
- OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
-!else
- OUTPUT_DIRECTORY = Build/ArmJuno
-!endif
+ DEFINE ARM_DEFAULT_OUTPUT_DIRECTORY = Build/ArmJuno
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.dsc b/Platform/ARM/Morello/MorelloPlatformFvp.dsc
index a2f9516301..23321391ed 100644
--- a/Platform/ARM/Morello/MorelloPlatformFvp.dsc
+++ b/Platform/ARM/Morello/MorelloPlatformFvp.dsc
@@ -16,11 +16,7 @@
PLATFORM_GUID = CB995FFD-EAEF-4d5E-8A4B-3213B39CD14A
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
-!ifdef $(EDK2_OUT_DIR)
- OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
-!else
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
-!endif
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/Morello/MorelloPlatformSoc.dsc b/Platform/ARM/Morello/MorelloPlatformSoc.dsc
index b7cf1d7f19..18eb395e32 100644
--- a/Platform/ARM/Morello/MorelloPlatformSoc.dsc
+++ b/Platform/ARM/Morello/MorelloPlatformSoc.dsc
@@ -16,11 +16,7 @@
PLATFORM_GUID = 8AC37B62-713D-449D-876D-06AD1B8E67E5
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
-!ifdef $(EDK2_OUT_DIR)
- OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
-!else
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
-!endif
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
index 5a9c68f58d..dec30491f2 100644
--- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
+++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
@@ -20,7 +20,7 @@
PLATFORM_GUID = 9af67d31-7de8-4a71-a9a8-a597a27659ce
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
index 4b624a11c6..47017d29c9 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
@@ -17,7 +17,7 @@
PLATFORM_GUID = 503b97f6-1be9-4661-97fd-9a55bbd2680d
PLATFORM_VERSION = 1.0
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = DEBUG|RELEASE|NOOPT
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
index 134daf7f20..1d6ac10fd2 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
@@ -16,7 +16,7 @@
PLATFORM_GUID = 67309f8a-d278-4df5-86ee-a1826cf481ed
PLATFORM_VERSION = 1.0
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = DEBUG|RELEASE|NOOPT
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc
index 7bc9a8186b..41f8879ed5 100644
--- a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc
+++ b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = c84a59cc-2103-4750-9d69-fe0f03d84465
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
index 5e5a776606..41b942a601 100644
--- a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
+++ b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
@@ -16,7 +16,7 @@
PLATFORM_GUID = aca676d8-3acb-43d0-9e05-95e1ce6bf5d3
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc b/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc
index a52966b30c..67550a5cc0 100644
--- a/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc
+++ b/Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = fd272907-b48e-4148-b6e5-fe762f20653d
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc b/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc
index 94fe46b8d4..c7a7f7bc35 100644
--- a/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc
+++ b/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = b890ba7d-a256-4820-9d3a-655acbb737c9
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdV3/RdV3.dsc b/Platform/ARM/SgiPkg/RdV3/RdV3.dsc
index 3b62edb13f..9e1df9458e 100644
--- a/Platform/ARM/SgiPkg/RdV3/RdV3.dsc
+++ b/Platform/ARM/SgiPkg/RdV3/RdV3.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = fd140b0f-4467-4314-aa69-cd0bd712e08e
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdV3Cfg1/RdV3Cfg1.dsc b/Platform/ARM/SgiPkg/RdV3Cfg1/RdV3Cfg1.dsc
index e1e61f678f..ad8cfd3693 100644
--- a/Platform/ARM/SgiPkg/RdV3Cfg1/RdV3Cfg1.dsc
+++ b/Platform/ARM/SgiPkg/RdV3Cfg1/RdV3Cfg1.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = c55382b3-c36d-410f-bbc0-e03f1ac66e2b
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdV3Cfg2/RdV3Cfg2.dsc b/Platform/ARM/SgiPkg/RdV3Cfg2/RdV3Cfg2.dsc
index 5f7ed8707c..cf34143135 100644
--- a/Platform/ARM/SgiPkg/RdV3Cfg2/RdV3Cfg2.dsc
+++ b/Platform/ARM/SgiPkg/RdV3Cfg2/RdV3Cfg2.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = 8e4c6337-366d-4916-b042-9256f2b1d873
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdV3R1/RdV3R1.dsc b/Platform/ARM/SgiPkg/RdV3R1/RdV3R1.dsc
index 09e156d7f3..28743caf12 100644
--- a/Platform/ARM/SgiPkg/RdV3R1/RdV3R1.dsc
+++ b/Platform/ARM/SgiPkg/RdV3R1/RdV3R1.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = ba862976-94fc-427a-817f-0f497b04d168
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/SgiPkg/RdV3R1Cfg1/RdV3R1Cfg1.dsc b/Platform/ARM/SgiPkg/RdV3R1Cfg1/RdV3R1Cfg1.dsc
index a62b181655..65235507d6 100644
--- a/Platform/ARM/SgiPkg/RdV3R1Cfg1/RdV3R1Cfg1.dsc
+++ b/Platform/ARM/SgiPkg/RdV3R1Cfg1/RdV3R1Cfg1.dsc
@@ -14,7 +14,7 @@
PLATFORM_GUID = bec32baf-6471-44f3-9ef0-a09a0cc8eb1d
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
- OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME)
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index a0c54bb962..42a16b9407 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -15,11 +15,7 @@
PLATFORM_GUID = 0de70077-9b3b-43bf-ba38-0ea37d77141b
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x00010005
-!ifdef $(EDK2_OUT_DIR)
- OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
-!else
- OUTPUT_DIRECTORY = Build/ArmVExpress-FVP-AArch64
-!endif
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
diff --git a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc
index 27ded3210c..c117d86866 100644
--- a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc
@@ -17,11 +17,8 @@
PLATFORM_GUID = 9A4BBA60-B4F9-47C7-9258-3BD77CAE9322
PLATFORM_VERSION = 1.0
DSC_SPECIFICATION = 0x0001001C
-!ifdef $(EDK2_OUT_DIR)
- OUTPUT_DIRECTORY = $(EDK2_OUT_DIR)
-!else
- OUTPUT_DIRECTORY = Build/ArmVExpress-FVP-AArch64
-!endif
+ DEFINE ARM_DEFAULT_OUTPUT_DIRECTORY = Build/ArmVExpress-FVP-AArch64
+!include Platform/ARM/ArmPlatformOutput.dsc.inc
SUPPORTED_ARCHITECTURES = AARCH64
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
generated by cgit v1.2.3 (git 2.39.0) at 2026-09-30 01:42:16 +0300