From patchwork Thu Nov 10 17:04:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosh Ganu X-Patchwork-Id: 623338 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp249063pvb; Thu, 10 Nov 2022 09:04:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf4vEoxZCg3ls4dNCW4d+zevx8DdLy6t7LuF32BmZEhB/yhbWXIkHRjuFL9ivqL352MfzqNq X-Received: by 2002:a05:6402:2988:b0:467:205b:723d with SMTP id eq8-20020a056402298800b00467205b723dmr1088611edb.69.1668099894812; Thu, 10 Nov 2022 09:04:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668099894; cv=none; d=google.com; s=arc-20160816; b=Xm9q8rgXwhkeBTU4oYT2JAinq+VPiFKS4ZrOd6rtoCaOtVINXoTjylaCZsCPRg84Hb ex9/OljcWAdrIBvLmoLv/b2+WY/a5YrpblOd08iStGQN3Zc/F+swkoe24JAASyFPwF4l MEyciq0u3AgYr1w2lj896gPg13gqbFmsnxlIu4IWEW0qYCbPMBL6X3Wsj+eT6BMOJBy0 95ZQHKctfXfNye4v4nzBWH+Yf9x+JP+CLqArWt8bYS1Hp1LsLUYWTlETulL5MUTZ7WFI PHlyyL0ioY5dv/DlWdl3ZaXhKsBjI32iQEuyUesmqGB8U/l6UKqUJLuc5cW/3/2AQ870 YmaA== 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:message-id:date:subject:cc:to:from; bh=k2QYIgM/BoqOPvjuuRh75mhsZI4XFj8z3/hhBy/UV1Y=; b=zA3wRtLF11iPpJ29zpSHIWLxw2pTp380tjjabupZD/tkJ+ApmOCXpkF3bFsBRbQXYJ fVTruJVNttnyiCuCfjy2p60Vme8pKKlJxJhrJJ/Tx1ATmZOsdgb+a+OUUTMP5KsnEZ6z M7OQ7jLTGwtbbDC4du1VQAqBNUJh2G5fdiU1hVBbQ3A5Urwi3sxN+b3MGGMgelE/CJr7 az56CZwQ6Q7wUVKDM8iLApSsfZ1MjDp+l37aYraUK4UFumFIf05bwb1gYigneKRGayGv OMPCeUXK3/+FCBrtM9jwA5Q8bLRPU/Udgz/7X1Z308h2SLRwUt0E++8eo8WoGTjBIAuI cNmA== 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 l8-20020a170906794800b007ae8b1704d0si5753075ejo.68.2022.11.10.09.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 09:04:54 -0800 (PST) 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 208D884DEB; Thu, 10 Nov 2022 18:04:52 +0100 (CET) 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 E1A9084E45; Thu, 10 Nov 2022 18:04:49 +0100 (CET) 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 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 6211A84D70 for ; Thu, 10 Nov 2022 18:04:47 +0100 (CET) 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 DC9D91FB; Thu, 10 Nov 2022 09:04:52 -0800 (PST) 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 7B9473F534; Thu, 10 Nov 2022 09:04:45 -0800 (PST) From: Sughosh Ganu To: u-boot@lists.denx.de Cc: Simon Glass , Sughosh Ganu Subject: [PATCH] sandbox: Move the capsule GUID declarations to board file Date: Thu, 10 Nov 2022 22:34:30 +0530 Message-Id: <20221110170430.4013635-1-sughosh.ganu@linaro.org> X-Mailer: git-send-email 2.34.1 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.6 at phobos.denx.de X-Virus-Status: Clean The sandbox config file is to be removed. Move the GUID declarations needed for capsule update functionality to the board file where they are used. Signed-off-by: Sughosh Ganu Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- board/sandbox/sandbox.c | 13 +++++++++++++ include/configs/sandbox.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 4d89f9be1c..4c655dfd49 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -30,6 +30,19 @@ gd_t *gd; #if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +/* GUIDs for capsule updatable firmware images */ +#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) + +#define SANDBOX_FIT_IMAGE_GUID \ + EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \ + 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37) + struct efi_fw_image fw_images[] = { #if defined(CONFIG_EFI_CAPSULE_FIRMWARE_RAW) { diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5168e2fa35..0dcb2ebc31 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -10,19 +10,6 @@ #define CONFIG_MALLOC_F_ADDR 0x0010000 -/* GUIDs for capsule updatable firmware images */ -#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) - -#define SANDBOX_FIT_IMAGE_GUID \ - EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \ - 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37) - /* Size of our emulated memory */ #define SB_CONCAT(x, y) x ## y #define SB_TO_UL(s) SB_CONCAT(s, UL)