From patchwork Tue Jul 13 15:04:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1504686 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=iSS5h+Pl; 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 4GPP7x6XtDz9sXL for ; Wed, 14 Jul 2021 01:05:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E88D982DC0; Tue, 13 Jul 2021 17:05:12 +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="iSS5h+Pl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14ED082DD2; Tue, 13 Jul 2021 17:05:00 +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 18BDE82D95 for ; Tue, 13 Jul 2021 17:04:56 +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 g8-20020a1c9d080000b02901f13dd1672aso1840885wme.0 for ; Tue, 13 Jul 2021 08:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BZ4x1xUsoK3LwHzSkb1/FzHR2RYNIoN5546VKlj2yIk=; b=iSS5h+Plsb4Bf/wVekCm4Mq+6+rWovuvpxLY/XKPbs6D8ZeneBvp7r/UBwvJ2at2EU p8kZCrS6iuEOFrZJGuABqYZpWldZFliZmw+U8j/K0zgLASN+roPtoPMU7p6t3Cj1Gy0y lbMQLJf/NTSTAaP/swEHkWTloCh7K3z8PAhyFa/fW8poeZOyU8RqlbBokd04Z3Utb0nc 4LP3g2ziUIvXTaatNX35rZB6Lq6/9q2NVZSvgpL9hslQo8y0TR3Dbt7fPcTsPrLknCsX lNbnzNFy/FpPRKryGTjWjZMTaZtmYkwHM1z9FI56w2TXxdz/nvfinF+24YApDwfiixiR LL7w== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BZ4x1xUsoK3LwHzSkb1/FzHR2RYNIoN5546VKlj2yIk=; b=VUBNTryi09CEwFt5d8s4bT9sFr/fCtH8uS65BNhdoNWAQiUEUmMmbU8+k/aUyNJrMl Sxzp+y5cRaiOx3k+ONM1uTxv+U1vps4J1o/xf8aK3recrT3SnxeVz4kXN8Qsw6x+bn0j 9xWBS32gixhBIqwIaqLsR/34F/yy61sq/cDuNK7tHl0jjiPdX7mzKcgBMzshc4RvSgFf HnfWVYct+NPJSfB/SOQ4AqRPOGf/o8uhn5igBiSxdkZcTWgdwlU9YpRMdHncAA65hPkS NqCXRSS+8zkXCfmPdsSU1ZFetX0/ulkI8S/UDBQdcXciuopC4qf4KFrBuLiS+AAro6NH CiNw== X-Gm-Message-State: AOAM530itMXrqSHumzPGfhpu70ZHYXwGJqgsSfMzwU69sPXeyugij9sU RHfHhxxXA7WkrAVJkQlDuVq84B6pZuGHFrrY X-Google-Smtp-Source: ABdhPJx3C17ziPKxc43CkaW4VOdigpN1nAo14Q5Zwh+qa60RHvXhEn1OsZc8oJKTYaom6yObKt0v7Q== X-Received: by 2002:a05:600c:2187:: with SMTP id e7mr494241wme.161.1626188695150; Tue, 13 Jul 2021 08:04:55 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::648]) by smtp.gmail.com with ESMTPSA id s13sm14291058wrm.13.2021.07.13.08.04.54 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jul 2021 08:04:54 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Bin Meng , Igor Opaniuk , =?utf-8?q?Marek_Beh=C3=BAn?= , Patrick Delaunay , Yann Gautier Subject: [PATCH 1/3] psci: Do not define do_poweroff() if CONFIG_SYSRESET_CMD_POWEROFF is enabled Date: Tue, 13 Jul 2021 17:04:47 +0200 Message-Id: <16a96efe0e8194507bfe6b6ef391aeab6f10e786.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 CONFIG_SYSRESET_CMD_POWEROFF defines do_poweroff() in sysreset-uclass.c that's why don't define it twice when both CONFIG_SYSRESET_CMD_POWEROFF and CONFIG_CMD_POWEROFF are enabled. CONFIG_SYSRESET_CMD_POWEROFF depends on CONFIG_CMD_POWEROFF. Signed-off-by: Michal Simek --- drivers/firmware/psci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 89cb7d88e5b3..657e7eb5aea3 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -210,7 +210,7 @@ void psci_sys_poweroff(void) invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); } -#ifdef CONFIG_CMD_POWEROFF +#if IS_ENABLED(CONFIG_CMD_POWEROFF) && !IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { do_psci_probe();