From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::241; helo=mail-it0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x241.google.com (mail-it0-x241.google.com [IPv6:2607:f8b0:4001:c0b::241]) (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 3F47F2096F35B for ; Mon, 4 Jun 2018 12:13:47 -0700 (PDT) Received: by mail-it0-x241.google.com with SMTP id n7-v6so326031itn.1 for ; Mon, 04 Jun 2018 12:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Ggvytc0Yt1nutnqkENOwUSQVPybDlD/IfABcOik2pfA=; b=H1ZgPaEhSOnD2j09qMMuBbFxWm1OnTc7j8ekviEkyU/hK4e3be7uKJgrkxK/BkrNE5 6glA/1PwW2CfHhtSWnS0N4P7ooAfCHu42cdJXrLvvcinlMKvbKuZQFXJ2AxGbARFyWYZ i4GGah3cZnYB3Sj6vrnom3Kee8ZVHkuAIGnCc= 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=Ggvytc0Yt1nutnqkENOwUSQVPybDlD/IfABcOik2pfA=; b=s9WTP5jMK5I69ZBklCdeqO7HU2Vx9rXkJKLWsz/4H/epY0Y+ipCYW2eK4bNLbt8KJv wh6qw7gsO9F6inVckLl2/r/jMWZCC1XZ7nDqzaZvfQvGkRQJEE2Nxe2CRRTN40twg0Z0 cowZxJCgDsyAyAKgFqHiKhZkccKAHRt0rkhbfEwACPbq5yUkYJ7iJ1iQ5m4eoplUz7at 1CPD0HAU2ZK8NuWNpT8SL/2omMFfiBJ8awXH1IzHkR0goIW/JKEjKfRUsGP+2m+h+TnD PVuTM8sHaoxlYQdHI94EY++SFfucF3SvAmNPhlwGBVmXnpHrGljf6BYW6R4SFsqViUTm YXKA== X-Gm-Message-State: APt69E1xJ+HXRQIGMyM8ku4hkauTh2jeV/k+I09+Hi7jget1scewI49W LV57vcCuYgg1coORTb+9TLY8gTir4r3HXtZkLCQNww== X-Google-Smtp-Source: ADUXVKKWIKP1nbujOunQAg1VYdNFIQsLQ1Tk1MqQ6esuIKvmse5gDC6rdXr82ZqcXzyMOC4/B/rNYEMq/TaziYjY0Xc= X-Received: by 2002:a24:5390:: with SMTP id n138-v6mr15427514itb.42.1528139626542; Mon, 04 Jun 2018 12:13:46 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a6b:bb86:0:0:0:0:0 with HTTP; Mon, 4 Jun 2018 12:13:45 -0700 (PDT) In-Reply-To: <20180604190837.dh5jaivtajjxml6k@bivouac.eciton.net> References: <1528132305-16614-1-git-send-email-mw@semihalf.com> <20180604174611.tgoknqg3cozjwnx7@bivouac.eciton.net> <20180604190837.dh5jaivtajjxml6k@bivouac.eciton.net> From: Ard Biesheuvel Date: Mon, 4 Jun 2018 21:13:45 +0200 Message-ID: To: Leif Lindholm Cc: Marcin Wojtas , 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: Mon, 04 Jun 2018 19:13:47 -0000 Content-Type: text/plain; charset="UTF-8" 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 > 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 >> >>