Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D25DAC432BE for ; Mon, 30 Aug 2021 22:03:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A9ADE60ED6 for ; Mon, 30 Aug 2021 22:03:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A9ADE60ED6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C53EF833C0; Tue, 31 Aug 2021 00:03:20 +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=1630361001; bh=LIUCxOopt9AoxqMDpDgTb2NTXjKdfLxPcge712NNKJQ=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Y56aw7KhUwmEofZqXwqiUT+LL+1N09WqmSACPmg3/KRdY7BjZAs6ssf2EfFvYh8Nd pyaA7WGYZnQEWfP0AUPCwu1HPd7dkJNdcy3rgSdsR3MCl861jifg7s2kXagDcxWFIN xGUVwmdcldr//D+lDTV6OFTOvhQxSDUT2aAya2sD6/nZvfTmU9j43qOocw5hY/Quxy j1fkqLYj7DslKt0xFTU85NNkoCotBDSJEak9c09T+BpIK/nSEUn4Y4oSMKPFjOTB1I mS/okImchRK4strXDQMe5tuCxp+Jg9vaWjO71RghJvMKtaL20MD1U/82a+VVaxZikI TAzGBYhi6R6Jg== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 01D48833B9; Tue, 31 Aug 2021 00:03:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1630360998; bh=LIUCxOopt9AoxqMDpDgTb2NTXjKdfLxPcge712NNKJQ=; h=From:To:Cc:Subject:Date:From; b=Nf8acjNHP7sLyapS67o1lMfF1MHmXei2jFqDdtg5+JPveB+hsUDWx0QAHXWPhQggW +vIAib4EDgh546dgOUVbkISSne1vSCYJN94YqWBq47pLbZYlaeSH+NVlPnyfWH+Uc1 W/ZVP5wDVPD/ID2qssU4eCOmlAuG3hN2O03JlxGpHWjvPzHAiF2eKMrwcAXBARt9Zn Ank4YCuGoTsIfmj/WVu9IpuUXt9TkxxEaFhRvvlQGk2k2lI/lVJX7jYh9jTVLIyQn7 9cqYWObfxCgSrNji1KR8sVwsEcRKnoBBg8vKnafN4fRl7+cie5YnZafzDMJUDgywlZ GIIUaZIuy6owA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Pali Rohar , Stefan Roese Subject: [PATCH] watchdog: Fix watchdog enablement in SPL and TPL Date: Tue, 31 Aug 2021 00:03:05 +0200 Message-Id: <20210830220305.92512-1-marex@denx.de> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Commit 830d29ac372 ("watchdog: Allow to use CONFIG_WDT without starting watchdog") completely broke WDT operation in both SPL and TPL, in either case those WDTs are never enabled. Fix it by filling in the missing Kconfig options for SPL and TPL. Fixes: 830d29ac372 ("watchdog: Allow to use CONFIG_WDT without starting watchdog") Signed-off-by: Marek Vasut Cc: Pali Rohar Cc: Stefan Roese --- drivers/watchdog/Kconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f0ff2612a6b..65d974c4dd5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -273,4 +273,24 @@ config SPL_WDT Enable driver model for watchdog timer in SPL. This is similar to CONFIG_WDT in U-Boot. +config SPL_WATCHDOG_AUTOSTART + bool "Automatically start watchdog timer in SPL" + depends on SPL && WDT + default y + help + Automatically start watchdog timer and start servicing it during + SPL phase. Enabled by default. Disable this option if you want + to compile U-Boot with CONFIG_WDT support but do not want to + activate watchdog, like when CONFIG_WDT option is disabled. + +config TPL_WATCHDOG_AUTOSTART + bool "Automatically start watchdog timer in TPL" + depends on TPL && WDT + default y + help + Automatically start watchdog timer and start servicing it during + TPL phase. Enabled by default. Disable this option if you want + to compile U-Boot with CONFIG_WDT support but do not want to + activate watchdog, like when CONFIG_WDT option is disabled. + endmenu -- 2.33.0