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 CC3C5C433EF for ; Tue, 7 Jun 2022 08:44:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A0A93842E0; Tue, 7 Jun 2022 10:44:32 +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=1654591472; bh=N5nhkHzQQCBd6XxuXEK2uDvopBWzUm+ZM30/AxYppM4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MtK8+ro9rqy85Vo+1b/OKAZC8z/8Hg87JfRqtBElDhmzrPMwlepDBITSFE2rh4WV2 6ocYk7wJ27smoKopmizRKc204Xx3HHS5Ri2SIZxxD6HMrZ57eHBH2gniAFNDTnO4zG O9yR2XI9zNsgm6hNukJr+cfLpqS4PAyyMWH9UjGBAJka92kQWNwl/+y/5V0oVDyAwB cz1MTYwBWSzc/wLT5cMXd20PM0QDSZp57ryTqcvAcCAmyWUU2quj3oTChu0Qo9Qsgw I1YykVJzvlAbYbNIlfLwZmBbyoZnF7MHv4xR1csfjMJe2IMYvcPx3RdOOSF3Md7L/6 JnNSauNz3rHbQ== Received: by phobos.denx.de (Postfix, from userid 109) id A8469842FD; Tue, 7 Jun 2022 10:44:30 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:101:465::107]) (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 39A99842A6 for ; Tue, 7 Jun 2022 10:44:28 +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 smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (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 4LHP6f2nKkz9sRX; Tue, 7 Jun 2022 10:44:26 +0200 (CEST) Message-ID: <5d1d1992-a8b6-22a8-1be9-47d66c25cf35@denx.de> Date: Tue, 7 Jun 2022 10:44:25 +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> <20220604130645.33sxq6fcwwy5u6zs@pali> From: Stefan Roese In-Reply-To: <20220604130645.33sxq6fcwwy5u6zs@pali> 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 04.06.22 15:06, Pali Rohár wrote: > PING? > > On Thursday 28 April 2022 13:33:09 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 Applied to u-boot-watchdog/master 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) && \ >> -- >> 2.20.1 >> 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