From patchwork Thu Jun 9 12:30:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosh Ganu X-Patchwork-Id: 580310 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp735972max; Thu, 9 Jun 2022 05:34:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziaZSFp7IMSBm+m/+bG0BYBuqbbOizQ2MQQutEpm+Rd7RNc2FE2mDmtcYJdV3uPpqWfOTG X-Received: by 2002:a05:6e02:1c44:b0:2d7:6bc3:9960 with SMTP id d4-20020a056e021c4400b002d76bc39960mr1154347ilg.194.1654778065730; Thu, 09 Jun 2022 05:34:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654778065; cv=none; d=google.com; s=arc-20160816; b=HoHmaM9+izPDgFArXzBnE/srATiWLeRMrLJKwUquCTNcyuZT2aAaOkLE4gJiL6cHA+ rZcrEL2Prf8yZ3TYiguGKI6OTVAHca2mJmdz7CWZ/KccebndnY9U1hghmsjM93uXBxO4 7JxeUhsPOeERIo02QK9yg2sS3PVlo0u1rZALD6VZFNm5G+9i9G+rsMEezNtO2N7dDWmz HkA7cIIA/WL5v61GQVlTD/AtwxuwMNo5K3BEKnN6Vvvmuyw6yTK+Wym+AwvFRiCdMpP2 JdjYnEfL0FyZmMTZMf1YGNRbIl2XsultzfYFFXE7S93DHEaOm+sccKmRQ5Sv/WKwfABk T+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=24AA4R9DMLZVJIFppEz7w4qN9xa9Xyl1oVbwvsH89X8=; b=AmkjVmtGEStnxQsdObHQMGkYcwnLVWnDkpPoNw+lD2SLHUaJps1x8j4lam9/WYDDYv 9DToMZMwdmSMh6L6tU/JuidY4TUN01R2AJQeMhCKrwkV63KY3pdpYSo/IcytChZZ70Xf G+1NlZGGIirLNszhR5F0P8pUPlDlP2VwVJAO8NQFWpS9XXUrx2ZsFuFDwdRbAPMp63f7 QUobHc574kA96dcAzOoap/iZE8MKobOMo0kshaxthUQqVBK48y6H8rsk/lwTC8sMoiFY sjff5w2Djn0KCfGpD3Y77CluQDT/3CwXSErzqvUedKiXsbEHaTbr6pgjsIEVyr5qCY1u aPZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id h30-20020a022b1e000000b00330b9d5991bsi21106771jaa.99.2022.06.09.05.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 05:34:25 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E97B84413; Thu, 9 Jun 2022 14:32:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id E7F1B84426; Thu, 9 Jun 2022 14:32:23 +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.2 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_SOFTFAIL,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id 61D62843FC for ; Thu, 9 Jun 2022 14:32:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sughosh.ganu@linaro.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EAABE152B; Thu, 9 Jun 2022 05:31:59 -0700 (PDT) Received: from a076522.blr.arm.com (a076522.blr.arm.com [10.162.16.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 633D03F766; Thu, 9 Jun 2022 05:31:55 -0700 (PDT) From: Sughosh Ganu To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Takahiro Akashi , Patrick Delaunay , Patrice Chotard , Simon Glass , Bin Meng , Tom Rini , Etienne Carriere , Michal Simek , Jassi Brar , Sughosh Ganu Subject: [PATCH v5 18/23] developerbox: synquacer: Use FIP as the updatable image Date: Thu, 9 Jun 2022 18:00:05 +0530 Message-Id: <20220609123010.1017463-19-sughosh.ganu@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220609123010.1017463-1-sughosh.ganu@linaro.org> References: <20220609123010.1017463-1-sughosh.ganu@linaro.org> MIME-Version: 1.0 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 From: Jassi Brar The Synquacer board is migrating to using the FIP as the only updatable image on the platform with the u-boot and op-tee images packaged as part of the FIP image. Make changes to the structures used for capsule updates to reflect this change. Signed-off-by: Jassi Brar Signed-off-by: Sughosh Ganu --- board/socionext/developerbox/developerbox.c | 17 +++-------------- include/configs/synquacer.h | 13 ++----------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c index f5a5fe0121..b946428ddb 100644 --- a/board/socionext/developerbox/developerbox.c +++ b/board/socionext/developerbox/developerbox.c @@ -20,27 +20,16 @@ #if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { - { - .image_type_id = DEVELOPERBOX_UBOOT_IMAGE_GUID, - .fw_name = u"DEVELOPERBOX-UBOOT", - .image_index = 1, - }, { .image_type_id = DEVELOPERBOX_FIP_IMAGE_GUID, .fw_name = u"DEVELOPERBOX-FIP", - .image_index = 2, - }, - { - .image_type_id = DEVELOPERBOX_OPTEE_IMAGE_GUID, - .fw_name = u"DEVELOPERBOX-OPTEE", - .image_index = 3, + .image_index = 1, }, }; struct efi_capsule_update_info update_info = { - .dfu_string = "mtd nor1=u-boot.bin raw 200000 100000;" - "fip.bin raw 180000 78000;" - "optee.bin raw 500000 100000", + .dfu_string = "mtd nor1=bank0 raw 600000 400000;" + "bank1 raw a00000 400000;", .images = fw_images, }; diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 572f0a42ac..eafcc69e12 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -50,18 +50,9 @@ "mtd nor1=fip.bin raw 600000 400000\0" /* GUIDs for capsule updatable firmware images */ -#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) - + EFI_GUID(0x7d6dc310, 0x52ca, 0x43b8, 0xb7, 0xb9, \ + 0xf9, 0xd6, 0xc5, 0x01, 0xd1, 0x08) /* Distro boot settings */ #ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_USB