| Message ID | 20221204151420.56851-32-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 59f3a09a6c86e99f9790f9b534465b035863a5b4 |
| 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=esm+ADzP; 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 4NQ9bN49s9z23nB for <incoming@patchwork.ozlabs.org>; Mon, 5 Dec 2022 02:29:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0DF8B85670; Sun, 4 Dec 2022 16:16:01 +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="esm+ADzP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F13385626; Sun, 4 Dec 2022 16:15:09 +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-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 CAF0C8560B for <u-boot@lists.denx.de>; Sun, 4 Dec 2022 16:15:00 +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-ed1-x52e.google.com with SMTP id r26so12564116edc.10 for <u-boot@lists.denx.de>; Sun, 04 Dec 2022 07:15:00 -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=bTDqd/cBhWmnDBkQapoLqJxY0jRJeF+7Qvv6SmjoMpg=; b=esm+ADzPtEbwLW3PizcX5Pk0p28DWB3VZWlxxRDOy6LW+wf17akDAroE8CFGkaw4ZK ThZ/XTYvL5SB6juJkzQ+N4fo/r//IQqnXDi5dV9QGrI7Hj7sdxpigbBOkYeKj6Ic23Qk iYUjTGsT4KdN6fJfUKrRK6Y5zSPNr8r7z6grE= 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=bTDqd/cBhWmnDBkQapoLqJxY0jRJeF+7Qvv6SmjoMpg=; b=0D1d7p63gMBrSjmo11ADAGcQSZKotFKtOOWQ1uenCtaxykGviFzsAERxwW1HqJaS8Z 4Rzo5USq0e0vj1QNjJKcr4pUreA5hxVlZydGk+lZHNJqTnwfIVbFg8GLv2QahevValMH IP6wzMGSbJRpoJziQYYvHl2mr5vQZiqsN63VBPhlkYvVM2e+xxqjF4vHPGnckxaU2fV4 i3bIJ2miy2Y3V6kXWUGiC/HvUAB7YstBv/DToa/prDQqpC3b9uxI/xl+yEyLPDGHKRHA RJE19goizPpBmE2F7Z+duNgiz06w2dimI+4GPRie8Ok8bdSVzG0N8eebc1C58bWudKAA FKmQ== X-Gm-Message-State: ANoB5plS5vlzmyLATxtDoGrhJyV15t9le29wicpPEWKa8UF2QwA0hjfw N518wJcvzMaryB9r3/2ZYXyQWpXP6yqbZRWq X-Google-Smtp-Source: AA0mqf5HbOtc4n3+IwvbSB2GPWdBQCnm4Rw1MOQ2gqgXFgktzTHCxCWxmdPhfXlpq2qdpV9mf8Uezg== X-Received: by 2002:a05:6402:3719:b0:461:4f34:d8f4 with SMTP id ek25-20020a056402371900b004614f34d8f4mr5321399edb.144.1670166900070; Sun, 04 Dec 2022 07:15:00 -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.14.59 for <u-boot@lists.denx.de> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:14:59 -0800 (PST) From: Tom Rini <trini@konsulko.com> To: u-boot@lists.denx.de Subject: [PATCH 122/149] global: Migrate CONFIG_SLIC to CFG Date: Sun, 4 Dec 2022 10:13:53 -0500 Message-Id: <20221204151420.56851-32-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/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index df9f6ae47322..4d7d042eaf3b 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -187,7 +187,7 @@ void board_gpio_init(void) setbits_be32(&pgpio->gpdat, 0x00080000); #endif -#ifdef CONFIG_SLIC +#ifdef CFG_SLIC /* reset SLIC */ setbits_be32(&pgpio->gpdir, 0x00040000); setbits_be32(&pgpio->gpdat, 0x00040000); diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 832ad9c3ece0..be7680198299 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -13,7 +13,7 @@ #include <linux/stringify.h> #if defined(CONFIG_TARGET_P1020RDB_PC) -#define CONFIG_SLIC +#define CFG_SLIC #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0x5c #define __SW_BOOT_SPI 0x1c @@ -42,7 +42,7 @@ * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off */ #if defined(CONFIG_TARGET_P1020RDB_PD) -#define CONFIG_SLIC +#define CFG_SLIC #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0x64 #define __SW_BOOT_SPI 0x34
Perform a simple rename of CONFIG_SLIC to CFG_SLIC Signed-off-by: Tom Rini <trini@konsulko.com> --- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- include/configs/p1_p2_rdb_pc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)