Could you please integrate the below changes in whichever commits they
belong individually?
- Clarifications (via file name changes) of which .dsc files are meant
as include files rather than standalone platform descriptions.
- Getting rid of relative paths to locate said include files.
(No, I don't need copyright or attribution, it's just a more
structured way to provide this particular bit of feedback.)
/
Leif
>From 7da6ca87177153532811f8ecd9ad6847b480161e Mon Sep 17 00:00:00 2001
From: Leif Lindholm <[email protected]>
Date: Tue, 17 Apr 2018 16:22:00 +0100
Subject: [PATCH edk2-platforms] {Platform|Silicon}/NXP: Build config includes
cleanup
---
Platform/NXP/{NxpQoriqLs.dsc => NxpQoriqLs.dsc.inc} | 0
Silicon/NXP/LS1043A/{LS1043A.dsc => LS1043A.dsc.inc} | 0
Silicon/NXP/LS1046A/{LS1046A.dsc => LS1046A.dsc.inc} | 0
Silicon/NXP/LS2088A/{LS2088A.dsc => LS2088A.dsc.inc} | 0
Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc | 4 ++--
Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc | 4 ++--
Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc | 4 ++--
Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf | 2 +-
Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf | 2 +-
Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename Platform/NXP/{NxpQoriqLs.dsc => NxpQoriqLs.dsc.inc} (100%)
rename Silicon/NXP/LS1043A/{LS1043A.dsc => LS1043A.dsc.inc} (100%)
rename Silicon/NXP/LS1046A/{LS1046A.dsc => LS1046A.dsc.inc} (100%)
rename Silicon/NXP/LS2088A/{LS2088A.dsc => LS2088A.dsc.inc} (100%)
diff --git a/Platform/NXP/NxpQoriqLs.dsc b/Platform/NXP/NxpQoriqLs.dsc.inc
similarity index 100%
rename from Platform/NXP/NxpQoriqLs.dsc
rename to Platform/NXP/NxpQoriqLs.dsc.inc
diff --git a/Silicon/NXP/LS1043A/LS1043A.dsc
b/Silicon/NXP/LS1043A/LS1043A.dsc.inc
similarity index 100%
rename from Silicon/NXP/LS1043A/LS1043A.dsc
rename to Silicon/NXP/LS1043A/LS1043A.dsc.inc
diff --git a/Silicon/NXP/LS1046A/LS1046A.dsc
b/Silicon/NXP/LS1046A/LS1046A.dsc.inc
similarity index 100%
rename from Silicon/NXP/LS1046A/LS1046A.dsc
rename to Silicon/NXP/LS1046A/LS1046A.dsc.inc
diff --git a/Silicon/NXP/LS2088A/LS2088A.dsc
b/Silicon/NXP/LS2088A/LS2088A.dsc.inc
similarity index 100%
rename from Silicon/NXP/LS2088A/LS2088A.dsc
rename to Silicon/NXP/LS2088A/LS2088A.dsc.inc
diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc
b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc
index 8cbaf8829c..e75672cd0c 100644
--- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc
+++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc
@@ -28,8 +28,8 @@ [Defines]
OUTPUT_DIRECTORY = Build/LS1043aRdbPkg
FLASH_DEFINITION = Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf
-!include ../NxpQoriqLs.dsc
-!include ../../../Silicon/NXP/LS1043A/LS1043A.dsc
+!include Platform/NXP/NxpQoriqLs.dsc.inc
+!include Silicon/NXP/LS1043A/LS1043A.dsc.inc
[LibraryClasses.common]
ArmPlatformLib|Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
index 231207d7ca..93a01a770f 100644
--- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
+++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc
@@ -28,8 +28,8 @@ [Defines]
OUTPUT_DIRECTORY = Build/LS1046aRdbPkg
FLASH_DEFINITION = Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
-!include ../NxpQoriqLs.dsc
-!include ../../../Silicon/NXP/LS1046A/LS1046A.dsc
+!include Platform/NXP/NxpQoriqLs.dsc.inc
+!include Silicon/NXP/LS1046A/LS1046A.dsc.inc
[LibraryClasses.common]
ArmPlatformLib|Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
index 1ae55d4584..7605ea50f8 100755
--- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
+++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
@@ -29,8 +29,8 @@ [Defines]
FLASH_DEFINITION = Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf
DEFINE MC_HIGH_MEM = TRUE
-!include ../NxpQoriqLs.dsc
-!include ../../../Silicon/NXP/LS2088A/LS2088A.dsc
+!include Platform/NXP/NxpQoriqLs.dsc.inc
+!include Silicon/NXP/LS2088A/LS2088A.dsc.inc
[LibraryClasses.common]
ArmPlatformLib|Platform/NXP/LS2088aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf
diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf
b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf
index 7993bf170a..c88bbe1475 100644
--- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf
+++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.fdf
@@ -54,7 +54,7 @@ [FD.LS1043ARDB_EFI]
gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
FV = FVMAIN_COMPACT
-!include ../FVRules.fdf.inc
+!include Platform/NXP/FVRules.fdf.inc
!include VarStore.fdf.inc
################################################################################
#
diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
index 3351a062e9..8ae0ada5b2 100644
--- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
+++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf
@@ -54,7 +54,7 @@ [FD.LS1046ARDB_EFI]
gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
FV = FVMAIN_COMPACT
-!include ../FVRules.fdf.inc
+!include Platform/NXP/FVRules.fdf.inc
################################################################################
#
# FV Section
diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf
b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf
index 35a79bda6f..93760df409 100644
--- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf
+++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.fdf
@@ -54,7 +54,7 @@ [FD.LS2088aRdb_EFI]
gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
FV = FVMAIN_COMPACT
-!include ../FVRules.fdf.inc
+!include Platform/NXP/FVRules.fdf.inc
!include VarStore.fdf.inc
################################################################################
#
--
2.11.0
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
