Message ID | 20221204151420.56851-38-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 77cfb3d345651fa1cf78c8f30eca9d6d285f1e0b |
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=KY7Iu84e; 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 4NQ9cQ490xz23mf for <incoming@patchwork.ozlabs.org>; Mon, 5 Dec 2022 02:30:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDFB185690; Sun, 4 Dec 2022 16:16:11 +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="KY7Iu84e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 28DA385622; Sun, 4 Dec 2022 16:15:16 +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-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 CB0E585625 for <u-boot@lists.denx.de>; Sun, 4 Dec 2022 16:15:08 +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-x62d.google.com with SMTP id ml11so22334168ejb.6 for <u-boot@lists.denx.de>; Sun, 04 Dec 2022 07:15:08 -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=fCkmfw/m/YDg1cO2b1SaQyvVS/XfP5E2JrVjOpJD9xs=; b=KY7Iu84eQ/6n1FHYf4HLr+PywyZVF/rkxILk+U1LyZDIaQ882xI1K7HgpvdkUDhd2N /BeHEpgxG8W9AwBpu47pl7bVU4SLNs6onUQE8rWKrGmGRn0kKS8/oFTgJaY/+j4QEP7A nHYKDU3hpY+/XDDqB+TqnMinPNEVyXRCxloio= 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=fCkmfw/m/YDg1cO2b1SaQyvVS/XfP5E2JrVjOpJD9xs=; b=XKG2YGGnXs69+31PCxU5DVYnR+zrTc4SwZoQrKSZo2xdXhljUNlfiIHiZN+YCZJYKJ KpAuW5T/Whg/rTR2h7GFkxJadkuW1hEPl0rdlbqAzs0CxY9oouArE6nIPmJ4mjCwgcqZ PMaIWbjWoHdGbcSg18hU2AST1pYrVG5sZWWleHzIrBPIZl0uroWgj+yTE8HxhMG+RYUg Pz5pxC36NDe2tG+V+73jIiEN5EywFZcE/a26uuHQbNmgIl9VxE5o6ZJPppuT9KaUn7Vs O7CH+UR9MxJ+GXCY3McUQUobrVUnUYG2T2+nyPhlf+1+jjPEjPLjs3oRdCjlZe+JqeaO LLZA== X-Gm-Message-State: ANoB5pk97P3QVKr3WwgzamWs7JS9OtsQSbwRXIvP+G04C24G6HCCacpJ I+xs5AQqzEAbC+trR77637KymcGZQMzm0VDs X-Google-Smtp-Source: AA0mqf6eBRdR7S5tjy9yDoUn9/Q7Hef0hQcZyRZADrs6BmU3v+Fk5ud1U3ZuZ4y4b5mx0mt8Os+2SA== X-Received: by 2002:a17:907:2bf3:b0:7c0:ebbb:8e8b with SMTP id gv51-20020a1709072bf300b007c0ebbb8e8bmr2162981ejc.683.1670166908310; Sun, 04 Dec 2022 07:15:08 -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.07 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:15:07 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PATCH 128/149] global: Migrate CONFIG_TESTPIN_MASK to CFG Date: Sun, 4 Dec 2022 10:13:59 -0500 Message-Id: <20221204151420.56851-38-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 88afc76bbbf6..73e3709bbba2 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -217,7 +217,7 @@ int post_hotkeys_pressed(void) struct km_bec_fpga *base = (struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE; int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG); - testpin = (testpin_reg & CONFIG_TESTPIN_MASK) != 0; + 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 b6386bdbcb7e..0bd789b26b06 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -36,6 +36,6 @@ #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 CONFIG_TESTPIN_MASK 0x20 /* for kmcoge5ne */ +#define CFG_TESTPIN_MASK 0x20 /* for kmcoge5ne */ #endif /* CONFIG */
Perform a simple rename of CONFIG_TESTPIN_MASK to CFG_TESTPIN_MASK 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(-)