From patchwork Sun Nov 20 14:17:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706898 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=t/ckAhiA; 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 4NFXn06dwtz23lt for ; Mon, 21 Nov 2022 01:23:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 124FA8549B; Sun, 20 Nov 2022 15:17:50 +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="t/ckAhiA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DB49585496; Sun, 20 Nov 2022 15:17:48 +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-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (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 350A5852FD for ; Sun, 20 Nov 2022 15:17:46 +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-qv1-xf31.google.com with SMTP id c8so6490865qvn.10 for ; Sun, 20 Nov 2022 06:17:46 -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=3K/nx2LG2JfugRivgfWoHoGRBsuW8EiXqwiLjtgDI88=; b=t/ckAhiANRbpnSlnMh8a0qMDhxHJ3welU/FQkHOla1WC0WuUAG1Xi1WbcQGYKJyy9w HRDJzAwtAuHUaHUPo3JDBuG7wAPPZe8gz0pg+Q7SCxWNMtvbELQDfgN5ANlxXWtX4Gsu NGVZF7+ZnTd7FflVTcf/jl9ZhhC1VdxQcoVKc= 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=3K/nx2LG2JfugRivgfWoHoGRBsuW8EiXqwiLjtgDI88=; b=15ilRTg7KIWKO3tktFk+e695co01mBcuiDonaG53GJPQxMOTgDDvUQ96l4/PHbO8HP USrq1Wh1U4rId0CfDRs4/+F1mJaAxJX8playN/N5S+Hwh3fi84BRqMluLFZmhCyR31ob WwwjJGD/0zKzcUmID3KEfSmJmNmsZ3EPBcOwv8/UT66L2GyvO8BW9Wc6UusiSLual7+Q V18j+xek+K7JkUEnIA5LIR/TAnyRSZmzST/to9Mi9wnVUcd4QHAHpT/JjQnye6hj8BsZ lGoKtWR6jF/DSM79ejQR/r8J5/6xP3Xzvh9rZfkZmtTpZawGR1VWcCK5vCQoDJdhA3tZ YEdA== X-Gm-Message-State: ANoB5pnRxVep8lmM7fizBYoZzMEzyRF42nSCg8/+3T+DBR2wkMRK1PCn iUVHXDeZM+DBwh/2oXic9GkgkzaqRO6fUg== X-Google-Smtp-Source: AA0mqf4T0Q0RM627gFHi62HqDZ1L+RaLZn/ryl2DHNw7mX/GjPvcyDeDANOvm8cF8Ndj8ZQYR2VhSg== X-Received: by 2002:ad4:4023:0:b0:4a7:d867:3cc with SMTP id q3-20020ad44023000000b004a7d86703ccmr13810014qvp.75.1668953864730; Sun, 20 Nov 2022 06:17:44 -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.17.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:44 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 200/241] global: Migrate CONFIG_TEGRA_ENABLE_UARTA to CFG Date: Sun, 20 Nov 2022 09:17:02 -0500 Message-Id: <20221120141743.3059310-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-90-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> MIME-Version: 1.0 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/arm/mach-tegra/board.c | 2 +- include/configs/apalis-tk1.h | 2 +- include/configs/apalis_t30.h | 2 +- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/colibri_t20.h | 2 +- include/configs/colibri_t30.h | 2 +- include/configs/harmony.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/paz00.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/venice2.h | 2 +- scripts/config_whitelist.txt | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index f8b61a2b3e3b..b4b73df2265e 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -238,7 +238,7 @@ void board_init_uart_f(void) #if IS_ENABLED(CONFIG_TEGRA_PINCTRL) int uart_ids = 0; /* bit mask of which UART ids to enable */ -#ifdef CONFIG_TEGRA_ENABLE_UARTA +#ifdef CFG_TEGRA_ENABLE_UARTA uart_ids |= UARTA; #endif #ifdef CONFIG_TEGRA_ENABLE_UARTB diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 7fd99ea907d1..8600529379d1 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -13,7 +13,7 @@ #include "tegra124-common.h" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define FDT_MODULE "apalis-v1.2" diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 4f00b3bad3f4..6d017d88707b 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -20,7 +20,7 @@ * Apalis UART3: NVIDIA UARTB * Apalis UART4: NVIDIA UARTC */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define UBOOT_UPDATE \ diff --git a/include/configs/beaver.h b/include/configs/beaver.h index c22cdaed3f74..43bc8dc32159 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -17,7 +17,7 @@ #define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE /* SPI */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index c9cf110147a2..29d5e011e6ef 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -21,7 +21,7 @@ "fdtfile=tegra30-cardhu-a04.dtb\0" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE /* SPI */ diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 2ba3c3bc87db..19044be6cc06 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_SDIO1 #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index ffed71a2e828..86097670c275 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -21,7 +21,7 @@ * Colibri UART-B: NVIDIA UARTD * Colibri UART-C: NVIDIA UARTB */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE #define UBOOT_UPDATE \ diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 97914889092b..59ead58587db 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -18,7 +18,7 @@ /* UARTD: keyboard satellite board UART, default */ #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#ifdef CONFIG_TEGRA_ENABLE_UARTA +#ifdef CFG_TEGRA_ENABLE_UARTA /* UARTA: debug board UART */ #define CFG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE #endif diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 946759f4fb20..02f8b2c624b3 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -15,7 +15,7 @@ #define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE /* SPI */ diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 8b734e1e948c..e22cb8e8eb1b 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -15,7 +15,7 @@ #define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 7120ae7bd808..075b2caa8bd5 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -15,7 +15,7 @@ #define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index f1b0faf0091e..c80a6999490d 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -15,7 +15,7 @@ #define CFG_TEGRA_BOARD_STRING "NVIDIA P2571" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h index 9eda594b8980..764e412f3dfc 100644 --- a/include/configs/p3450-0000.h +++ b/include/configs/p3450-0000.h @@ -14,7 +14,7 @@ #define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA /* Only MMC/PXE/DHCP for now, add USB back in later when supported */ #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 387e4fcaf2e5..cbf0c71a1fcb 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -16,7 +16,7 @@ #define CFG_TEGRA_BOARD_STRING "Compal Paz00" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE /* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 62c785cc0e78..ca5462fe4727 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -14,7 +14,7 @@ #define CFG_TEGRA_BOARD_STRING "Compulab Trimslice" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CONFIG_TEGRA_UARTA_GPU #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 164aebf3045b..1f4860a333be 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -15,7 +15,7 @@ #define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2" /* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTA +#define CFG_TEGRA_ENABLE_UARTA #define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE /* Environment in eMMC, at the end of 2nd "boot sector" */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 825379421095..130081c36143 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -209,7 +209,7 @@ CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR CFG_STD_DEVICES_SETTINGS CFG_TEGRA_BOARD_STRING -CONFIG_TEGRA_ENABLE_UARTA +CFG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_SLINK_CTRLS CONFIG_TEGRA_SPI