From patchwork Mon Jan 30 15:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734232 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=mUljk6GT; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5C403vwQz23hS for ; Tue, 31 Jan 2023 02:37:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDA8585A8B; Mon, 30 Jan 2023 16:26:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="mUljk6GT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7223859BF; Mon, 30 Jan 2023 16:20:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 42254859D7 for ; Mon, 30 Jan 2023 16:19:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id u8so5210464ilq.13 for ; Mon, 30 Jan 2023 07:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GiMMmKZYNOUMTAlNWHmcxw6SG0wl5GjtE7kOZQfa1uY=; b=mUljk6GT4X8mltB6qK1P0MDx4o83xlMTzmUdrZCn3WpbQkf8b+8SKXYYekpLO9Uxvy cbgr/fPK7gJCzAkrdKSZttKQPpwQF+8+QIg1sqQvqiKrqracLm2SEusxNvNji72+uhjZ 7OITyNHlS0jYcVC06Hysk9TaJKYUQSwuR1O9I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GiMMmKZYNOUMTAlNWHmcxw6SG0wl5GjtE7kOZQfa1uY=; b=2SuguPIMQlWWQPAklMrg1XX3IaA6oGab16Bjt8yVWXQD16HzV1lyUr5rlnrkLNwMZW H+2TJpeO+hIxWvM/H6uCv+2wUM593QUDPzfNTlropL/UDsUScBK68OsQDXr73JjlK7+6 TeSj+mzVRHK6jn6V/NjMR2ePr4rtMDnUMfOGAfLqjgJo6vWEURaRGVQo+o+/KSD2Lvpi BCtnoG43lmz0drBMeo39aH0RhBsC8TWWLZY8uQUhOirIO99JREcys7Gj4VJxg1zm2Jvj ZKMbglnlsS+Nn6aT+hup1go61r0Zxb0Ww0TRh9pgUH03vaa/GHjUjy4Wab5qVaydxQ3T N5pQ== X-Gm-Message-State: AO0yUKXoAMfbwm1ARp8yK2NTiSo76vCgcxLaw0/LCwJvXu5T1zrtLvaS kxL2EzUjhOF4dRQKg+K9vClFjzF1HxhWRpx1 X-Google-Smtp-Source: AK7set+6A9lPQhbn1DdliP1fJYgx1152b0mPdWLATPzSUSRvF+mS/MC90FlKB8ulyrhfN0wSwm/WGQ== X-Received: by 2002:a05:6e02:1564:b0:310:c255:45ed with SMTP id k4-20020a056e02156400b00310c25545edmr10892836ilu.24.1675091897312; Mon, 30 Jan 2023 07:18:17 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michael Walle Subject: [PATCH 169/171] Correct SPL use of WATCHDOG_AUTOSTART Date: Mon, 30 Jan 2023 08:16:10 -0700 Message-Id: <20230130151612.212732-170-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_WATCHDOG_AUTOSTART defined in Kconfig Signed-off-by: Simon Glass --- board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index e78a0d5dd3c..89948e087f1 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -157,7 +157,7 @@ int fsl_board_late_init(void) * If the watchdog isn't enabled at reset (which is a configuration * option) disabling it doesn't hurt either. */ - if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) + if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) stop_recovery_watchdog(); return 0;