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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A1AEC636CC for ; Wed, 15 Feb 2023 12:23:27 +0000 (UTC) Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) by mx.groups.io with SMTP id smtpd.web10.13652.1676463803914533348 for ; Wed, 15 Feb 2023 04:23:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kKB1S+dR; spf=pass (domain: gmail.com, ip: 209.85.217.46, mailfrom: quaresma.jose@gmail.com) Received: by mail-vs1-f46.google.com with SMTP id g8so19659703vso.3 for ; Wed, 15 Feb 2023 04:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=UuvqxEFAZh1do/rykYaY7dgQIyBI8OgrAzyieATHvSk=; b=kKB1S+dRz1FMRB0gFMgFSpBIDhuqEhSfSi0ZuzpgTDprD8hdPaAR/ngdI17LwZCIPn MjMGczsG2/eLPaDGgQgPV523dHTslGr6CeNHmYgKb8W3BDtkk3FWL02IeRWtYiLOizHd vlRzS/zYcC3ZPrcboqAPknDYsrGYj+45+BP57l20aDdaDmJ71+tGPMAX/3b/ITbYE1RM cV47Jf+KGU9wyJaRnKnE7Or96t1ue/opOUqkRPbjG8sK0gR3grB0fLrJeBhJKNmQOzpv MIeDzX9MtdxYY8OQos9GTmdP1+r8+3yC71anuTaJf65+9zRSmqw6PzEsds1jeVmmmKt5 nm2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UuvqxEFAZh1do/rykYaY7dgQIyBI8OgrAzyieATHvSk=; b=ZAhlD04RCugWPF+GqhN0eWqN1ajFguyfHBAwcYcdA7GtXAA06lsILqAF//BM2o9+bz pA/qAR7p1QROyZnSWME6higwW1r3uDrRwi15jN4w24OyZY5K/u+jDh59X4ohgi2J8nzg hj1A4t0R68NAAQtRCHmZXjzR9TqSkJAJzYtjLHjuTWTPfBX2T/Pz7Z/VpUt/lyXg4qKi TwLwSaLpErkvNArUP8qaaUyKh7kiTMtKkEo97LPb/xVPrHR/CJUaDz7GFVi4NDIWllnI mqPOexQBcKMxUmIA+tS2Q3eocGU2aqBrgWmGsv5JiA28QexUmBdSbOMWiFbBYjuFfIdo F7Mw== X-Gm-Message-State: AO0yUKVbz0Wit1EHlH/FPelq7gaMrDpe7/kRoMlOEg/CkwiYSy+fFfLD VEWwOPK3+I5l4NiQZ3hZPHBJK7lcyO9auWGNFg0= X-Google-Smtp-Source: AK7set+61UDHNfaVyDjnb9KE3uGXt8IcOZiRwX5gaKEZM9CRklW+JKS47VqqJRoIXgxHGwe74NZv9cRtpTnOopn1OCQ= X-Received: by 2002:a05:6102:11f7:b0:3f0:be66:8037 with SMTP id e23-20020a05610211f700b003f0be668037mr374687vsg.80.1676463802866; Wed, 15 Feb 2023 04:23:22 -0800 (PST) MIME-Version: 1.0 References: <20230215104236.24484-1-gowtham.sureshkumar@arm.com> <20230215104236.24484-3-gowtham.sureshkumar@arm.com> In-Reply-To: <20230215104236.24484-3-gowtham.sureshkumar@arm.com> From: Jose Quaresma Date: Wed, 15 Feb 2023 12:23:11 +0000 Message-ID: Subject: Re: [meta-arm] [PATCH 2/2] arm-bsp/uefi_capsule: Use json file to pass capsule config To: Gowtham Suresh Kumar Cc: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com, nd@arm.com Content-Type: multipart/alternative; boundary="00000000000072e41e05f4bc2543" List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 15 Feb 2023 12:23:27 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4392 --00000000000072e41e05f4bc2543 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Gowtham, Gowtham Suresh Kumar escreveu no dia quarta, 15/02/2023 =C3=A0(s) 10:42: > From: Gowtham Suresh Kumar > > This patch uses the json config file for UEFI capsule generation > as this is efficient and easily scalable to generate multiple > capsules. > > Signed-off-by: Gowtham Suresh Kumar > --- > .../recipes-bsp/images/corstone1000-image.bb | 8 +++--- > ...rstone1000-image-capsule-update-image.json | 11 ++++++++ > meta-arm/classes/uefi_capsule.bbclass | 27 ++++++++++++------- > 3 files changed, 32 insertions(+), 14 deletions(-) > create mode 100644 > meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update-i= mage.json > > diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb > b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb > index b0a71bca..ce4df8a6 100644 > --- a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb > +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb > @@ -13,11 +13,9 @@ PACKAGE_INSTALL =3D "" > > IMAGE_FSTYPES +=3D "wic wic.nopt uefi_capsule" > > -UEFI_FIRMWARE_BINARY =3D "corstone1000-image-${MACHINE}.wic.nopt" > -UEFI_FIRMWARE_VERSION =3D "5" > -UEFI_FIRMWARE_LSV =3D "0" > -UEFI_FIRMWARE_GUID =3D "e2bb9c06-70e9-4b14-97a3-5a7913176e3f" > -UEFI_FIRMWARE_UPDATE_INDEX =3D "0" > +UEFI_FIRMWARE_BINARY =3D "${PN}-${MACHINE}.wic.nopt" > +UEFI_CAPSULE_CONFIG =3D "${THISDIR}/files/${PN}-capsule-update-image.jso= n" > +CAPSULE_IMGTYPE =3D "wic.nopt" > Looks like this variable is not used anywhere. Jose > > do_sign_images() { > # Sign TF-A BL2 > diff --git > a/meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update= -image.json > b/meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update= -image.json > new file mode 100644 > index 00000000..0f011ff7 > --- /dev/null > +++ > b/meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update= -image.json > @@ -0,0 +1,11 @@ > +{ > + "Payloads": [ > + { > + "FwVersion": "5", > + "Guid": "e2bb9c06-70e9-4b14-97a3-5a7913176e3f", > + "LowestSupportedVersion": "1", > + "Payload": "$UEFI_FIRMWARE_BINARY", > + "UpdateImageIndex": "0" > + } > + ] > +} > diff --git a/meta-arm/classes/uefi_capsule.bbclass > b/meta-arm/classes/uefi_capsule.bbclass > index 0c3d3845..cf708412 100644 > --- a/meta-arm/classes/uefi_capsule.bbclass > +++ b/meta-arm/classes/uefi_capsule.bbclass > @@ -1,6 +1,7 @@ > # This class generates UEFI capsules > # The current class supports generating a capsule with single firmware > binary > > +DEPENDS +=3D "gettext-native" > inherit python3native > > IMAGE_TYPES +=3D "uefi_capsule" > @@ -19,14 +20,11 @@ CAPSULE_EXTENSION ?=3D "uefi.capsule" > > # The following variables must be set to be able to generate a capsule > update > UEFI_FIRMWARE_BINARY ?=3D "" > -UEFI_FIRMWARE_VERSION ?=3D "" > -UEFI_FIRMWARE_LSV ?=3D "" > -UEFI_FIRMWARE_GUID ?=3D "" > -UEFI_FIRMWARE_UPDATE_INDEX ?=3D "" > +UEFI_CAPSULE_CONFIG ?=3D "" > > # Check if the required variables are set > python() { > - for var in ["UEFI_FIRMWARE_BINARY", "UEFI_FIRMWARE_VERSION", > "UEFI_FIRMWARE_LSV", "UEFI_FIRMWARE_GUID", "UEFI_FIRMWARE_UPDATE_INDEX"]: > + for var in ["UEFI_FIRMWARE_BINARY", "UEFI_CAPSULE_CONFIG"]: > if not d.getVar(var): > raise bb.parse.SkipRecipe(f"{var} not set") > } > @@ -36,10 +34,21 @@ IMAGE_CMD:uefi_capsule(){ > # Force the GenerateCapsule script to use python3 > export PYTHON_COMMAND=3D${PYTHON} > > - > ${STAGING_DIR_NATIVE}/usr/bin/edk2-BaseTools/BinWrappers/PosixLike/Genera= teCapsule > -e -o \ > - ${CAPSULE_IMGLOCATION}/${UEFI_FIRMWARE_BINARY}.${CAPSULE_EXTENSION} > --fw-version ${UEFI_FIRMWARE_VERSION} \ > - --lsv ${UEFI_FIRMWARE_LSV} --guid ${UEFI_FIRMWARE_GUID} --verbose > --update-image-index \ > - ${UEFI_FIRMWARE_UPDATE_INDEX} --verbose > ${CAPSULE_IMGLOCATION}/${UEFI_FIRMWARE_BINARY} > + # Copy the firmware and the capsule config json to current directory > + if [ -e ${CAPSULE_IMGLOCATION}/${UEFI_FIRMWARE_BINARY} ]; then > + cp ${CAPSULE_IMGLOCATION}/${UEFI_FIRMWARE_BINARY} . ; > + fi > + > + export UEFI_FIRMWARE_BINARY=3D${UEFI_FIRMWARE_BINARY} > + envsubst < ${UEFI_CAPSULE_CONFIG} > > ./${MACHINE}-capsule-update-image.json > + > + > ${STAGING_DIR_NATIVE}/usr/bin/edk2-BaseTools/BinWrappers/PosixLike/Genera= teCapsule > \ > + -e -o ${UEFI_FIRMWARE_BINARY}.${CAPSULE_EXTENSION} -j \ > + ${MACHINE}-capsule-update-image.json > + > + # Remove the firmware to avoid contamination of IMGDEPLOYDIR > + rm ${UEFI_FIRMWARE_BINARY} > + > } > > # The firmware binary should be created before generating the capsule > -- > 2.17.1 > > > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- > Links: You receive all messages sent to this group. > View/Reply Online (#4391): > https://lists.yoctoproject.org/g/meta-arm/message/4391 > Mute This Topic: https://lists.yoctoproject.org/mt/96980035/5052612 > Group Owner: meta-arm+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ > quaresma.jose@gmail.com] > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- > > --=20 Best regards, Jos=C3=A9 Quaresma --00000000000072e41e05f4bc2543 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Gowtham,

Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com> escreveu = no dia quarta, 15/02/2023 =C3=A0(s) 10:42:
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com= >

This patch uses the json config file for UEFI capsule generation
as this is efficient and easily scalable to generate multiple
capsules.

Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
---
=C2=A0.../recipes-bsp/images/corstone1000-image.bb=C2=A0 |=C2=A0 8= +++---
=C2=A0...rstone1000-image-capsule-update-image.json | 11 ++++++++
=C2=A0meta-arm/classes/uefi_capsule.bbclass=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 27 ++++++++++++-------
=C2=A03 files changed, 32 insertions(+), 14 deletions(-)
=C2=A0create mode 100644 meta-arm-bsp/recipes-bsp/images/files/corstone1000= -image-capsule-update-image.json

diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb b= /meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
index b0a71bca..ce4df8a6 100644
--- a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
+++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
@@ -13,11 +13,9 @@ PACKAGE_INSTALL =3D ""

=C2=A0IMAGE_FSTYPES +=3D "wic wic.nopt uefi_capsule"

-UEFI_FIRMWARE_BINARY =3D "corstone1000-image-${MACHINE}.wic.nopt"= ;
-UEFI_FIRMWARE_VERSION =3D "5"
-UEFI_FIRMWARE_LSV =3D "0"
-UEFI_FIRMWARE_GUID =3D "e2bb9c06-70e9-4b14-97a3-5a7913176e3f" -UEFI_FIRMWARE_UPDATE_INDEX =3D "0"
+UEFI_FIRMWARE_BINARY =3D "${PN}-${MACHINE}.wic.nopt"
+UEFI_CAPSULE_CONFIG =3D "${THISDIR}/files/${PN}-capsule-update-image.= json"
+CAPSULE_IMGTYPE =3D "wic.nopt"

Looks like this variable is not used anywhere.

= Jose
=C2=A0
https://lists.yocto= project.org/g/meta-arm/message/4391
Mute This Topic: https://lists.yoctoproject.org/mt= /96980035/5052612
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ar= m/unsub [q= uaresma.jose@gmail.com]
-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-



--
Best regards,

Jos=C3=A9= Quaresma
--00000000000072e41e05f4bc2543--