From patchwork Tue Jul 13 15:04:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1504687 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; 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=QCXBJU80; 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 4GPP872Lqvz9sX3 for ; Wed, 14 Jul 2021 01:05:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FCBF82DC5; Tue, 13 Jul 2021 17:05:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (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="QCXBJU80"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9BB7282DC5; Tue, 13 Jul 2021 17:05:03 +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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (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 7D10482DB2 for ; Tue, 13 Jul 2021 17:04:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wm1-x32a.google.com with SMTP id g12so6039696wme.2 for ; Tue, 13 Jul 2021 08:04:57 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=R05hClpjsIbteXSD8eTqDxqH4BbClQqVBSCMYwlycXA=; b=QCXBJU80GCy48PMG4zBmuqDEjq9XU3lwA7QoWIpaIwoIzjXvrzRJPCpMtjc+MxmBOW LtJlotOqcdRRpUYHphUvl4cnzGjZNT9KcQrahQ0oZPKuGB5jy9OVjYnjNSYkZ6XvvRVl 1eToCseMu2pu+ki71Nwb2Po6hM6aCctWVXrwsX6av2RJSO6bAzSdfJj3Hs6MRU6+6wc+ TLS5EefgdLuwl5DNhHVvj8C+IaYz3V3DJEOtPIrPhAPNfrhjI6yCb5jzf9x1teny3KKA cuNIn7yXMkJYzW5LAK7a/U4Z/jug4cynYQY077ux57C7t8ndT55SafdMgQwWRB4uteMC jLjg== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=R05hClpjsIbteXSD8eTqDxqH4BbClQqVBSCMYwlycXA=; b=tZkCIl74+Fw6H7Z2m3LUX0QrQMzRH6TAC5H2jSM12c8Wy8IsfzXRjNM66DsY9t9gcc R9TfDD+4aOibghsuYmypfGHuFAzHSlKTwXcL1cX2ypSXhcuLQ9QtYnV8MSM8TWZDOxyR kRHeaflwwcyS1MAeR39NJxA+FjDAGo5GO07vU1CuHcnzogVStxtnt/nG86QpfGkPksOr XK61jIwTm9mSjs02aM/3xoKStvOjOXQ4jZiyLJ6tkrvtAR3ZRwd/1ywC3p66bdCGeVFK R63V4q6Bx0ZqPxnzhbnQPfTagRQ38rAM9HMTM6PSG5dTLs+wGACVPIGMuhCO/jupcV2h AtTQ== X-Gm-Message-State: AOAM533KJeGWjBChg11iCZuNKHjC9QJnibK0nAQwlndWMNbQ2279WX4a k3e+NaQmI/SoqmNHvR6Qw/CIBgOk6qeQ1ff4 X-Google-Smtp-Source: ABdhPJxTdGkn2v92HOJWH4OynRFQg+7uQ5KENFaQBBtJ0fi6mKWyVqhmD805+DqemxiAqi5DXqDwmQ== X-Received: by 2002:a1c:f613:: with SMTP id w19mr42229wmc.136.1626188696818; Tue, 13 Jul 2021 08:04:56 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::648]) by smtp.gmail.com with ESMTPSA id g3sm18531458wrv.64.2021.07.13.08.04.56 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jul 2021 08:04:56 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Subject: [PATCH 2/3] arm64: zynqmp: Do not define do_reset() if sysreset is enabled Date: Tue, 13 Jul 2021 17:04:48 +0200 Message-Id: <959e614a79ae4e0bf0c04aa0b8a19799fab2f002.1626188686.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 The SPL can also be compiled with sysreset drivers just fine, so update the condition to cater for that option. The same change was done by commit efa1a62ad2dd ("ARM: imx8m: Do not define do_reset() if sysreset is enabled"). Signed-off-by: Michal Simek --- board/xilinx/zynqmp/zynqmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 18d5c515def1..38c910fa5bab 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -499,9 +499,11 @@ int dram_init(void) } #endif +#if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { } +#endif static u8 __maybe_unused zynqmp_get_bootmode(void) {