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 C27BDC54EAA for ; Mon, 30 Jan 2023 15:24:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 181DB859E7; Mon, 30 Jan 2023 16:20: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=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="Jh/jprg8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A0FD85637; Mon, 30 Jan 2023 16:04:33 +0100 (CET) Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (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 9FF5E844AE for ; Mon, 30 Jan 2023 16:00:48 +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-x129.google.com with SMTP id l15so1370953ilj.5 for ; Mon, 30 Jan 2023 07:00:28 -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=EiVh9ZnlFjBh8nesB7Sv7gLp0yZAqbKUoIiqYoq52gQ=; b=Jh/jprg8G5uVVReqwHqHoFaCQcC0yofF2Rl7Fl5tvXuzFo78EmzIPXMKDo9haIGAMr yNiMVtJhhQD8m1mMgXon1cUlx1aeYoAmT6/tQYSZkGOtIGlhVNLep1juU1K9Iu6zg3pB Y3ju5zQ7DEqXCRFqL8Szi0pSAVKM3MkiginrY= 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=EiVh9ZnlFjBh8nesB7Sv7gLp0yZAqbKUoIiqYoq52gQ=; b=aOdfzsnwc8Odch+hkTJgxqUaL4keJ/9J68GCaffcXXJSNFCb5DV8JvM8Th5fL765SQ oWo+5RQf1Hzga166mKBcMUhDhBPy4sF12WFFP4a7G4mlW26wiA5/EpwWXdRSzrbxerEj tAGeD+bAkH0aEU/nT6bu5/cenLWKhYJSEXJgjRN53Zo3K4acY/ECGZbiKP81GxJY+Q28 hA5psY3/Z9HkVco1a2jD3BTtSNCUiia0oMJaAjtMVDyG9twThBRTAWh8OgrxsHzyanib QmSKA5ossozECcEnX0H/D9a0lBX2Qk3EfYYd2M5vE2Lkk89oyiHLVYXFSMSYkzRtnhKh 1aYw== X-Gm-Message-State: AO0yUKXgTqoNZWoeiQpkWL6VRx/g3v6vQnECV3UM+LowSiT3q1beJcvG 0LNVximlXU5aMvsNP+OjJ5GsNukNLQxZEN1y X-Google-Smtp-Source: AK7set/C0UAWcuPLOGNgiL7ZCZlUvew2ldgK0JMwVXA7hUeRD83C8ipEbskvNFK+DAhy8xkGoFsWTQ== X-Received: by 2002:a05:6e02:b29:b0:30f:8a2d:87c7 with SMTP id e9-20020a056e020b2900b0030f8a2d87c7mr18986743ilu.2.1675090727688; Mon, 30 Jan 2023 06:58:47 -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 g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Aspeed BMC SW team , Chia-Wei Wang , Joel Stanley , Ryan Chen , Stefan Roese Subject: [PATCH 100/171] Correct SPL uses of HW_WATCHDOG Date: Mon, 30 Jan 2023 07:42:13 -0700 Message-Id: <20230130144324.206208-101-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-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 --- 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.456.gfc5497dd1b-goog