As for the preparation for adding multiple boards support,
move common part of the .fdf file to the SoC family directory
and change output FD file name to more generic.

Once needed, possible per-board differences will be resolved
by including custom .fdf.inc file. This way adding new common
changes for entire SoC family won't require any
duplication and at the same time the per-board .fdf.inc
will allow better suiting the .FD file contents.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc                                              | 2 +-
 Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf => Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf => Silicon/Marvell/Armada7k8k/Armada7k8k.fdf (97%)

diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
index 46a1ea9..eedb025 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
@@ -43,7 +43,7 @@
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+  FLASH_DEFINITION               = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
 
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
similarity index 97%
rename from Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
rename to Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index e5e5443..180b6c9 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -24,7 +24,7 @@
 #
 ################################################################################
 
-[FD.Armada70x0Db_EFI]
+[FD.Armada_EFI]
 BaseAddress   = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in NOR Flash.
 Size          = 0x00400000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device
 ErasePolarity = 1
-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel