Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 459D3C4332F for ; Sun, 20 Nov 2022 14:23:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB2DC85490; Sun, 20 Nov 2022 15:14: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=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="EaLO5IIU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D50B0853BA; Sun, 20 Nov 2022 15:12:37 +0100 (CET) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 27B6D85363 for ; Sun, 20 Nov 2022 15:09:52 +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-qk1-x734.google.com with SMTP id z1so6527967qkl.9 for ; Sun, 20 Nov 2022 06:09:52 -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=3xUPldk/OgNN7ZzUF7DmVV+uyqnie85qb5/IqxVEIU0=; b=EaLO5IIUy9jUWRYdE/pBpowWLaAPeon48O/sqhHBb7wy4cbCGgwP+4QmWClFXFl9nN NivOQeAMJt7+uYNBSqtATjEqeYS976rApzr6UCwZ4CmGkCBx7GhufccRKrL4X4Pxm0wx Xdr7VI7aRnodfQ5oYvd34CEQfqQJYL0yGKAE4= 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=3xUPldk/OgNN7ZzUF7DmVV+uyqnie85qb5/IqxVEIU0=; b=jus3aB11XKLJ53mK2qrtVeZTM5YInE0EXpDv8lgemn+giAJp+nQK0j2SohbGTpOZOK 5iCHemmX1b4JCcXRrH5PBVDTBAQNp17A/RPNEz/UFB62D2ps7uCwNVrhoWlAoKIqvOQy Mn1lwc1WL84sVkQxpBDqx9CxKWeSeiV6S9kdOrISQYdNyQN7wW4D4mDvMPxqxlZTkuO0 C/Ezy87UzumX4C45yPlmf0v4zJa81sWSqanwvfwUhtOIJnT+MDPBGeMCAXz+OzriDw7w VUvySmH0c/6ECsvJZDG09f3DuRFl6r7hjJXbaIG6kHrWp4SOaWobJ0gYCDSifxz37WUR q2yQ== X-Gm-Message-State: ANoB5pnCxeP+1Xrz/hGwsPPGyzehMCBYe56rBClKk/p8kYC7hBVMDT1+ IAlOmmvBwvzKb1REkI5dX948AM7uSxvQrA== X-Google-Smtp-Source: AA0mqf4DiiNkhmC01AxE7/b/h7wZgCrTCrBP6AvqJwYvTgxWvGHZtuvasumzld2p46bmMl59EWi6tQ== X-Received: by 2002:a37:5846:0:b0:6fa:566f:eb1e with SMTP id m67-20020a375846000000b006fa566feb1emr13003607qkb.616.1668953368798; Sun, 20 Nov 2022 06:09:28 -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-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.09.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 199/241] global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG Date: Sun, 20 Nov 2022 09:08:29 -0500 Message-Id: <20221120140829.3057894-90-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-1-trini@konsulko.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/board2.c | 2 +- include/configs/beaver.h | 2 +- include/configs/cardhu.h | 2 +- include/configs/cei-tk1-som.h | 2 +- include/configs/dalmore.h | 2 +- include/configs/harmony.h | 2 +- include/configs/jetson-tk1.h | 2 +- include/configs/medcom-wide.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/p2771-0000.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/paz00.h | 2 +- include/configs/plutux.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/venice2.h | 2 +- include/configs/ventana.h | 2 +- scripts/config_whitelist.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 54bbd8a776e9..c7a45f4ff82a 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -89,7 +89,7 @@ int checkboard(void) { int board_id = tegra_board_id(); - printf("Board: %s", CONFIG_TEGRA_BOARD_STRING); + printf("Board: %s", CFG_TEGRA_BOARD_STRING); if (board_id != -1) printf(", ID: %d\n", board_id); printf("\n"); diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 1a540c9f7122..c22cdaed3f74 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -14,7 +14,7 @@ #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Beaver" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 0a5eaf03d9a5..c9cf110147a2 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -14,7 +14,7 @@ #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Cardhu" #define BOARD_EXTRA_ENV_SETTINGS \ "board_name=cardhu-a04\0" \ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 3aaed94e15cb..045cd25104d7 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -16,7 +16,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "CEI tk1-som" +#define CFG_TEGRA_BOARD_STRING "CEI tk1-som" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 39e1aded3730..8f97848b1714 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -11,7 +11,7 @@ #include "tegra114-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Dalmore" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 211dab4d2337..97914889092b 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index d3bb6d760376..4878e6526b5a 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -12,7 +12,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index a8d8d8b09e02..e0d947f7e3c5 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index fbba4ca701db..946759f4fb20 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -12,7 +12,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" +#define CFG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index dd756a5056c8..8b734e1e948c 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -12,7 +12,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-0000" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 10b36e6a1657..7120ae7bd808 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -12,7 +12,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2371-2180" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2371-2180" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 6578350990d7..f1b0faf0091e 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -12,7 +12,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2571" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index 84cdd5719623..e409cc3896d7 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -11,7 +11,7 @@ #include "tegra186-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P2771-0000" /* 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 34ab82fe1173..9eda594b8980 100644 --- a/include/configs/p3450-0000.h +++ b/include/configs/p3450-0000.h @@ -11,7 +11,7 @@ #include "tegra210-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P3450-0000" +#define CFG_TEGRA_BOARD_STRING "NVIDIA P3450-0000" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/paz00.h b/include/configs/paz00.h index a945f4e9b289..387e4fcaf2e5 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -13,7 +13,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00" +#define CFG_TEGRA_BOARD_STRING "Compal Paz00" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 99db59c489e0..82ef6959fd2f 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Plutux" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index f272fe9bf8f1..5cbc33461251 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Seaboard" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 6566dc170ff6..966750539b5d 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -10,7 +10,7 @@ #include "tegra30-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten™ NG Evaluation Carrier" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/include/configs/tec.h b/include/configs/tec.h index ddf753da4a9f..b8819909b6bc 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -12,7 +12,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier" +#define CFG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index e4cbc7da843e..62c785cc0e78 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice" +#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 1cf493a50373..164aebf3045b 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -12,7 +12,7 @@ #include "tegra124-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Venice2" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTA diff --git a/include/configs/ventana.h b/include/configs/ventana.h index f7a507768ec1..e585fb93d308 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -11,7 +11,7 @@ #include "tegra20-common.h" /* High-level configuration options */ -#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana" +#define CFG_TEGRA_BOARD_STRING "NVIDIA Ventana" /* Board-specific serial config */ #define CONFIG_TEGRA_ENABLE_UARTD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1f79a45cda8a..825379421095 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -208,7 +208,7 @@ CFG_SPI_N25Q256A_RESET CFG_STACKBASE CFG_STANDALONE_LOAD_ADDR CFG_STD_DEVICES_SETTINGS -CONFIG_TEGRA_BOARD_STRING +CFG_TEGRA_BOARD_STRING CONFIG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD CONFIG_TEGRA_SLINK_CTRLS -- 2.25.1