From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B5CBC433EF for ; Fri, 29 Apr 2022 06:24:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E9BB083A79; Fri, 29 Apr 2022 08:24:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1651213449; bh=n9u4OEW0/4/fSh0LMgAw2bSCdvGBWimvscko1SPlopM=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=c1a36sJXik+eSfMl/gW312YPN4TJiV3m4uliqzXLyeVpMbBsFBdeSBDQqrOCjk3RM 77ZCGz73l8LR/qGnXQsZunIZfTUaTYqMM6x4AjKAr/znAwW6SM+YAobevw494vcJ9F 6omTCRpdA4fRRm+XAhDyZ/d9LxhRF+TpK5+DfVX5JxHGsvO3fM7tYy3q5p2AYJXDnW pSNEqRO1CKY4FRhmV2tZS3MeRj2EI36ZtZlgJa3cwMD2IBTqD2qdBDYnYqHh9x/QBy frl6COfAp+Ok/sJYMONtms662iDx1tvFm9AqD9BSmItfn40qxa956NWRApUafbMVor o1LSb1j9a3boA== Received: by phobos.denx.de (Postfix, from userid 109) id C62D583ED8; Fri, 29 Apr 2022 08:24:06 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [91.198.250.252]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 26F0A839D7 for ; Fri, 29 Apr 2022 08:24:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (unknown [91.198.250.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4KqMrg0SGwz9sQk; Fri, 29 Apr 2022 08:24:03 +0200 (CEST) Message-ID: Date: Fri, 29 Apr 2022 08:23:58 +0200 MIME-Version: 1.0 Subject: Re: [PATCH] watchdog: Fix SPL build with watchdog disabled in asm files Content-Language: en-US To: =?UTF-8?Q?Pali_Roh=c3=a1r?= Cc: u-boot@lists.denx.de References: <20220428113309.10039-1-pali@kernel.org> From: Stefan Roese In-Reply-To: <20220428113309.10039-1-pali@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On 4/28/22 13:33, Pali Rohár wrote: > Allow to compile assembler files in SPL build which calls WATCHDOG_RESET > function when watchdog is disabled in SPL and enabled in U-Boot proper. > > This issue was fixed in past by commit 7fbd42f5afc4 ("watchdog: Handle SPL > build with watchdog disabled") for C source files, but not for assembler > source files. > > Currently the only assembler source file which calls WATCHDOG_RESET is > arch/powerpc/lib/ticks.S, so this patch affects and fixes powerpc SPL > builds. > > Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese Thanks, Stefan > --- > include/watchdog.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/include/watchdog.h b/include/watchdog.h > index 14fa5fda259e..813cc8f2a5d3 100644 > --- a/include/watchdog.h > +++ b/include/watchdog.h > @@ -49,7 +49,13 @@ int init_func_watchdog_reset(void); > */ > #if defined(CONFIG_WATCHDOG) > #if defined(__ASSEMBLY__) > - #define WATCHDOG_RESET bl watchdog_reset > + /* Don't require the watchdog to be enabled in SPL */ > + #if defined(CONFIG_SPL_BUILD) && \ > + !defined(CONFIG_SPL_WATCHDOG) > + #define WATCHDOG_RESET /*XXX DO_NOT_DEL_THIS_COMMENT*/ > + #else > + #define WATCHDOG_RESET bl watchdog_reset > + #endif > #else > /* Don't require the watchdog to be enabled in SPL */ > #if defined(CONFIG_SPL_BUILD) && \ Viele Grüße, Stefan Roese -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de