From patchwork Tue Jul 20 05:57:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 481488 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4813102jao; Mon, 19 Jul 2021 22:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzZ0lqvRQjenxNNj0VOgTjY48KcGGP8rKsl4uNI7BD5vFJFP9hmqRMJjI5ASqELKc3J1sP X-Received: by 2002:a50:9554:: with SMTP id v20mr38087243eda.179.1626760667659; Mon, 19 Jul 2021 22:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626760667; cv=none; d=google.com; s=arc-20160816; b=p9sKBVOR8zLpGXgy7hg4WzpXOp8EOLxFRJvptpeGLYMu1645kjkMOZZ41flPeb2b63 Wu/I339AG8WsrgOvg6IORSUWn2FAD/dlNN9z0PzSa3z301jNMsJZwWREfJOE27Pvzkt2 JXbuOOYyOw35orrG7TtovPlb6jbptwpI9hPqIoaLE3lHMqGMP8L9nEYi/t+VppPJAvdl FFcEJeoljXiLS0DFL7Dn3VnG9/ZN/htfQ4s+wavPs4li4HahvtXNcR0Zv9krcEK3IJ0s R8bqFx+0+AWeUhXx+RB4vsngCjrGTo6079WH6P2gC6f8c5d0clNj1aS15Ld7GZDu5cEi ECUQ== 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:dkim-signature; bh=tbYYI58DvnYSuHnmzC1U5yFAnppjEomSy25XFTqeK/I=; b=Q6wp9pg3hbhMXGTu+5lDXf7XLPoi7q1R4nW6jNvO1PSV0ShJY1UxZD8gPLcjTJNlwC T1Pf8iefVgbS2xnu4aCch+8TLpPRu1d1eyIkyPQEYoJq37Ydt+hFzSChXfshGHzfMs+G 0BSA6wV064gXf2lsnSCFx5bXkE0Rt659jKAYPGigPPk6aht6qmmSn9uINwCmKvOHp4gc 5CeeTMpl6BhLk7ZA5w9B6Rtcp4frdssgVUCbVtgj9L8LDLBOPE3RoR0gSja55vaWuLgg CjjwYujpbEZJfp5kXjpgfnJk7Iz8kR3zM6wjU1/7mwOeqpc2mkMo/a3v0ymADhd5GnNO 4G5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tohXyQYu; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id w15si23547428edv.312.2021.07.19.22.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 22:57:47 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tohXyQYu; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (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 14DE581BEF; Tue, 20 Jul 2021 07:57:44 +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="tohXyQYu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 91D9080EC5; Tue, 20 Jul 2021 07:57:42 +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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (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 98A3080EC5 for ; Tue, 20 Jul 2021 07:57:39 +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=takahiro.akashi@linaro.org Received: by mail-pg1-x52e.google.com with SMTP id r21so3356366pgv.13 for ; Mon, 19 Jul 2021 22:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tbYYI58DvnYSuHnmzC1U5yFAnppjEomSy25XFTqeK/I=; b=tohXyQYuk5PXl7/C8/GDh7BBKFj6PBEGhz2bCgPA/P8gM/nlFoE81Alk0MKkSQuiRg Y6LKxHr4TL4R1GOW4HuZwnyyg8+/XQfcpLzKAIyhCdT6mkBWKi4x+mpDClZuBiA8Chbm 0IyyowqQOZWDIKOslfEZNIpfm5uLHKsQF2B7Ai2lv7m4Kb2LYFPjbT5fk93lNukf2CSB kpLbVgwOoPxjeCX0ER18/CCFRBgurr8bIKhsBugnVmRx+ZC2ZpClGIadUa9cqRPgLsos zb7aFwjQlxOSmoJT5Vp+H+y91q9ZNXu8iOm7HCu4w2Z+P6G4EQjjmCQ0D9pp3tGenkbU dUDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tbYYI58DvnYSuHnmzC1U5yFAnppjEomSy25XFTqeK/I=; b=Tzr4OAGyAh9mF8ccGCZRnH7Klr80grrTiRJck61feIp9QK38/UFEFFzX0za6wDUc+9 ZpZofnwwUEcL8f+QXLmZ4Ej3Wl2fQ19eTdYQb7umYmyshL2yyF6q8cOt63uzSzIIl1ix jk7qvhLq+8VzyqkMIPNlV50mZRrO0JzO0Pec+lsidqfXnDCyGkr0QkN7ej1gD8sgs03n JHGoY3vmw+TjamZR2eHwvLENgWHMiNg9xRQFWnx8g1lcBC+GapxxsJ73b5MPxkMUi9uN +WWBA67oacIq7WNVFNVyFVLQkTPHWd5u/4V5fkTTh4edpdZIY2xOFEEwn3TV90gkTu9d BPEw== X-Gm-Message-State: AOAM531vbsSBSSmj30kKEQSobPNFnusChDWt8rKY803LE2t9T5o1fFi8 fC0ZhcbSNTkWaEIVtS2Ormez6w== X-Received: by 2002:a05:6a00:170b:b029:32a:3950:f51b with SMTP id h11-20020a056a00170bb029032a3950f51bmr29847063pfc.64.1626760657949; Mon, 19 Jul 2021 22:57:37 -0700 (PDT) Received: from localhost.localdomain (p784a236a.tkyea130.ap.so-net.ne.jp. [120.74.35.106]) by smtp.gmail.com with ESMTPSA id n14sm1406250pjv.34.2021.07.19.22.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 22:57:37 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de Cc: u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v2] efi_loader: remove asm/setjmp.h from efi_api.h Date: Tue, 20 Jul 2021 14:57:02 +0900 Message-Id: <20210720055702.103758-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean In the commit c982874e930d ("efi_loader: refactor efi_setup_loaded_image()"), setjmp-related definitions were moved to efi_loaded_image_obj in efi_loader.h. So setjmp.h is no longer refererenced in efi_api.h. This also fixes some error when efi_api.h will be included in mkeficapsule.c. Fixes: c982874e930d ("efi_loader: refactor efi_setup_loaded_image()") Signed-off-by: AKASHI Takahiro --- v2: move asm/setjmp.h from efi_loader.h to efi_boottime.c --- include/efi_api.h | 4 ---- include/efi_loader.h | 1 + lib/efi_loader/efi_boottime.c | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) -- 2.31.0 diff --git a/include/efi_api.h b/include/efi_api.h index 18a1adf02390..e854a8b3a112 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -20,10 +20,6 @@ #include #include -#ifdef CONFIG_EFI_LOADER -#include -#endif - /* UEFI spec version 2.8 */ #define EFI_SPECIFICATION_VERSION (2 << 16 | 80) diff --git a/include/efi_loader.h b/include/efi_loader.h index b81180cfda8b..e6d41cfb359f 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -17,6 +17,7 @@ #include struct blk_desc; +struct jmp_buf_data; static inline int guidcmp(const void *g1, const void *g2) { diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index f6d5ba05e34a..0b98e9181373 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -20,6 +20,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR;