Message ID | 20221204151420.56851-45-trini@konsulko.com |
---|---|
State | Accepted |
Commit | bb34410509205e70ab7c9830f9c17277e8dd54ad |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=m783joho; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4NQ9f43r67z23mf for <incoming@patchwork.ozlabs.org>; Mon, 5 Dec 2022 02:32:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DBD5856AF; Sun, 4 Dec 2022 16:16:28 +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="m783joho"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 811D68561D; Sun, 4 Dec 2022 16:15:20 +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,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-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) (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 A7C608560B for <u-boot@lists.denx.de>; Sun, 4 Dec 2022 16:15:16 +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-ej1-x633.google.com with SMTP id td2so22295342ejc.5 for <u-boot@lists.denx.de>; Sun, 04 Dec 2022 07:15:16 -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=o5xhnD3LLDxnUN41qi0pTjEPIZI9d7Gxa9o0Fxbz+S0=; b=m783johoY/U54a+C8fnkzBkqMXuaJjMBLqpZuQ+NON9WeeuQhX81KIdx8UcG8AN2sr 6GCsAOYUURs695shhUJOGrUwSqWjD5/Q5H61WBuhh6N1u69KXR9v/TCyQG7BtCSqV/g+ iYobNjSwGltxq/i7B/c0dm+NhWHLU9imj5TZs= 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=o5xhnD3LLDxnUN41qi0pTjEPIZI9d7Gxa9o0Fxbz+S0=; b=xg9dYxZ6nsurWmiX86tCyfT3RYoS5aLNDp6G1RIbNKR+6focAhXTMdRchDuYklwS7P osirP374VN5GiiJ6kQMIRPwN3U6Wi9ZSxgZ409PUyv8PyWXKoQP7s90Gb0xYmHym1/Ke YAgVsvzTFm979+RLEDRb/i5UNOpEJGc5r4K9TU8yISpZkKhfoqLpUZpiDiIh2hF0mACB q7jkp3n+FD7TfeXksA563mmnnI4uYU8MV2D5l8OfU64WbJPQm4DXJBL51y9AewxgbLpz YxpNYpdeVtZpRa+g7bIfb5rgjtTDfRl72yxrLrbuD7KhJ0pBGbkYJcYBlw/pRNfUC5DW F52g== X-Gm-Message-State: ANoB5pnzTdEZM+ltqRW4GNZQpjtKqFG6Tjc1u6214sB++pWWRVSC53aJ YNhWjrcOsH9O9snMgi1W6pLjYLqhHE8eSWmv X-Google-Smtp-Source: AA0mqf5g4ajrTM+l+UrCqteRhCjCTYKjIG5L7qgTWbqoFDn9j4btnMRECTs2cIzmRrFlCAePJTbACQ== X-Received: by 2002:a17:906:4c98:b0:7ad:b9f3:a66a with SMTP id q24-20020a1709064c9800b007adb9f3a66amr52378759eju.282.1670166916229; Sun, 04 Dec 2022 07:15:16 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id b21-20020aa7c915000000b00461816beef9sm5174405edt.14.2022.12.04.07.15.15 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:15:15 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PATCH 135/149] global: Migrate CONFIG_WATCHDOG_PRESC et al to CFG Date: Sun, 4 Dec 2022 10:14:06 -0500 Message-Id: <20221204151420.56851-45-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204151420.56851-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204151420.56851-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 0abcc01b8574..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(CONFIG_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 1eaf1968321c..9bb8cd19033e 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -375,8 +375,8 @@ int get_scl(void); /* * Hardware Watchdog */ -#define CONFIG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) ~10min */ -#define CONFIG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */ +#define CFG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) ~10min */ +#define CFG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */ /* * For booting Linux, the board info and command line data
Perform simple renames of: CONFIG_WATCHDOG_PRESC to CFG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC to CFG_WATCHDOG_RC Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- include/configs/kmcent2.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)