Message ID | 20221204151420.56851-39-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 39d4e7b0b060c47879d1f2727853a3e7e38191b5 |
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=85.214.62.61; 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=naDifyST; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4NQ9dt2RFhz23mf for <incoming@patchwork.ozlabs.org>; Mon, 5 Dec 2022 02:32:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 882F5856A4; Sun, 4 Dec 2022 16:16:25 +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="naDifyST"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 68F868562F; 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-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (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 281038561D for <u-boot@lists.denx.de>; Sun, 4 Dec 2022 16:15:10 +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-x631.google.com with SMTP id fc4so15357861ejc.12 for <u-boot@lists.denx.de>; Sun, 04 Dec 2022 07:15:10 -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=3RMQr+qSMOP/YCWudVvdoZsecu0SjqcQV8xu+amiU8I=; b=naDifySTn/xQ/cbRyecbVQ6kktGE7NsehoGeiJF3/JN7R2sajkfJOpslVlmd2/jAGN oz4PgEcP30srPgcTcjHxByha4sBWQuJcORH+QZdsvSGWAQ5mx/DYTKW6jpMqo/OhORSB Nd3EyPRX2Py6WQ4RsOnhbMWWBRhc8YyUyvX80= 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=3RMQr+qSMOP/YCWudVvdoZsecu0SjqcQV8xu+amiU8I=; b=xe5YUgi/x027UhllH5jIROsAe+89JLskmw9RhZSUC+sK3yHVoBHKhFlmsUJhE3obwd ZQukcYhTaA5wARDdT4yLSAbvTEyzJ4FdMMObxy49ZIU7tmuiKRwipJOi+u5lMIhXqtvL Pg4I3ytWM+XfsshP7Nvb7/Eu3eHzQltzhW0YeVg736qSSK18ZY7yyBUaZQT6kmsfywPN UPnCFjSLwEP7gW1mxLG1e2/wQXuS8XF51qBRanSt5fpYsau8J5Nv1D7kBMTFRLgCpJQs lb+3YruBs4VZe3z3clMXrOAeXxzP+gdveQU0OnMrG/2TUR9ceTb6OI5ISEXi2W+ahIg3 eJtQ== X-Gm-Message-State: ANoB5pkFEUBW+DtHpBQkMrCIdMqLwQI0Zpku2letMw4lMaSA9RBjJuFO e+2ibZaTVd8Jyq+Hb/dhraxFnZXsc/G6XhZh X-Google-Smtp-Source: AA0mqf6O42Buy+NHGwfzNot+UlCkT986VJnMNXfafmFL+gwm7IYdJaTW/PRhm14ufOVRFcGdXrOJmg== X-Received: by 2002:a17:906:3a56:b0:7c0:54f2:af97 with SMTP id a22-20020a1709063a5600b007c054f2af97mr19397112ejf.360.1670166909466; Sun, 04 Dec 2022 07:15:09 -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.08 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:15:09 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PATCH 129/149] global: Migrate CONFIG_TESTPIN_REG to CFG Date: Sun, 4 Dec 2022 10:14:00 -0500 Message-Id: <20221204151420.56851-39-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/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 73e3709bbba2..9ec1dbc6f97b 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -216,7 +216,7 @@ int post_hotkeys_pressed(void) int testpin = 0; struct km_bec_fpga *base = (struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE; - int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG); + int testpin_reg = in_8(&base->CFG_TESTPIN_REG); testpin = (testpin_reg & CFG_TESTPIN_MASK) != 0; debug("post_hotkeys_pressed: %d\n", !testpin); return testpin; diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 0bd789b26b06..f67e81f2b3e3 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -35,7 +35,7 @@ #define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) #define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */ #define CPM_POST_WORD_ADDR CONFIG_SYS_MEMTEST_END -#define CONFIG_TESTPIN_REG gprt3 /* for kmcoge5ne */ +#define CFG_TESTPIN_REG gprt3 /* for kmcoge5ne */ #define CFG_TESTPIN_MASK 0x20 /* for kmcoge5ne */ #endif /* CONFIG */
Perform a simple rename of CONFIG_TESTPIN_REG to CFG_TESTPIN_REG Signed-off-by: Tom Rini <trini@konsulko.com> --- board/keymile/km83xx/km83xx.c | 2 +- include/configs/kmcoge5ne.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)