From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4442C433EF for ; Mon, 28 Mar 2022 00:02:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5258583ADC; Mon, 28 Mar 2022 02:02:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RA/avll1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35CE183AD0; Mon, 28 Mar 2022 02:02:12 +0200 (CEST) Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 495B783ADC for ; Mon, 28 Mar 2022 02:02:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=masami.hiramatsu@linaro.org Received: by mail-il1-x12f.google.com with SMTP id y7so8865140ilv.6 for ; Sun, 27 Mar 2022 17:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=xenB8Vd0/IsAMx9aztEA8bRMhl3FT/46DNQjm1D3dqo=; b=RA/avll1Q0mSNstgj08xde0wndVMHm8HbsEN3bJpb0clgvSHT0/pt7awdrz4CcFY5h iFUQgw62PYxwOqL9zVBr6NDBUEcUG9aRQQ0oO3eiLzSohnSnkhlU4pCCT513HfcSkJWS GwZIob+GYY/PrJph/RgAM0w5gaxvDY/2an4O+fzic+YCXVlPZzJEdh2w/ukv7u9Y2RXK Wrp22HdGZfyoRW7GmocwzlX+uaDKq1208EXUKrmcf4r2JsBnWrrlO7a9fPBEUu4RSn2l A4jHCplvTsYZARFO5VKXbpaQZRBIkOLHGxfVBmyBGm6VzPEvIja9CoSlUovnxbPq4cHQ TJ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=xenB8Vd0/IsAMx9aztEA8bRMhl3FT/46DNQjm1D3dqo=; b=44XgCT0yTQN78xDhXzW1HOahnCToEa1/8ruGQ0sb6pQGHjpSiSs8zWJVqgVBdDhwJq /keuS1FTQN0kAsiEUI0YtsjH/XYyTs4SW+zh0X7vR03L584PRJwagO0qzv/DVsGnQWTE FnwA+a1P5F8dRJj/pmOeSi9ri/oo26+glO//Jqxy/7uSnySuScb6g08mignEgMdHaa79 zrTI27ZUtHLmR5g8sWsuahKmnqhjwIcZ07zF2J/hPODCO/iCD2JjnDSUACg9i6lGyazS 6jdXy4AiBP2CQBoodRKDo8HlEFa7A0GpmQwITA+7NmFDGbQ3yht/29AmDx5r9HaJc7mv WqYA== X-Gm-Message-State: AOAM532AQ92wUjDrk8LiQcQ/2+HnXIu1vJtvHlM3VcirwBTG/IlN9Ee3 Ib7amT29TlyXMTzlceZhWC7+vEhqvTLSoAYnn34IcA== X-Google-Smtp-Source: ABdhPJxumFtEROFCyp+30M9t0ANs36/aI2Pd9EIgDYfcDee+T2iWEp8lMxsPzwrObwEk8DdDWQAfn6kDq0vuLBnsws8= X-Received: by 2002:a92:7513:0:b0:2b9:5b61:e376 with SMTP id q19-20020a927513000000b002b95b61e376mr4676871ilc.193.1648425723386; Sun, 27 Mar 2022 17:02:03 -0700 (PDT) MIME-Version: 1.0 References: <20220324123901.429472-1-sughosh.ganu@linaro.org> <20220324123901.429472-2-sughosh.ganu@linaro.org> In-Reply-To: From: Masami Hiramatsu Date: Mon, 28 Mar 2022 09:01:52 +0900 Message-ID: Subject: Re: [RFC PATCH 1/6] capsule: Add Image GUIDs for platforms using capsule updates To: Sughosh Ganu Cc: u-boot@lists.denx.de, Heinrich Schuchardt , Ilias Apalodimas , AKASHI Takahiro , Ying-Chun Liu , Tuomas Tynkkynen , Heiko Thiery , Frieder Schrempf , Michael Walle , Jassi Brar , Michal Simek , Michal Simek Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Hi Sughosh, 2022=E5=B9=B43=E6=9C=8827=E6=97=A5(=E6=97=A5) 18:11 Sughosh Ganu : > > hi Masami, > > On Sat, 26 Mar 2022 at 16:17, Masami Hiramatsu > wrote: > > > > Hi Sughosh, > > > > 2022=E5=B9=B43=E6=9C=8825=E6=97=A5(=E9=87=91) 18:59 Sughosh Ganu : > > > > > > hi Masami, > > > > > > On Fri, 25 Mar 2022 at 10:58, Masami Hiramatsu > > > wrote: > > > > > > > > Hi Sughosh, > > > > > > > > OK I understand that if the platform uses the FIT capsule, the > > > > fw_images[] must have 1 entry and it is completely non relationship > > > > with dfu_alt_info... We may need a document for this case too. > > > > > > Actually, what you are stating above applies to both raw images as > > > well as FIT images. I have added a paragraph in the capsule update > > > related section in the uefi.rst. Can you check my patch 4 of this > > > series. Thanks. > > > > I've checked that you didn't change the FMP::set_image(), but updated > > FMP::get_image_info() to use the per-platform GUID list. > > Thus, the efi_fmp_find() ensures that the image type GUID in the > > capsule image is *included* in the platform GUID list (fw_images[] > > array). > > > > OK, at this point, it filters out the firmware image which is not > > supported on the platform. > > > > However, since you didn't update the FMP::set_image() and > > efi_capsule_update_firmware(), it directly uses the *index* number in > > the capsule image for updating the firmware. Is that correct? > > Yes, your observation is correct. The aim of this series is to fix the > issue of using a common GUID value across images and platforms for a > given FMP instance. OK, but I think this has made the thing complicated. Without this series, user will only care about the index number to make the capsule image and the GUID is correct for the platform, since the platform chooses FIP or RAW. With this series, user additionally needs to care about the combination of the index and the GUID of image type, because the U-Boot doesn't check the combination is correct or not. I would like to ask you to add this note in the document. Even if the U-Boot checks the combination, user still need to check it when making the capsule file. > > If so, if the platform supports several image types, the problem happen= s. > > Suppose that if the platform has TF-A and U-Boot, the DFU entity index > > are 1 and 2. > > And user missed to make a capsule file with index 1 for U-Boot image > > with U-Boot image type GUID of that platform. > > This capsule file passed the check in the efi_fmp_find(), because the > > GUID is included in the platform supported GUID list. However, > > FMP::set_image() will overwrite the TF-A with given U-Boot image > > without any error. > > > > I think we need one more patch to check the given image-index in the > > capsule image is correctly matched to the image-type GUID for safety. > > Yes, this is very much in the pipeline. I will be working on extending > the struct efi_fw_images to have information on the image index as > part of the structure. That is great! BTW, if we have 2 different dfu_alt_info entries for the same type of firmware, should we have different GUIDs for those? > But please note that what you mention above is > just making the process of capsule update more robust -- the current > implementation that we have in the capsule update module where the > image_index value is taken from the capsule is very much in compliance > with the UEFI specification. The current patch series is fixing an > issue which was not compliant with the spec. But what you are > suggesting above is on my Todo list, just that it is a separate task, > and not a fix as such. OK, I don't mind the actual robustness change, but please describe this scenario as a notice for users so that they can make capsule files correctly. Thank you, > > -sughosh > > > > > Thank you, > > > > > -sughosh > > > > > > > > > > > Thanks, > > > > > > > > 2022=E5=B9=B43=E6=9C=8825=E6=97=A5(=E9=87=91) 10:09 Masami Hiramats= u : > > > > > > > > > > Hi Sughosh, > > > > > > > > > > 2022=E5=B9=B43=E6=9C=8824=E6=97=A5(=E6=9C=A8) 23:40 Sughosh Ganu = : > > > > > > > > > > > > hi Masami, > > > > > > > > > > > > On Thu, 24 Mar 2022 at 19:14, Masami Hiramatsu > > > > > > wrote: > > > > > > > > > > > > > > Hi Sughosh, > > > > > > > > > > > > > > 2022=E5=B9=B43=E6=9C=8824=E6=97=A5(=E6=9C=A8) 21:39 Sughosh G= anu : > > > > > > > > > > > > > > > > Currently, all platforms that enable capsule updates do so = using > > > > > > > > either EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID or > > > > > > > > EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID. This is based on th= e Firmware > > > > > > > > Management Protocol(FMP) instance used on the platform. How= ever, this > > > > > > > > means that all platforms that enable a particular FMP insta= nce have > > > > > > > > the same GUID value for all the updatable images, either th= e FIT image > > > > > > > > GUID or the raw image GUID, and that an image for some plat= form can be > > > > > > > > updated on any other platform which uses the same FMP insta= nce. Another > > > > > > > > issue with this implementation is that the ESRT table shows= the same > > > > > > > > GUID value for all images on the platform and also across p= latforms, > > > > > > > > which is not in compliance with the UEFI specification. > > > > > > > > > > > > > > > > Fix this by defining image GUID values and firmware names f= or > > > > > > > > individual images per platform. The GetImageInfo FMP hook w= ould then > > > > > > > > populate these values in the image descriptor array. > > > > > > > > > > > > > > OK, so you have generated GUIDs for each "dfu_alt_info" entry= on the > > > > > > > platforms, correct? > > > > > > > > > > > > No, I have generated the fw_images array based on the informati= on that > > > > > > I found in the dfu_alt_info variable for the platform. But this= is not > > > > > > correlated to the dfu_alt_info variable. If you think that the = array > > > > > > should have more/different entries for your platform, please le= t me > > > > > > know, and I will change it. > > > > > > > > > > At least for the DeveloperBox, it looks good to me. > > > > > (Hopefully, if you comment the string formatted GUID in the code = for > > > > > mkeficapsule, that is perfect. :) ) > > > > > > > > > > > > I think you should explain that those GUIDs (fw_images[] entr= ies) must > > > > > > > be corresponding to the dfu_alt_info entries, in the same ord= er. > > > > > > > > > > > > The dfu_alt_info can have more entries than the firmware images= that > > > > > > are updatable through capsule update. One example is the ST pla= tforms > > > > > > which have additional entries in the dfu_alt_info. The image > > > > > > descriptor array should only contain entries of images which ar= e > > > > > > updatable through capsule update, since the same information is= also > > > > > > used for generating the ESRT. Which is why I have changed the l= ogic to > > > > > > populate the image descriptors through the fw_images array rath= er than > > > > > > the dfu_alt_info. > > > > > > > > > > I meant, the order of the fw_images array needs to be same as > > > > > dfu_alt_info entries and the firmware entries for dfu_alt_info mu= st be > > > > > the first, because finally we will use the index of the fw_images > > > > > array, which matched to given image type GUID, for specifying > > > > > dfu_alt_info entry. > > > > > Or, without dfu_alt_info, your new fw_images can update the firmw= are? > > > > > I would like to see such *relationship* at least in the patch > > > > > description and the documentation. > > > > > > > > > > Thank you, > > > > > > > > > > > > > > > > > > > > > > -sughosh > > > > > > > > > > > > > Without that, it is hard to understand why the next patch ([2= /6]) works :-) > > > > > > > > > > > > > > Thank you, > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Sughosh Ganu > > > > > > > > --- > > > > > > > > .../imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 19 +++++++= ++++++++ > > > > > > > > .../imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 18 +++++++= ++++++++ > > > > > > > > board/emulation/qemu-arm/qemu-arm.c | 20 +++++++= +++++++++ > > > > > > > > board/kontron/pitx_imx8m/pitx_imx8m.c | 15 +++++++= ++++- > > > > > > > > board/kontron/sl-mx8mm/sl-mx8mm.c | 14 +++++++= ++++ > > > > > > > > board/kontron/sl28/sl28.c | 14 +++++++= ++++ > > > > > > > > board/sandbox/sandbox.c | 17 +++++++= +++++++ > > > > > > > > board/socionext/developerbox/developerbox.c | 23 +++++++= ++++++++++++ > > > > > > > > board/xilinx/common/board.h | 18 +++++++= ++++++++ > > > > > > > > board/xilinx/zynq/board.c | 18 +++++++= ++++++++ > > > > > > > > board/xilinx/zynqmp/zynqmp.c | 18 +++++++= ++++++++ > > > > > > > > include/configs/imx8mm-cl-iot-gate.h | 10 +++++++= + > > > > > > > > include/configs/imx8mp_rsb3720.h | 10 +++++++= + > > > > > > > > include/configs/kontron-sl-mx8mm.h | 6 +++++ > > > > > > > > include/configs/kontron_pitx_imx8m.h | 6 +++++ > > > > > > > > include/configs/kontron_sl28.h | 6 +++++ > > > > > > > > include/configs/qemu-arm.h | 10 +++++++= + > > > > > > > > include/configs/sandbox.h | 10 +++++++= + > > > > > > > > include/configs/synquacer.h | 14 +++++++= ++++ > > > > > > > > include/efi_loader.h | 15 +++++++= +++++ > > > > > > > > 20 files changed, 280 insertions(+), 1 deletion(-) > > > > > > > > > > > > > > > > diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb372= 0a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > > > > > > > > index 16566092bd..6b534660fe 100644 > > > > > > > > --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > > > > > > > > +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c > > > > > > > > @@ -6,6 +6,8 @@ > > > > > > > > > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -21,6 +23,7 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > @@ -44,6 +47,22 @@ static void setup_gpmi_nand(void) > > > > > > > > } > > > > > > > > #endif > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > +#if defined(CONFIG_TARGET_IMX8MP_RSB3720A1_4G) > > > > > > > > + .image_type_id =3D IMX8MP_RSB3720A1_4G_FIT_= IMAGE_GUID, > > > > > > > > +#elif defined(CONFIG_TARGET_IMX8MP_RSB3720A1_6G) > > > > > > > > + .image_type_id =3D IMX8MP_RSB3720A1_6G_FIT_= IMAGE_GUID, > > > > > > > > +#endif > > > > > > > > + .fw_name =3D u"IMX8MP-RSB3720-FIT" > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > + > > > > > > > > int board_early_init_f(void) > > > > > > > > { > > > > > > > > struct wdog_regs *wdog =3D (struct wdog_regs *)WDOG= 1_BASE_ADDR; > > > > > > > > diff --git a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-io= t-gate.c b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c > > > > > > > > index 7e2d88f449..ec73d75db3 100644 > > > > > > > > --- a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.= c > > > > > > > > +++ b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.= c > > > > > > > > @@ -5,6 +5,8 @@ > > > > > > > > */ > > > > > > > > > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -21,11 +23,27 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > > > > > > > > > #include "ddr/ddr.h" > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > +#if defined(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) > > > > > > > > + .image_type_id =3D IMX8MM_CL_IOT_GATE_FIT_I= MAGE_GUID, > > > > > > > > +#elif defined(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) > > > > > > > > + .image_type_id =3D IMX8MM_CL_IOT_GATE_OPTEE= _FIT_IMAGE_GUID, > > > > > > > > +#endif > > > > > > > > + .fw_name =3D u"IMX8MM-CL-IOT-GATE-FIT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > int board_phys_sdram_size(phys_size_t *size) > > > > > > > > { > > > > > > > > struct lpddr4_tcm_desc *lpddr4_tcm_desc =3D > > > > > > > > diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/em= ulation/qemu-arm/qemu-arm.c > > > > > > > > index 16d5a97167..99872ce0b8 100644 > > > > > > > > --- a/board/emulation/qemu-arm/qemu-arm.c > > > > > > > > +++ b/board/emulation/qemu-arm/qemu-arm.c > > > > > > > > @@ -6,15 +6,35 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > > > > > > > > > +#include > > > > > > > > + > > > > > > > > #ifdef CONFIG_ARM64 > > > > > > > > #include > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > +#if defined(CONFIG_TARGET_QEMU_ARM_32BIT) > > > > > > > > + .image_type_id =3D QEMU_ARM_UBOOT_IMAGE_GUI= D, > > > > > > > > +#elif defined(CONFIG_TARGET_QEMU_ARM_64BIT) > > > > > > > > + .image_type_id =3D QEMU_ARM64_UBOOT_IMAGE_G= UID, > > > > > > > > +#endif > > > > > > > > + .fw_name =3D u"Qemu-Arm-UBOOT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > static struct mm_region qemu_arm64_mem_map[] =3D { > > > > > > > > { > > > > > > > > /* Flash */ > > > > > > > > diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/= kontron/pitx_imx8m/pitx_imx8m.c > > > > > > > > index d655fe099b..c3af951b14 100644 > > > > > > > > --- a/board/kontron/pitx_imx8m/pitx_imx8m.c > > > > > > > > +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c > > > > > > > > @@ -2,6 +2,8 @@ > > > > > > > > > > > > > > > > #include "pitx_misc.h" > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -12,7 +14,7 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > - > > > > > > > > +#include > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > > > > > > > > > @@ -30,6 +32,17 @@ static iomux_v3_cfg_t const uart_pads[] = =3D { > > > > > > > > IMX8MQ_PAD_ECSPI1_MISO__UART3_CTS_B | MUX_PAD_CTRL(= UART_PAD_CTRL), > > > > > > > > }; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D KONTRON_PITX_IMX8M_FIT_I= MAGE_GUID, > > > > > > > > + .fw_name =3D u"KONTRON-PITX-IMX8M-UBOOT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > int board_early_init_f(void) > > > > > > > > { > > > > > > > > struct wdog_regs *wdog =3D (struct wdog_regs *)WDOG= 1_BASE_ADDR; > > > > > > > > diff --git a/board/kontron/sl-mx8mm/sl-mx8mm.c b/board/kont= ron/sl-mx8mm/sl-mx8mm.c > > > > > > > > index 48376cb826..4d25618895 100644 > > > > > > > > --- a/board/kontron/sl-mx8mm/sl-mx8mm.c > > > > > > > > +++ b/board/kontron/sl-mx8mm/sl-mx8mm.c > > > > > > > > @@ -6,12 +6,26 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D KONTRON_SL_MX8MM_FIT_IMA= GE_GUID, > > > > > > > > + .fw_name =3D u"KONTROL-SL-MX8MM-UBOOT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > int board_phys_sdram_size(phys_size_t *size) > > > > > > > > { > > > > > > > > u32 ddr_size =3D readl(M4_BOOTROM_BASE_ADDR); > > > > > > > > diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28= /sl28.c > > > > > > > > index 3c48a9141d..a4985df4ea 100644 > > > > > > > > --- a/board/kontron/sl28/sl28.c > > > > > > > > +++ b/board/kontron/sl28/sl28.c > > > > > > > > @@ -3,11 +3,14 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -23,6 +26,17 @@ > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D KONTRON_SL28_FIT_IMAGE_G= UID, > > > > > > > > + .fw_name =3D u"KONTRON-SL28-FIT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > int board_early_init_f(void) > > > > > > > > { > > > > > > > > fsl_lsch3_early_init_f(); > > > > > > > > diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbo= x.c > > > > > > > > index 5d9a945d64..8b0f3de1ea 100644 > > > > > > > > --- a/board/sandbox/sandbox.c > > > > > > > > +++ b/board/sandbox/sandbox.c > > > > > > > > @@ -7,6 +7,8 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -25,6 +27,21 @@ > > > > > > > > */ > > > > > > > > gd_t *gd; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D SANDBOX_UBOOT_IMAGE_GUID= , > > > > > > > > + .fw_name =3D u"SANDBOX-UBOOT", > > > > > > > > + }, > > > > > > > > + { > > > > > > > > + .image_type_id =3D SANDBOX_UBOOT_ENV_IMAGE_= GUID, > > > > > > > > + .fw_name =3D u"SANDBOX-UBOOT-ENV", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > #if !CONFIG_IS_ENABLED(OF_PLATDATA) > > > > > > > > /* > > > > > > > > * Add a simple GPIO device (don't use with of-platdata as= it interferes with > > > > > > > > diff --git a/board/socionext/developerbox/developerbox.c b/= board/socionext/developerbox/developerbox.c > > > > > > > > index 9552bfcdc3..4df26f4019 100644 > > > > > > > > --- a/board/socionext/developerbox/developerbox.c > > > > > > > > +++ b/board/socionext/developerbox/developerbox.c > > > > > > > > @@ -10,10 +10,33 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > > > > > > > > > +#include > > > > > > > > + > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D DEVELOPERBOX_UBOOT_IMAGE= _GUID, > > > > > > > > + .fw_name =3D u"DEVELOPERBOX-UBOOT", > > > > > > > > + }, > > > > > > > > + { > > > > > > > > + .image_type_id =3D DEVELOPERBOX_FIP_IMAGE_G= UID, > > > > > > > > + .fw_name =3D u"DEVELOPERBOX-FIP", > > > > > > > > + }, > > > > > > > > + { > > > > > > > > + .image_type_id =3D DEVELOPERBOX_OPTEE_IMAGE= _GUID, > > > > > > > > + .fw_name =3D u"DEVELOPERBOX-OPTEE", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > static struct mm_region sc2a11_mem_map[] =3D { > > > > > > > > { > > > > > > > > .virt =3D 0x0UL, > > > > > > > > diff --git a/board/xilinx/common/board.h b/board/xilinx/com= mon/board.h > > > > > > > > index 69e642429b..9bcac14946 100644 > > > > > > > > --- a/board/xilinx/common/board.h > > > > > > > > +++ b/board/xilinx/common/board.h > > > > > > > > @@ -7,6 +7,24 @@ > > > > > > > > #ifndef _BOARD_XILINX_COMMON_BOARD_H > > > > > > > > #define _BOARD_XILINX_COMMON_BOARD_H > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define ZYNQ_BOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x1ba29a15, 0x9969, 0x40aa, 0xb4, 0x24, \ > > > > > > > > + 0xe8, 0x61, 0x21, 0x61, 0x86, 0x64) > > > > > > > > + > > > > > > > > +#define ZYNQ_UBOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x1a5178f0, 0x87d3, 0x4f36, 0xac, 0x63, \ > > > > > > > > + 0x3b, 0x31, 0xa2, 0x3b, 0xe3, 0x05) > > > > > > > > + > > > > > > > > +#define ZYNQMP_BOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xde6066e8, 0x0256, 0x4fad, 0x82, 0x38, \ > > > > > > > > + 0xe4, 0x06, 0xe2, 0x74, 0xc4, 0xcf) > > > > > > > > + > > > > > > > > +#define ZYNQMP_UBOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xcf9ecfd4, 0x938b, 0x41c5, 0x85, 0x51, \ > > > > > > > > + 0x1f, 0x88, 0x3a, 0xb7, 0xdc, 0x18) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > int board_late_init_xilinx(void); > > > > > > > > > > > > > > > > int xilinx_read_eeprom(void); > > > > > > > > diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/= board.c > > > > > > > > index 26ef048835..0aa51a3e6d 100644 > > > > > > > > --- a/board/xilinx/zynq/board.c > > > > > > > > +++ b/board/xilinx/zynq/board.c > > > > > > > > @@ -8,6 +8,8 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -21,10 +23,26 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > #include "../common/board.h" > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D ZYNQ_BOOT_IMAGE_GUID, > > > > > > > > + .fw_name =3D u"ZYNQ-BOOT-IMAGE", > > > > > > > > + }, > > > > > > > > + { > > > > > > > > + .image_type_id =3D ZYNQ_UBOOT_IMAGE_GUID, > > > > > > > > + .fw_name =3D u"ZYNQ-UBOOT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DEBUG_UAR= T_BOARD_INIT) > > > > > > > > void board_debug_uart_init(void) > > > > > > > > { > > > > > > > > diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zy= nqmp/zynqmp.c > > > > > > > > index 70b3c81f12..b232f7ac4f 100644 > > > > > > > > --- a/board/xilinx/zynqmp/zynqmp.c > > > > > > > > +++ b/board/xilinx/zynqmp/zynqmp.c > > > > > > > > @@ -9,6 +9,8 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > +#include > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > @@ -40,6 +42,7 @@ > > > > > > > > #include > > > > > > > > #include > > > > > > > > #include > > > > > > > > +#include > > > > > > > > #include "../common/board.h" > > > > > > > > > > > > > > > > #include "pm_cfg_obj.h" > > > > > > > > @@ -54,6 +57,21 @@ > > > > > > > > > > > > > > > > DECLARE_GLOBAL_DATA_PTR; > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +struct efi_fw_images fw_images[] =3D { > > > > > > > > + { > > > > > > > > + .image_type_id =3D ZYNQMP_BOOT_IMAGE_GUID, > > > > > > > > + .fw_name =3D u"ZYNQMP-BOOT-IMAGE", > > > > > > > > + }, > > > > > > > > + { > > > > > > > > + .image_type_id =3D ZYNQMP_UBOOT_IMAGE_GUID, > > > > > > > > + .fw_name =3D u"ZYNQMP-UBOOT", > > > > > > > > + }, > > > > > > > > +}; > > > > > > > > + > > > > > > > > +u8 num_image_type_guids =3D ARRAY_SIZE(fw_images); > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > #if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPP= L) > > > > > > > > static xilinx_desc zynqmppl =3D XILINX_ZYNQMP_DESC; > > > > > > > > > > > > > > > > diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include= /configs/imx8mm-cl-iot-gate.h > > > > > > > > index 7e6be6050c..35df2e755e 100644 > > > > > > > > --- a/include/configs/imx8mm-cl-iot-gate.h > > > > > > > > +++ b/include/configs/imx8mm-cl-iot-gate.h > > > > > > > > @@ -31,6 +31,16 @@ > > > > > > > > > > > > > > > > #endif > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define IMX8MM_CL_IOT_GATE_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x7a32a939, 0xab92, 0x467b, 0x91, 0x52, \ > > > > > > > > + 0x74, 0x77, 0x1b, 0x95, 0xe6, 0x46) > > > > > > > > + > > > > > > > > +#define IMX8MM_CL_IOT_GATE_OPTEE_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x0bf1165c, 0x1831, 0x4864, 0x94, 0x5e, \ > > > > > > > > + 0xac, 0x3d, 0x38, 0x48, 0xf4, 0x99) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > #if CONFIG_IS_ENABLED(CMD_MMC) > > > > > > > > # define BOOT_TARGET_MMC(func) \ > > > > > > > > func(MMC, mmc, 2) \ > > > > > > > > diff --git a/include/configs/imx8mp_rsb3720.h b/include/con= figs/imx8mp_rsb3720.h > > > > > > > > index ac4a7d0cb3..a5a845c2da 100644 > > > > > > > > --- a/include/configs/imx8mp_rsb3720.h > > > > > > > > +++ b/include/configs/imx8mp_rsb3720.h > > > > > > > > @@ -21,6 +21,16 @@ > > > > > > > > #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > > > > > > > > #define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_S= YS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define IMX8MP_RSB3720A1_4G_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xb1251e89, 0x384a, 0x4635, 0xa8, 0x06, \ > > > > > > > > + 0x3a, 0xa0, 0xb0, 0xe9, 0xf9, 0x65) > > > > > > > > + > > > > > > > > +#define IMX8MP_RSB3720A1_6G_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xb5fb6f08, 0xe142, 0x4db1, 0x97, 0xea, \ > > > > > > > > + 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT*/ > > > > > > > > + > > > > > > > > #ifdef CONFIG_SPL_BUILD > > > > > > > > #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8= /u-boot-spl.lds" > > > > > > > > #define CONFIG_SPL_STACK 0x960000 > > > > > > > > diff --git a/include/configs/kontron-sl-mx8mm.h b/include/c= onfigs/kontron-sl-mx8mm.h > > > > > > > > index 788ae77cd3..aff1b90010 100644 > > > > > > > > --- a/include/configs/kontron-sl-mx8mm.h > > > > > > > > +++ b/include/configs/kontron-sl-mx8mm.h > > > > > > > > @@ -38,6 +38,12 @@ > > > > > > > > #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 > > > > > > > > #endif > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define KONTRON_SL_MX8MM_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xd488e45a, 0x4929, 0x4b55, 0x8c, 0x14, \ > > > > > > > > + 0x86, 0xce, 0xa2, 0xcd, 0x66, 0x29) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > #ifndef CONFIG_SPL_BUILD > > > > > > > > #define BOOT_TARGET_DEVICES(func) \ > > > > > > > > func(MMC, mmc, 1) \ > > > > > > > > diff --git a/include/configs/kontron_pitx_imx8m.h b/include= /configs/kontron_pitx_imx8m.h > > > > > > > > index 0f96b905ab..678364e367 100644 > > > > > > > > --- a/include/configs/kontron_pitx_imx8m.h > > > > > > > > +++ b/include/configs/kontron_pitx_imx8m.h > > > > > > > > @@ -14,6 +14,12 @@ > > > > > > > > #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR > > > > > > > > #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x3= 00 > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define KONTRON_PITX_IMX8M_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xc898e959, 0x5b1f, 0x4e6d, 0x88, 0xe0, \ > > > > > > > > + 0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > #ifdef CONFIG_SPL_BUILD > > > > > > > > #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8= /u-boot-spl.lds" > > > > > > > > #define CONFIG_SPL_STACK 0x187FF0 > > > > > > > > diff --git a/include/configs/kontron_sl28.h b/include/confi= gs/kontron_sl28.h > > > > > > > > index 448749a7f8..97d0d365f6 100644 > > > > > > > > --- a/include/configs/kontron_sl28.h > > > > > > > > +++ b/include/configs/kontron_sl28.h > > > > > > > > @@ -57,6 +57,12 @@ > > > > > > > > #define CONFIG_SYS_SPL_MALLOC_START 0x80200000 > > > > > > > > #define CONFIG_SYS_MONITOR_LEN (1024 * 1024) > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define KONTRON_SL28_FIT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x86ebd44f, 0xfeb8, 0x466f, 0x8b, 0xb8, \ > > > > > > > > + 0x89, 0x06, 0x18, 0x45, 0x6d, 0x8b) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > /* environment */ > > > > > > > > /* see include/configs/ti_armv7_common.h */ > > > > > > > > #define ENV_MEM_LAYOUT_SETTINGS \ > > > > > > > > diff --git a/include/configs/qemu-arm.h b/include/configs/q= emu-arm.h > > > > > > > > index d45f606860..2f2abc746d 100644 > > > > > > > > --- a/include/configs/qemu-arm.h > > > > > > > > +++ b/include/configs/qemu-arm.h > > > > > > > > @@ -17,6 +17,16 @@ > > > > > > > > > > > > > > > > #define CONFIG_SYS_BOOTM_LEN SZ_64M > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define QEMU_ARM_UBOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xf885b085, 0x99f8, 0x45af, 0x84, 0x7d, \ > > > > > > > > + 0xd5, 0x14, 0x10, 0x7a, 0x4a, 0x2c) > > > > > > > > + > > > > > > > > +#define QEMU_ARM64_UBOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x058b7d83, 0x50d5, 0x4c47, 0xa1, 0x95, \ > > > > > > > > + 0x60, 0xd8, 0x6a, 0xd3, 0x41, 0xc4) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > /* For timer, QEMU emulates an ARMv7/ARMv8 architected tim= er */ > > > > > > > > > > > > > > > > /* Environment options */ > > > > > > > > diff --git a/include/configs/sandbox.h b/include/configs/sa= ndbox.h > > > > > > > > index 75efbf3448..d06c3de2e0 100644 > > > > > > > > --- a/include/configs/sandbox.h > > > > > > > > +++ b/include/configs/sandbox.h > > > > > > > > @@ -14,6 +14,16 @@ > > > > > > > > > > > > > > > > #define CONFIG_SYS_CBSIZE 1024 /* Console = I/O Buffer Size */ > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define SANDBOX_UBOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ > > > > > > > > + 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8) > > > > > > > > + > > > > > > > > +#define SANDBOX_UBOOT_ENV_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \ > > > > > > > > + 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > /* Size of our emulated memory */ > > > > > > > > #define SB_CONCAT(x, y) x ## y > > > > > > > > #define SB_TO_UL(s) SB_CONCAT(s, UL) > > > > > > > > diff --git a/include/configs/synquacer.h b/include/configs/= synquacer.h > > > > > > > > index 8dd092fc59..07e1f56e3d 100644 > > > > > > > > --- a/include/configs/synquacer.h > > > > > > > > +++ b/include/configs/synquacer.h > > > > > > > > @@ -51,6 +51,20 @@ > > > > > > > > "fip.bin raw 180000 78000;" = \ > > > > > > > > "optee.bin raw 500000 100000\0" > > > > > > > > > > > > > > > > +#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) > > > > > > > > +#define DEVELOPERBOX_UBOOT_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x53a92e83, 0x4ef4, 0x473a, 0x8b, 0x0d, \ > > > > > > > > + 0xb5, 0xd8, 0xc7, 0xb2, 0xd6, 0x00) > > > > > > > > + > > > > > > > > +#define DEVELOPERBOX_FIP_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0x880866e9, 0x84ba, 0x4793, 0xa9, 0x08, \ > > > > > > > > + 0x33, 0xe0, 0xb9, 0x16, 0xf3, 0x98) > > > > > > > > + > > > > > > > > +#define DEVELOPERBOX_OPTEE_IMAGE_GUID \ > > > > > > > > + EFI_GUID(0xc1b629f1, 0xce0e, 0x4894, 0x82, 0xbf, \ > > > > > > > > + 0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30) > > > > > > > > +#endif /* EFI_HAVE_CAPSULE_SUPPORT */ > > > > > > > > + > > > > > > > > /* Distro boot settings */ > > > > > > > > #ifndef CONFIG_SPL_BUILD > > > > > > > > #ifdef CONFIG_CMD_USB > > > > > > > > diff --git a/include/efi_loader.h b/include/efi_loader.h > > > > > > > > index af36639ec6..1965b5a28f 100644 > > > > > > > > --- a/include/efi_loader.h > > > > > > > > +++ b/include/efi_loader.h > > > > > > > > @@ -979,6 +979,21 @@ efi_status_t efi_capsule_authenticate(= const void *capsule, > > > > > > > > > > > > > > > > #define EFI_CAPSULE_DIR u"\\EFI\\UpdateCapsule\\" > > > > > > > > > > > > > > > > +/** > > > > > > > > + * struct efi_fw_images - List of firmware images updatabl= e through capsule > > > > > > > > + * update > > > > > > > > + * > > > > > > > > + * This structure gives information about the firmware ima= ges on the platform > > > > > > > > + * which can be updated through the capsule update mechani= sm > > > > > > > > + * > > > > > > > > + * @image_type_id: Image GUID. Same value is to be use= d in the capsule > > > > > > > > + * @fw_name: Name of the firmware image > > > > > > > > + */ > > > > > > > > +struct efi_fw_images { > > > > > > > > + efi_guid_t image_type_id; > > > > > > > > + const u16 *fw_name; > > > > > > > > +}; > > > > > > > > + > > > > > > > > /** > > > > > > > > * Install the ESRT system table. > > > > > > > > * > > > > > > > > -- > > > > > > > > 2.25.1 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > > > Masami Hiramatsu > > > > > > > > > > > > > > > > > > > > -- > > > > > Masami Hiramatsu > > > > > > > > > > > > > > > > -- > > > > Masami Hiramatsu > > > > > > > > -- > > Masami Hiramatsu --=20 Masami Hiramatsu