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 047B1C636CC for ; Sun, 5 Feb 2023 23:01:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B43E785AD5; Sun, 5 Feb 2023 23:55:34 +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="kku4F/fh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0DC7E85AA4; Sun, 5 Feb 2023 23:53:49 +0100 (CET) Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (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 2DCE285AB9 for ; Sun, 5 Feb 2023 23:42:54 +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-x132.google.com with SMTP id n2so658944ili.11 for ; Sun, 05 Feb 2023 14:42:54 -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=+u9k+domE4xULAHMWPup5OKnKFlv1G0AMeqye7pnp6Q=; b=kku4F/fh0iJXyBcVvl/wRqA2l6tYlyj/HPbRDRD60uTrunydbGz+38b9UDzAuXEtqW MRgldwTD7HCRmwY3DvGBFY0njS2Qg+NcU95YK28wlbTxnI5BZFZdyjiRe60706GLaF1J sbGkGvpx2pASS6ESPIIMNFw0mMyUHYLfyqMoM= 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=+u9k+domE4xULAHMWPup5OKnKFlv1G0AMeqye7pnp6Q=; b=VlEBLWVmLfReXm3GMsc/m4dCg1eobmW6SDoghYd9/D5yphV6gdG7MHw0hre14DQWjx AvsP2JkEUjq73bQ9FTS4vUacf4wTIOfgh/iGf7Po73rlo5m3W6L8o5m7s9xdgUh9Jj4X WjFJ51wg4M8psj50Psj4HRueVoiW3pz4y7CuaCgb17cdnia+htFI98i/F7SmZVMzsVfw u+drbGB/I1rfwY7yG7KkjwDOb3Syq8JjiRHcayMsYGmYc4pD4xUiybjSKq8bLMB0pEb8 l199xqRfzlTi2WzOBRfAVFLwbxI+bTmv6iSSgrco09uH8xBYJRgAcgcJAUysbfgv4VB3 aWVQ== X-Gm-Message-State: AO0yUKWTp3cWF/uNPbhZ+RjcL3xQNtMWvemIUNMMWUIU66G0e3Y4jGdS 0J0arpAuMmj9vRJCQHpBX+RoI43hYdPdsMqa X-Google-Smtp-Source: AK7set9AawA/BK50QX5hbuo731Zc7fbwklzzcKUBfEQu22HelcrY+G7vxuI21Ncp5i3gucTBsH4y9Q== X-Received: by 2002:a05:6e02:1c8e:b0:310:fb90:b62d with SMTP id w14-20020a056e021c8e00b00310fb90b62dmr15532079ill.11.1675636973587; Sun, 05 Feb 2023 14:42:53 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Chia-Wei Wang Subject: [PATCH v2 098/169] Correct SPL uses of HW_WATCHDOG Date: Sun, 5 Feb 2023 15:40:07 -0700 Message-Id: <20230205224118.233425-99-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-sjg@chromium.org> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_HW_WATCHDOG defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Chia-Wei Wang --- (no changes since v1) drivers/crypto/aspeed/aspeed_hace.c | 2 +- drivers/crypto/hash/hash_sw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/aspeed/aspeed_hace.c b/drivers/crypto/aspeed/aspeed_hace.c index a1b0b9f564b..6b6c8fa6588 100644 --- a/drivers/crypto/aspeed/aspeed_hace.c +++ b/drivers/crypto/aspeed/aspeed_hace.c @@ -288,7 +288,7 @@ static int aspeed_hace_digest_wd(struct udevice *dev, enum HASH_ALGO algo, if (rc) return rc; - if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { + if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { cur = ibuf; end = ibuf + ilen; diff --git a/drivers/crypto/hash/hash_sw.c b/drivers/crypto/hash/hash_sw.c index 553c068010c..d8065d68ea4 100644 --- a/drivers/crypto/hash/hash_sw.c +++ b/drivers/crypto/hash/hash_sw.c @@ -244,7 +244,7 @@ static int sw_hash_digest_wd(struct udevice *dev, enum HASH_ALGO algo, if (rc) return rc; - if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { + if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { cur = ibuf; end = ibuf + ilen; -- 2.39.1.519.gcb327c4b5f-goog