From patchwork Mon May 10 08:21:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 433055 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2624315jao; Mon, 10 May 2021 01:21:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6rPlIcGwVIN7zbvPx3VH1rtM1FKn25FHXlDPYLkfvDykGduHECnrrIei4lckPl5HBtbNU X-Received: by 2002:a17:906:1dd3:: with SMTP id v19mr23997672ejh.4.1620634887794; Mon, 10 May 2021 01:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620634887; cv=none; d=google.com; s=arc-20160816; b=Fv0ZopShme8f35hArSNiZOQ/2oyQlBRxOTRORLDOS0BWq6y2DfaTPjavzk/miTpUjI 7S8gTrUslk5H5iFsJxh3jfuJUMEm/nz2zFSoPTxPynr8mNAjDYQ2H3IXbk/S1BVGrlbU lAAXvRzS6eEI7mj2XsK3HH9mgtA6Q3lKiqD1h5itTcvO0SIxCB0Lb46sXDq+mRhCnfEK X1XSQhtxFojSChGgGFH9aMUGSmobGealKdEeACleCyi4PQJt0WdWa4p1ug02hPzYm860 82fy1J3dgkByXy9L8a36/6mHo7SZ/QFo5LasJKyQb0ssh7+Wj8fVLv6r8s/OZuZqjiNz N6lQ== 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=byfXOM7lL5MWF7bCohYLXw1BVXrosr743PV/4tonPyM=; b=BLh4FLoUbKdm5YHwd/w9rQhqLG33QwbYxqDy4WZJHZ47rmJvX1IfZY8XJqvkw4Yv+t BaJOQfjlfK7RlCQ5F1ZiE0Pe3ttys9INRecLox9D3tfDnu422CdPwXWPk1blT0MaxLhc qxVqN61qrT3/wkBB3kq6vLsEgqLSas826pGogvRGOL4KihR7T/0oSEhqHujjACxtuLv1 MQF3mB4oYVjvzLtPUVY+76A83Orz36TFzL7axsSXUoiVRElyfmWZM/I+plWiZQW2gL0/ Y6EtkC05Nn3RWTFuivb04Z6UJ4eg7DOusWfN/VALeNux1LUMAowiYXL+s8Fqg2QAm7uo 4/HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="yuMf0av/"; 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=pass (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 r10si13592733ejy.100.2021.05.10.01.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 01:21:27 -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; dkim=pass header.i=@linaro.org header.s=google header.b="yuMf0av/"; 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=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 57D5982EDC; Mon, 10 May 2021 10:21:26 +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="yuMf0av/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 34E8082EE4; Mon, 10 May 2021 10:21:24 +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-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (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 BDFA582ED1 for ; Mon, 10 May 2021 10:21:20 +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-pj1-x102a.google.com with SMTP id ge1so9323207pjb.2 for ; Mon, 10 May 2021 01:21:20 -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=byfXOM7lL5MWF7bCohYLXw1BVXrosr743PV/4tonPyM=; b=yuMf0av/h2QgCoiHqP7ValhU5a+b/VU/B5P0o6sSdegQwVYO9UGo/Kfxe1blTxFdix ilXQoNb6ErWKcfxGJsMC7OdMH2kwd3U5apV9c4sdK5MSuw53Hy51Et3UYvHWRPZ80bIv NDX0AQlW0L1X0XBiFDAVR7MMr2NqtXRPdk2rF6/dSL5qOwJpIfQNWU1m4oo2Oru4/RSA i+/GYn0yRZ7YZrv1nDBTke0n1yo/PMYYkhkezCw7lOE1C7L5Dwm4LCqbidlwP8JWsNc7 8X31GegactrKDdvHFlsvdnQmN85QagkdZNXf802grM/t4+vHhsmutwsqOzJ/GU56Yimi D2Ww== 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=byfXOM7lL5MWF7bCohYLXw1BVXrosr743PV/4tonPyM=; b=fVg0AymGs92/Yn1QjxrsUFvc7Alp5JE6Gq+r6pTWizRsEvhUaBLoyc7lqCfmKKa3kh r+VSmhz+jPjsJpYLo5vVxro+Z9C6TPMPMkruLZlT2go3Fu9OHc7i1HcSqVwaI0u5WcCP IQ2d/F78xlTSzlkvNf8focqkV4Z7lnkjT5ylpvD5qh9WEm22IpqP3ljPDRG0QEGRSjTS joS/L/E3M9cyRrCp9aXy/AcSgm1tzTgv5ZwXs3Ezo8e7RVT5hC10uAdZz2QPfXMNxpg4 vR58/jPDD7W50xeQ5HsOAoDMt80L9pn3+2n0oyAi/yH5FtdIH31nyss9Xj1el5Owccjx +ErQ== X-Gm-Message-State: AOAM5327iLtZIl2FSZi9l4sFWeLcXsFoGxVYtAmWjuQkDH/jECbNl999 +kKyX5CBUfDlINg3RNA6MXhKk2Cydb9xLQ== X-Received: by 2002:a17:90a:b389:: with SMTP id e9mr14407799pjr.56.1620634879277; Mon, 10 May 2021 01:21:19 -0700 (PDT) Received: from localhost.localdomain (p3dd30534.tkyea130.ap.so-net.ne.jp. [61.211.5.52]) by smtp.gmail.com with ESMTPSA id t14sm10131344pfg.168.2021.05.10.01.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 01:21:18 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de Cc: u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH] efi_loader: move asm/setjmp.h to efi_loader.h Date: Mon, 10 May 2021 17:21:03 +0900 Message-Id: <20210510082103.44159-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.102.4 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. On the other hand, a tweak will be necessary in common/main.c as some architectures have no setjmp support. Fixes: c982874e930d ("efi_loader: refactor efi_setup_loaded_image()") Signed-off-by: AKASHI Takahiro --- common/main.c | 6 ++++++ include/efi_api.h | 4 ---- include/efi_loader.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) -- 2.31.0 diff --git a/common/main.c b/common/main.c index ae5bcdb32f8b..a41c57c26611 100644 --- a/common/main.c +++ b/common/main.c @@ -16,7 +16,13 @@ #include #include #include +#ifdef CONFIG_EFI_LOADER +/* + * Unfortunately, efi_loader requires setjmp.h, but there are + * some architectures which have no support for setjmp. + */ #include +#endif static void run_preboot_environment_command(void) { 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 de1a496a9726..6994a951bc19 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -15,6 +15,7 @@ #include #include #include +#include struct blk_desc;