From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4864:20::242; helo=mail-lj1-x242.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 62D50210DC1B5 for ; Tue, 7 Aug 2018 02:00:19 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id w16-v6so12788609ljh.12 for ; Tue, 07 Aug 2018 02:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZHqnu4oMYFJmLowjaOsi2idNa2BsHbaygk8Zq6YxEls=; b=eJN2n1GQhuc9eDVCuiWzUnwjmi9mnMclMqKzSriTSoe2b1m9nlX0AWK5TCrkJnpBdO OPC8rWtqUpHA9eBKlgsdavMGA/AZc6fIDlAnHAjJvqPkETufWY8G2HjMm7jCgGDJ1R8N 3rSIbDfS3VakKKnaLDuMe8ckeikbZsYwPaLal9AcuDfVLYu9ojI01bnbQaKbsEm+SArm bsb8vb4654MlZ5XuTSZSad6INWJR3FHiprVtLN/BrMkb9ZbNS7vE8500XwvqJbxaUh5O RBeQ/IXCK9ugNRyAHcGRj0E76HEwF0ez/1fnCds4SGDz8ttaIgA7tTKS/NbrWgZO6bJH plpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZHqnu4oMYFJmLowjaOsi2idNa2BsHbaygk8Zq6YxEls=; b=EXjFtstKRnQN07u+HwkayJRB1Pc8VdePt0Lf59Tkxgf6bMo88EUHVAV0ol+PP3ugUf /MiaNUKmXWS0bCYVxmnfuvTijBuRNqmY2Z7B/qjdn4/xADP9bCIucSu2B4urk9B9/A/N 0CeS3sNpzWjia5u1Tw/MrnBl7Eb2kpnGNrXPXEPZt5ujiqE3RPBXpkhVkLTqyBwGsg6J Cu9id/MbYnoFKftyuhZBZoh8UJHrBJjsJTDTd7Ve0JKgRlC/n+3vmlg+C1wclUIoJEy3 HkuaEXEbPWOwOSkAE4MM+UBNoqulDWr7nf3QQeV7u9NLcNvhaRiXpSrzaLs/ON5OEanF ESMg== X-Gm-Message-State: AOUpUlEfVVAyq8LeCYSqRDLw1ImBHone15xhmex58hZiWgnlv6/X36vC /T7yueVRozTUw6T0Kz05vovwd0gSDYH3sQ== X-Google-Smtp-Source: AAOMgpeLgk/VlGWY3gmMG8WmhaMWh+mLD3ud6iNWn7XHVNK328HgeWL4Qi1KyyAoitQ/3hCTVoq+Mg== X-Received: by 2002:a2e:52c3:: with SMTP id n64-v6mr15714646lje.90.1533632417266; Tue, 07 Aug 2018 02:00:17 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id w27-v6sm181697lfk.5.2018.08.07.02.00.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Aug 2018 02:00:16 -0700 (PDT) From: Marcin Wojtas 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 Date: Tue, 7 Aug 2018 10:58:11 +0200 Message-Id: <1533632298-4981-3-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533632298-4981-1-git-send-email-mw@semihalf.com> References: <1533632298-4981-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 2/9] Marvell/Armada7k8k: Enable including additional DXE FV components X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2018 09:00:19 -0000 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 --- 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