Re: [platforms PATCH v4 5/5] Marvell/Armada7k8k: Wire up capsule support

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

On 4 June 2018 at 21:08, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Mon, Jun 04, 2018 at 08:53:53PM +0200, Marcin Wojtas wrote:
>> 2018-06-04 19:46 GMT+02:00 Leif Lindholm <leif.lindholm@linaro.org>:
>> >> 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 <ard.biesheuvel@linaro.org>

> 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
>> >>