From patchwork Thu Sep 10 11:02:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1361502 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=cLPsTgU1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BnGDh61gqz9sSJ for ; Thu, 10 Sep 2020 21:02:12 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 966F681F67; Thu, 10 Sep 2020 13:02:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="cLPsTgU1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A246082286; Thu, 10 Sep 2020 13:02:08 +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,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 1B10181260 for ; Thu, 10 Sep 2020 13:02:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wm1-x344.google.com with SMTP id a9so5374742wmm.2 for ; Thu, 10 Sep 2020 04:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=cCaNctTujRq7B35YY0Y85KltkXoKOejHRWkIG64CUWg=; b=cLPsTgU13ik30zbR7F6nik8zM6Ms/PAgBUmXmzcxh+cWOA9m+11+x3ESf2v4nF1R0c Z8FSJNkdjB9ba+Wc+a5SilDiG3fDmk1aCYSprLcnhFF/80mjd+T5XcynFFZLs9KO+22G JcfSGa+ip7Bo0mXBBe/yDAr1fbkez+Hsv/jiBMy6okZb2S9YobNFuT66O8X+5SO9HJrk 2AOO1EMq2O+54ST5xOoEPn0DSNA1xNZ7zlMAELaDLKTtDUrXmMjUf31Q317pDi1jvBWN q07cy5HH2nKRqRu6AVCVRP7UAD17FDfhkzaulf6d+8ijoe7L+QnTu3bQwk8HC+EydsVT 5+pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=cCaNctTujRq7B35YY0Y85KltkXoKOejHRWkIG64CUWg=; b=R6CYxt4qGmKrq/nq7T+y3wan1wgggisJ14suEFY8QzHmMofcMm9i2wOTUujvn1v+ZN XN1+k30OlBGNPxHshY1SKjP9SHZ9/JOoQ1FeaC8r2zK3nHczXk470ZnYQLxG+GlaSnlm saxpgX39U+L61p2CPYCm+LeRU7FRglAWZgOJTej4ZHrDU7bk4TS050TkQzJrGcIaxGLK I9ra6zQW+/IwCPKTu/bKTBcnAoJ559Pt2/1TfJ8K7sqPiGCZa1N+NctpPYxTFb/a2dZ2 8IJWU6ZJyQBNjGife7f9YdUtLFvmHNGOU6I13y4vGpLwb/as/ENn1AI7E7DlMWrF+rnQ qKkQ== X-Gm-Message-State: AOAM5318sW1zt6ZVI42BiH68u+xlLYqD50EoWyMSlwx2VkSZjUIqiIeh l7M2Hh5Y8S2GpJb1odoQLn6lYV6Ys4k+Ww== X-Google-Smtp-Source: ABdhPJzayxasSSeo+51dJ5ffQEVijXxkHfkQ74Hh+pdscid1OXJ0yOfoG8kfoDXmsyw6CY275PDZvg== X-Received: by 2002:a7b:c318:: with SMTP id k24mr8123899wmj.150.1599735725452; Thu, 10 Sep 2020 04:02:05 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id m185sm3199384wmf.5.2020.09.10.04.02.04 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Sep 2020 04:02:04 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Subject: [PATCH] fpga: zynqmp: Protect zynqmp_loads() for SPL Date: Thu, 10 Sep 2020 13:02:03 +0200 Message-Id: <7de1e3cdae59310a734193dbe3ecafbb6a1beb52.1599735722.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.28.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.3 at phobos.denx.de X-Virus-Status: Clean if conditions should match. Fixes: a18d09ea384f ("fpga: zynqmp: Add secure bitstream loading for ZynqMP") Signed-off-by: Michal Simek --- drivers/fpga/zynqmppl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index 03878d32ec1c..8ce140a2e1ab 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -305,7 +305,7 @@ static int zynqmp_pcap_info(xilinx_desc *desc) struct xilinx_fpga_op zynqmp_op = { .load = zynqmp_load, -#if defined CONFIG_CMD_FPGA_LOAD_SECURE +#if defined(CONFIG_CMD_FPGA_LOAD_SECURE) && !defined(CONFIG_SPL_BUILD) .loads = zynqmp_loads, #endif .info = zynqmp_pcap_info,