From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2607:f8b0:4001:c06::234; helo=mail-io0-x234.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-io0-x234.google.com (mail-io0-x234.google.com [IPv6:2607:f8b0:4001:c06::234]) (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 ADB252118F798 for ; Tue, 5 Jun 2018 05:13:09 -0700 (PDT) Received: by mail-io0-x234.google.com with SMTP id l25-v6so3005995ioh.12 for ; Tue, 05 Jun 2018 05:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=gd6zPa1+qyXc9GcmVDCPoG0I3IXkPieLeyHWqgASt4A=; b=zUj8ZMaFijhMTGvChurI6wyoUT15e3xQgs83fjtlCEPBVq4GVFFoG1OMp88ZAqqjwV hXYH/3VBhDHVk6PVOTtj5X/raCgQOY7GShM+Dxwo83cCvGZJ2yXSeG843jR0S14b+c++ nq85Cb2FAhcH9tFU9CGh4BbicC2W8O58lmuPsZFMUN3fp8gxCSSUZebUBniQvys6KV3j CHrZQnMWkpjgdJ/E/ms/d6Hzf5x8eBGfWXu3sB6RXgGJ5xN3vQmcaNo2ZQ+s1yhgSmJ+ gWVq9TRhaEmOwfNipAtHKuMRVAphePD0BbIrsYn6vlOQxOqVuzvGuykBoxWZ2BA40wZw C2Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=gd6zPa1+qyXc9GcmVDCPoG0I3IXkPieLeyHWqgASt4A=; b=SyCXyl4XtvQ5E/qOzk6C6HTm9aa0yN5QcRhbxPSZ9lqiTJw2jKTCDBaDiMiEogkttP OU1r6oGFU7f71kSlx87o7vei+pL2VWc/9PAG987F6hvZIwykm6HYrjGaN05z1H1hXWhk 3RBqL8BDusyx2+kTA4UxEQ1yr1iKQDz2oMXq7Ch+i+LijOHFakK5+cCja39jXlJ94Gzw alDunMr1ftklp7dOjzhx383xha23ppRI7FkVC6eR8J0vCPgGyKTLc4ERhBiJoGg//+Nh dm3YvCS8W+FqR2aEJK1dP3fQYS2D4tkQImVOckKN3KJjQcTrI0UGUTjbqe3LhexgpQQv WclA== X-Gm-Message-State: APt69E2r8PK4cbCReLbFfq/P9R1CYlQTHO6Jt7+aPcOn8vmpN7el+s8I Zff34L/RgWAgtB8OdPmouj1g4I8fNqAjN+ItDjjxFw== X-Google-Smtp-Source: ADUXVKK1GiN9YTFTosB5v4roAkDY42p2NO3xT/aKY2a1QuqtarIi/XRIHQDrFihytYcYejwERHeg2DvN/6sEyHr70zI= X-Received: by 2002:a6b:1884:: with SMTP id 126-v6mr14459519ioy.183.1528200788470; Tue, 05 Jun 2018 05:13:08 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:c6cc:0:0:0:0:0 with HTTP; Tue, 5 Jun 2018 05:13:07 -0700 (PDT) In-Reply-To: <20180605115953.oxbr3qfdv5g7qxvv@bivouac.eciton.net> References: <1528132305-16614-1-git-send-email-mw@semihalf.com> <20180604174611.tgoknqg3cozjwnx7@bivouac.eciton.net> <20180604190837.dh5jaivtajjxml6k@bivouac.eciton.net> <20180605115953.oxbr3qfdv5g7qxvv@bivouac.eciton.net> From: Marcin Wojtas Date: Tue, 5 Jun 2018 14:13:07 +0200 Message-ID: To: Leif Lindholm Cc: Ard Biesheuvel , edk2-devel-01 , semihalf-dabros-jan , Hua Jing , Grzegorz Jaszczyk , David Sniatkiwicz Subject: Re: [platforms PATCH v4 5/5] Marvell/Armada7k8k: Wire up capsule support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 12:13:10 -0000 Content-Type: text/plain; charset="UTF-8" 2018-06-05 13:59 GMT+02:00 Leif Lindholm : > On Mon, Jun 04, 2018 at 09:13:45PM +0200, Ard Biesheuvel wrote: >> On 4 June 2018 at 21:08, Leif Lindholm wrote: >> > On Mon, Jun 04, 2018 at 08:53:53PM +0200, Marcin Wojtas wrote: >> >> 2018-06-04 19:46 GMT+02:00 Leif Lindholm : >> >> >> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf >> >> >> new file mode 100644 >> >> >> index 0000000..3fe165f >> >> >> --- /dev/null >> >> >> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8kCapsule.fdf >> >> >> @@ -0,0 +1,70 @@ >> >> >> +# >> >> >> +# Copyright (C) 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. >> >> >> +# >> >> >> + >> >> >> +[FD.Armada_Capsule] >> >> >> +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 >> >> >> + >> >> >> +0x00000000|0x00010000 >> >> >> +FILE = $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/SYSTEMFIRMWAREDESCRIPTOR.Fv >> >> >> + >> >> >> +0x00100000|0x00300000 >> >> >> +FILE = $(FIRMWARE_IMAGE_PATH) >> >> > >> >> > OK, so using it not as a pointer to a directory, this doesn't lose any >> >> > flexibility compared to a PREFIX. But a _PATH variable is something I >> >> > expect to be pointing to a directory. >> >> > >> >> > I'd be happy without the _PATH suffix - can we drop it? >> >> >> >> Sure, I'm fine with that - should I resend? >> > >> > Nah, I can fold it in. >> > If Ard's OK with this one? >> > >> >> All fine with the series now >> >> Reviewed-by: Ard Biesheuvel > > Thanks. I think it would be worth considering enabling the capsule > build on the platforms by default (certainly for MacchiatoBIN once > that gets submitted). But for now: > > Reviewed-by: Leif Lindholm > Pushed as 0923068a48..d1d8e5e095. > Great, thanks! Best regards, Marcin > / > Leif > >> > Regards, >> > >> > Leif >> > >> >> Thanks, >> >> Marcin >> >> >> >> > / >> >> > Leif >> >> > >> >> >> + >> >> >> +[FV.SystemFirmwareUpdateCargo] >> >> >> +FvAlignment = 8 >> >> >> +ERASE_POLARITY = 1 >> >> >> +MEMORY_MAPPED = TRUE >> >> >> +STICKY_WRITE = TRUE >> >> >> +LOCK_CAP = TRUE >> >> >> +LOCK_STATUS = TRUE >> >> >> +WRITE_DISABLED_CAP = TRUE >> >> >> +WRITE_ENABLED_CAP = TRUE >> >> >> +WRITE_STATUS = TRUE >> >> >> +WRITE_LOCK_CAP = TRUE >> >> >> +WRITE_LOCK_STATUS = TRUE >> >> >> +READ_DISABLED_CAP = TRUE >> >> >> +READ_ENABLED_CAP = TRUE >> >> >> +READ_STATUS = TRUE >> >> >> +READ_LOCK_CAP = TRUE >> >> >> +READ_LOCK_STATUS = TRUE >> >> >> + >> >> >> + FILE RAW = b3890e02-c46b-4970-9536-57787a9e06c7 { # PcdEdkiiSystemFirmwareFileGuid >> >> >> + FD = Armada_Capsule >> >> >> + } >> >> >> + >> >> >> + FILE RAW = ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsuleDriverFvFileGuid >> >> >> + $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/CAPSULEDISPATCHFV.Fv >> >> >> + } >> >> >> + >> >> >> + FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsuleConfigFileGuid >> >> >> + Silicon/Marvell/Armada7k8k/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini >> >> >> + } >> >> >> + >> >> >> +[FmpPayload.FmpPayloadSystemFirmwarePkcs7] >> >> >> +IMAGE_HEADER_INIT_VERSION = 0x02 >> >> >> +IMAGE_TYPE_ID = 757fc475-6b22-4482-868e-ded286f30940 # PcdSystemFmpCapsuleImageTypeIdGuid >> >> >> +IMAGE_INDEX = 0x1 >> >> >> +HARDWARE_INSTANCE = 0x0 >> >> >> +MONOTONIC_COUNT = 0x1 >> >> >> +CERTIFICATE_GUID = 4AAFD29D-68DF-49EE-8AA9-347D375665A7 # PKCS7 >> >> >> + >> >> >> + FV = SystemFirmwareUpdateCargo >> >> >> + >> >> >> +[Capsule.MvFirmwareUpdateCapsuleFmpPkcs7] >> >> >> +CAPSULE_GUID = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid >> >> >> +CAPSULE_HEADER_SIZE = 0x20 >> >> >> +CAPSULE_HEADER_INIT_VERSION = 0x1 >> >> >> + >> >> >> + FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7 >> >> >> + >> >> >> -- >> >> >> 2.7.4 >> >> >>