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 8F685C433FE for ; Sun, 20 Nov 2022 14:30:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1160C85533; Sun, 20 Nov 2022 15:19:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="uaAPCQC9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EB01854D9; Sun, 20 Nov 2022 15:18:24 +0100 (CET) Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (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 869F48549D for ; Sun, 20 Nov 2022 15:18:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82f.google.com with SMTP id cg5so5918099qtb.12 for ; Sun, 20 Nov 2022 06:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hL9uYUMdnESGn4BkXQquK8D9h3shuyiY2BhE39DL0NI=; b=uaAPCQC9NMUK88ZgIMv++cAx6/RJUAjhZknkJLljuxu/G14Ac+RXMu+sNbMtGNZBAP VUPMdiLQ0KFIfEYTFrBKCBxYSQ7lDViEtAiHBsUEloGjrnDx00PaEn7QV9FrzeXuA3rJ 87l2j4DD0rQKmh057bkPdPjOC5xVLPwMrXGKU= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hL9uYUMdnESGn4BkXQquK8D9h3shuyiY2BhE39DL0NI=; b=M8cve5dTAOkf9t6RGo3SYa7AvU0qFkc8SEfa9Q7MsIaqHipAen5yRM23GZOpP3R6UJ ByvPqjnSwnNehII7x0HmmSrTDaikcL6oi5K1hEXOtK3lmJ3o/YmX166QefOGAXHheSD7 TC/9U0sWTvCfs7Q69IP5hzAo8LudB8IZsamPIoUxrwbruLTzDkvkUGPI2iyyI+kte3rI bDlRe59CxXvtfDipcpfBNKI8ZZZp6gabq9layJ/f/W8HSNW10ahdG6MUtb7PTbrPEmDr 4i7dKrCO7OJKFv7yc+qmp9B2rCXeJOBBqiggtmj5hDauWZK9M2CerBI2HrM+LB1We+3t vUJg== X-Gm-Message-State: ANoB5plQbMqZYCfse8CTY/nLynsf0o/OnYx8UwpMKzmSNUJT6CFgW3Ve yHgPl8nNH4rNLf7nBr9L+0vOg56m6lykSw== X-Google-Smtp-Source: AA0mqf6sPgHGxE3p+QyVGHtHheGIzj5XamP3vzIEjb0yha+wJELC1kBZsV/JpCHH1yFNHokU787/UQ== X-Received: by 2002:ac8:1084:0:b0:3a5:2a3d:a953 with SMTP id a4-20020ac81084000000b003a52a3da953mr14374726qtj.231.1668953887680; Sun, 20 Nov 2022 06:18:07 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.18.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:07 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 236/241] global: Migrate CONFIG_WATCHDOG_RC to CFG Date: Sun, 20 Nov 2022 09:17:38 -0500 Message-Id: <20221120141743.3059310-37-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-1-trini@konsulko.com> 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 Signed-off-by: Tom Rini --- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- include/configs/kmcent2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 68c3b1f98b8c..e8a3e82765fc 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -357,7 +357,7 @@ void init_85xx_watchdog(void) { mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WATCHDOG_MASK) | - TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC)); + TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CFG_WATCHDOG_RC)); } void diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 191ef7bb2870..8e76924e8f0d 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -378,7 +378,7 @@ int get_scl(void); * Hardware Watchdog */ #define CFG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) ~10min */ -#define CONFIG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */ +#define CFG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */ /* * For booting Linux, the board info and command line data diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 29c5ad21d3ef..c0bfa41ab9d8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -251,7 +251,7 @@ CFG_VERY_BIG_RAM CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE CFG_WATCHDOG_PRESC -CONFIG_WATCHDOG_RC +CFG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT CONFIG_X86EMU_RAW_IO CONFIG_X86_MRC_ADDR -- 2.25.1