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 3B44BC433FE for ; Sun, 20 Nov 2022 14:28:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 969F0854FF; Sun, 20 Nov 2022 15:18:53 +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="ly+P8w0B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2DAF0854E6; Sun, 20 Nov 2022 15:18:20 +0100 (CET) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 9202E854C1 for ; Sun, 20 Nov 2022 15:18:07 +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-qk1-x72a.google.com with SMTP id k2so6526377qkk.7 for ; Sun, 20 Nov 2022 06:18:07 -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=4Av7c1OX5S+sswEqVbSS7ZjoUcRF2iPdX/D8pgzkRVg=; b=ly+P8w0Bl9QO6FFsHrJ76jbPSd2pij2JQ4QzyzS9JfDKjaZ2K1YRmlrTRZevlk3o0+ f8/EG0q+3f+brYtSkQgUNfU4PI705bUUAsZlLw3GPltYCr486XMB01uqKyDaZqnZDxJx Bvx14zxyuUE5J1vaixj58FGWrMu/m8URBVH2s= 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=4Av7c1OX5S+sswEqVbSS7ZjoUcRF2iPdX/D8pgzkRVg=; b=XwGOsrxnSVOFhNJQENc00MiC9an7o9x71O1ny6kRpImAGKSLmo5G8DwN5H7/YuZrJu 2hTNwm+IUcwOfwxMfOeT+Jlnj+CKtrfQB2z4LD85GgNfQsgv7Zh+cfSCFUY0Il9bnGF3 fTTzMpVaQfuMEswJl/oRcGuPgYJ6s15ztkbfcImgJxpX9x4npvo3IWl5P14+Bz7JOKTv Gk7eaSzZ28VKBphZNlAziNp2sZlyjlZSRGRu2vzolHVrEG2qWfPIrosbhZnHHunb1TFT BV8IFpPSsl2c01qTZK9se41fbQb0CMI6YXsZCSWF+2NhvPCpp7Q2utNDNLePtz1eE3lp f+pw== X-Gm-Message-State: ANoB5pnL7uHDi4IBiy/3t86pyaZLdbRlgbrOCJl9fhQ41CiUP+XwuahK 7aYO+DZpFUgNK64NhILRHXeXG1lIgzMzFQ== X-Google-Smtp-Source: AA0mqf45ZbKhgd1tg74wi17/bEKc69NKMInSX7kWdCo2jYfOJEVuxgExPS36v6+ipTSQSF0QFNlWAg== X-Received: by 2002:a05:620a:211b:b0:6ee:7aba:d34c with SMTP id l27-20020a05620a211b00b006ee7abad34cmr4210049qkl.398.1668953887070; 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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 235/241] global: Migrate CONFIG_WATCHDOG_PRESC to CFG Date: Sun, 20 Nov 2022 09:17:37 -0500 Message-Id: <20221120141743.3059310-36-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 0abcc01b8574..68c3b1f98b8c 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(CONFIG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC)); + TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC)); } void diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index a7cc42c526c5..191ef7bb2870 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -377,7 +377,7 @@ int get_scl(void); /* * Hardware Watchdog */ -#define CONFIG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) ~10min */ +#define CFG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) ~10min */ #define CONFIG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */ /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2e217a15b300..29c5ad21d3ef 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -250,7 +250,7 @@ CFG_VAR_SIZE_SPL CFG_VERY_BIG_RAM CFG_VSC7385_IMAGE CFG_VSC7385_IMAGE_SIZE -CONFIG_WATCHDOG_PRESC +CFG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT CONFIG_X86EMU_RAW_IO -- 2.25.1