From patchwork Fri Apr 15 10:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1617749 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=SMk1VwXo; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KftZg5Mj8z9s3q for ; Fri, 15 Apr 2022 20:57:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA8F082A53; Fri, 15 Apr 2022 12:57:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="SMk1VwXo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F04C682A36; Fri, 15 Apr 2022 12:57:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C64F282A36 for ; Fri, 15 Apr 2022 12:57:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1650020228; bh=3dBYTDyxX/HXgEL5AJw1LI2lIlUAHN5CTg2V0vyBoLI=; h=X-UI-Sender-Class:Date:To:Cc:From:Subject; b=SMk1VwXonxNpCrvY+51IjhHkgdK+FQsKIX6AaD+eN/vvwsTo7c/b9anUkLJCVS6Ad ZylAd1lUb0Gufkkk4tLPznyePga2gYWzTG07H5fnLc4o+g0PJ1oAVm1nqelWwsEGDL HnouJ/gZ8+m/tW2bD9+ecWv65KJjVfIydAQYwQYI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.67] ([88.152.144.107]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M1HZo-1ndeg53cMs-002nlU; Fri, 15 Apr 2022 12:57:07 +0200 Message-ID: Date: Fri, 15 Apr 2022 12:56:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Content-Language: en-US To: Tom Rini Cc: U-Boot Mailing List , Patrick Delaunay , Sughosh Ganu From: Heinrich Schuchardt Subject: Pull request for efi-2022-07-rc1-2 X-Provags-ID: V03:K1:Y1GZb27RXqGsAAU/7JYQs15vHWYYno+EwUgttSpHuj+6pjPKI7+ NvfC/Toq/Es6zL3Vzi243B77ee5JwWuq1KQTnP9HSFoxHPsu1p6cr2AnL0TlfL5qbOyqNIY KNPZx5WDL+uFprlcMCAkeWpyoJ5dSGuV3DUvDvn9DRxHcYYnJMtp3q+YRqo3SG3TJurmp55 Y0osIfoQi8pu+kTX4jK6Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:RicICbBvjSw=:GXtWmzhn8nRkfYZrOkzxZW qMyn3+kxvuqOb/3XQ42ujGkIDIm+mW9HNiCNx5ttGIo8ZfL2LWE2xxpV3zeIZKaRPXVxGRaho 1WsB2zlqAJlLRu6JFVO2MFB7WAGzLNy9wjiP7ryIDOODGm0tH05bmN9DIgnhq+ukQj57iFTWY 6Y3NAp3LEAEjAln4/rN8N6dPzdSoskiCWn5BKBjD/E8RVyvBVFppC9euqzPe+P5oCRW5aVMXw 16qYvlpFsAsk+rr0l3h1RKT8qgrgFQ2eT1f4M2abQBFzqmPiZ4UVUZy3YSVMmDawFYTHAgHcZ 58xq5ugFpDmEU/xVzyOc/LnMfS/MMPw6KNy+3IwmBStSzHADO5Qv4g+T1lMBrieTKxSy37iSw ICcc0lfiGgME9iM4IgBwe3iBsHEwJeCCCMeKuEgzKr2+42D34KCAMNw60pUJBA/99yRyPgWhD OZVw6NeNcTJqhj0952/rWTBx94Wj8gLLcD7AlFlvFGutzj1NNRvbkbp2u7C1KSc6CJ1v2LS6z vcjg21VnoTysGBdW1i1mtB3MkcJHtCrgpeFTG4Qqo/Hoza/mqNIJRPcApWxpTOn9HlcB+2nYQ zBlGcD9xW8ITrTz2vXw0U5+ViJbRseJLgTy+tQjWwRVk0nu35q96BOvSiuSonP8rovcJp44Nl 4hpcaWMoSAG1pxMTBLIWaDe+/D7uOCNBXAsfVX4WPbIfnJPbTcwaXzxgTldEhsWEdONkEQHsW xT0lCceXAPMyovoHxEdzStxuVs4V/abpLCHvkU1Oq7H4Cef3hFqse2faj++k5DlXrSEvOEPqC syw/NM0S9PZAmRclmhpPNX9U4Uj9uiS/LdSplkfU5s593HbB6V/hu7NKGAzEN0ySZZiAbrt3a QS8aHY0KY47aLbfP0X2Mzgpijiuh+xdhG27bAHAbK3Cs7iJqoZGA2wFAXNDjpuMxLq3HnZ7F0 jNMMUrfncoluVF5r2fp/RHb2w7L3GYYqhhld9t5hvhUcyGDp8TCzovo5N23zoBkktlBlbbQWS 4zoTNKAT7xZ2817Hg03NxzLpXLvuNlxtXx3BUyND2jbOWBXeoS28TvOVkrkpTkliyggv4LyvD OLFd1EQRIhzP2k= 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 Dear Tom, The following changes since commit 42a2d90cf51acea56bf19006ed5688c93c099ff0: configs: Resync with savedefconfig (2022-04-13 09:14:57 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-07-rc1-2 for you to fetch changes up to 8bf5f9af3b4bafbcb2f515cecc1b71c466aff0fa: efi_loader: simplify efi_serialize_load_option() (2022-04-15 11:26:21 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/11742 ---------------------------------------------------------------- Pull request for efi-2022-07-rc1-2 Documentation: * Describe env command UEFI * simplify Unicode string functions * clean up the usage of GUIDs for capsule updates ---------------------------------------------------------------- Heinrich Schuchardt (4): lib: convert u16_strlen() into a macro lib: simplify u16_strdup() efi_loader: EFI_HII_STRING_PROTOCOL.GetString() efi_loader: simplify efi_serialize_load_option() Patrick Delaunay (1): doc: man-page for the env command Sughosh Ganu (8): capsule: board: Add information needed for capsule updates capsule: FMP: Populate the image descriptor array from platform data capsule: Put a check for image index before the update efi: Define set_dfu_alt_info() for boards with UEFI capsule update enabled test: capsule: Modify the capsule tests to use GUID values for sandbox FMP: Remove GUIDs for FIT and raw images mkeficapsule: Remove raw and FIT GUID types doc: uefi: Update the capsule update related documentation .../advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 29 ++ .../imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 28 ++ board/emulation/common/qemu_dfu.c | 3 +- board/emulation/qemu-arm/qemu-arm.c | 28 ++ board/kontron/pitx_imx8m/pitx_imx8m.c | 21 +- board/kontron/sl-mx8mm/sl-mx8mm.c | 20 ++ board/kontron/sl28/sl28.c | 21 ++ board/sandbox/sandbox.c | 34 ++ board/socionext/developerbox/developerbox.c | 33 ++ board/xilinx/common/board.c | 28 ++ board/xilinx/zynq/board.c | 3 +- board/xilinx/zynqmp/zynqmp.c | 3 +- configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 5 + doc/develop/uefi/uefi.rst | 100 +++++- doc/mkeficapsule.1 | 12 - doc/usage/cmd/askenv.rst | 2 + doc/usage/cmd/env.rst | 381 +++++++++++++++++++++ doc/usage/cmdline.rst | 2 +- doc/usage/environment.rst | 2 + doc/usage/index.rst | 1 + include/charset.h | 26 +- include/configs/imx8mm-cl-iot-gate.h | 9 + include/configs/imx8mp_rsb3720.h | 9 + include/configs/kontron-sl-mx8mm.h | 5 + include/configs/kontron_pitx_imx8m.h | 5 + include/configs/kontron_sl28.h | 5 + include/configs/qemu-arm.h | 9 + include/configs/sandbox.h | 13 + include/configs/synquacer.h | 13 + include/configs/xilinx_versal.h | 5 + include/configs/xilinx_zynqmp.h | 9 + include/configs/zynq-common.h | 9 + include/efi_api.h | 8 - include/efi_loader.h | 36 ++ lib/charset.c | 14 +- lib/efi_loader/Kconfig | 2 + lib/efi_loader/efi_capsule.c | 8 +- lib/efi_loader/efi_firmware.c | 107 ++---- lib/efi_loader/efi_hii.c | 2 +- lib/efi_loader/efi_load_options.c | 2 +- test/py/tests/test_efi_capsule/conftest.py | 21 +- .../test_efi_capsule/test_capsule_firmware_fit.py | 191 +++++++++++ ...le_firmware.py => test_capsule_firmware_raw.py} | 167 ++++----- tools/eficapsule.h | 8 - tools/mkeficapsule.c | 26 +- 47 files changed, 1188 insertions(+), 279 deletions(-) create mode 100644 doc/usage/cmd/env.rst create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py rename test/py/tests/test_efi_capsule/{test_capsule_firmware.py => test_capsule_firmware_raw.py} (75%)