From: Marcin Wojtas <mw@semihalf.com>
To: edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org,
nadavh@marvell.com, mw@semihalf.com, jsd@semihalf.com,
jaz@semihalf.com
Subject: [platforms: PATCH 2/9] Marvell/Armada7k8k: Enable including additional DXE FV components
Date: Mon, 6 Aug 2018 01:28:19 +0200 [thread overview]
Message-ID: <1533511706-9344-3-git-send-email-mw@semihalf.com> (raw)
In-Reply-To: <1533511706-9344-1-git-send-email-mw@semihalf.com>
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 <mw@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
next prev parent reply other threads:[~2018-08-05 23:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-05 23:28 [platforms: PATCH 0/9] Armada7k8k DT/ACPI support Marcin Wojtas
2018-08-05 23:28 ` [platforms: PATCH 1/9] Marvell/Armada7k8k: Import device tree Marcin Wojtas
2018-08-05 23:28 ` Marcin Wojtas [this message]
2018-08-05 23:28 ` [platforms: PATCH 3/9] Marvell/Armada70x0Db: Enable device tree support Marcin Wojtas
2018-08-05 23:28 ` [platforms: PATCH 4/9] Marvell/Armada80x0Db: " Marcin Wojtas
2018-08-05 23:28 ` [platforms: PATCH 5/9] Marvell/Armada80x0McBin: " Marcin Wojtas
2018-08-05 23:28 ` [platforms: PATCH 6/9] Marvell/Armada7k8k: Add common ACPI tables Marcin Wojtas
2018-08-05 23:28 ` [platforms: PATCH 7/9] Marvell/Armada70x0Db: Enable ACPI support Marcin Wojtas
2018-08-06 11:54 ` Ard Biesheuvel
2018-08-06 16:08 ` Marcin Wojtas
2018-08-06 16:09 ` Ard Biesheuvel
2018-08-06 17:44 ` Leif Lindholm
2018-08-06 17:55 ` Marcin Wojtas
2018-08-07 7:39 ` Ard Biesheuvel
2018-08-05 23:28 ` [platforms: PATCH 8/9] Marvell/Armada80x0Db: " Marcin Wojtas
2018-08-05 23:28 ` [platforms: PATCH 9/9] Marvell/Armada80x0McBin: " Marcin Wojtas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1533511706-9344-3-git-send-email-mw@semihalf.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox