Unified .fdf file allows to update all Armada7k8k-based boards at the same time. However there may be a need to add unique DXE firmware volume contents like DTB or ACPI.
For this purpose create empty files for existing boards that are included as defined in BOARD_DXE_FV_COMPONENTS macro. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas <m...@semihalf.com> --- Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 1 + Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 1 + Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc | 1 + Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 2 ++ Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc | 13 +++++++++++++ Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc | 13 +++++++++++++ Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 13 +++++++++++++ 7 files changed, 44 insertions(+) create mode 100644 Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc create mode 100644 Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc create mode 100644 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc index 2240a57..0c08328 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc @@ -44,6 +44,7 @@ BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf + BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc index 2425c45..2d4523f2 100644 --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc @@ -44,6 +44,7 @@ BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf + BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc index 1baed88..e1f5827 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc @@ -44,6 +44,7 @@ BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf + BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc CAPSULE_ENABLE = TRUE !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf index 18d5d06..0f38978 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf @@ -212,6 +212,8 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c } !endif +!include $(BOARD_DXE_FV_COMPONENTS) + # PEI phase firmware volume [FV.FVMAIN_COMPACT] FvAlignment = 8 diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc new file mode 100644 index 0000000..984cf7e --- /dev/null +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc @@ -0,0 +1,13 @@ +# +# Copyright (C) 2018 Marvell International Ltd. and its affiliates +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# + +# Per-board additional content of the DXE phase firmware volume diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc new file mode 100644 index 0000000..984cf7e --- /dev/null +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc @@ -0,0 +1,13 @@ +# +# Copyright (C) 2018 Marvell International Ltd. and its affiliates +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# + +# Per-board additional content of the DXE phase firmware volume diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc new file mode 100644 index 0000000..984cf7e --- /dev/null +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc @@ -0,0 +1,13 @@ +# +# Copyright (C) 2018 Marvell International Ltd. and its affiliates +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# + +# Per-board additional content of the DXE phase firmware volume -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
