From mboxrd@z Thu Jan 1 00:00:00 1970 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 37249C433FE for ; Sun, 20 Nov 2022 13:42:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B8EF685322; Sun, 20 Nov 2022 14:35:17 +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="sDriqVgx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C51CA85299; Sun, 20 Nov 2022 14:34:32 +0100 (CET) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 D09B185262 for ; Sun, 20 Nov 2022 14:34:29 +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-x72d.google.com with SMTP id z1so6497727qkl.9 for ; Sun, 20 Nov 2022 05:34:29 -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=0QzJBwCQgOl3fI6zHZe2IRvF88Ki0zhBBQt4x86LXkY=; b=sDriqVgxxSrELFuzdw2msXvBm570okMwxwGFg05OdleLQRuXQTIM7VCW4u40qHmR1x 18ECghazCZ06S8tqmdnI8S6lPn6+NPFJqFhIm8FVSssRgzbg+0bGfB6HehQt4RoX6fe7 1A5KEc4htpfqiCG7LRiLx46ds+YsXLnOjIAd0= 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=0QzJBwCQgOl3fI6zHZe2IRvF88Ki0zhBBQt4x86LXkY=; b=lBVbEr0PGXJDTo/lLR3hQUFOY57HBcRPnQI1PTXRj26wF3Hb3GZPaX/T1/S9/ZxCpC Ahs20IEqkEqo57kiPQUbt3stZVT3uZhbzHCnLCUYvVmxgfkqiVNaQlHjXsTOwa667s5e W2Gf70MfAQI9HydgbdrIrcrf8pDP1dO/+OBsqZiGdOfQPvzVmCqVdLJXqKefZPS3xeBn ZHMLNMt5ms3xjX1uGF2/67lvhG0GoaG3ZXnJO/iY4m1T0hyQkguJeSN9mgCKvZZBN2GR bm5Ij2y/+NODz6Qmrpjw5LSoPCjsQFM8PJn7h8r//RfQHtKjvAzzhp5Jzd6YzeaGJynZ jFtQ== X-Gm-Message-State: ANoB5pmuYCLm9vu2WcZPFCvN9ib8g3qYdUUqI0FVFLIF6rIiYNUgP094 hgNHmTTXBdipdbJAoATi3wonLGxx7VKu6A== X-Google-Smtp-Source: AA0mqf7Znz/p1QtwTC8Y1TkeoRxJUl3LKbiADORUxL4hwTGFscdih9qs4iew4UoPO5uI7uE4AGRdLQ== X-Received: by 2002:a05:620a:10b4:b0:6fb:f17e:c8f8 with SMTP id h20-20020a05620a10b400b006fbf17ec8f8mr3035397qkk.404.1668951268404; Sun, 20 Nov 2022 05:34: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 m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:28 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 047/241] global: Migrate CONFIG_GATEWAYIP to CFG Date: Sun, 20 Nov 2022 08:30:38 -0500 Message-Id: <20221120133352.3055600-48-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-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 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 --- README | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 02ae72e009ef..d76058e1ab41 100644 --- a/README +++ b/README @@ -750,7 +750,7 @@ The following options need to be configured: (Environment variable "serverip") - Gateway IP address: - CONFIG_GATEWAYIP + CFG_GATEWAYIP Defines a default value for the IP address of the default router where packets to other networks are diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ef3837e137c7..83ffe7ce76d9 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -21,7 +21,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5208EVBe" diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index a31d44177362..fc56834bd9be 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -30,7 +30,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5235EVB" diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 501785ac82e0..78eeca342c82 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5272C3" diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 3912aae750d4..afc19de8ce73 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ #define CONFIG_HOSTNAME "M5282EVB" diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 6d97e6ca84ab..1fcc34184928 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -34,7 +34,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M53017" diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index f8aabe4944a4..a49cf6dacb81 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -26,7 +26,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5329EVB" diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 228fcde98dc3..53434881f4c7 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -28,7 +28,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ #define CONFIG_HOSTNAME "M5373EVB" diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 515e88cf8206..e93b3cb97517 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -332,7 +332,7 @@ #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ #define CONFIG_SERVERIP 192.168.1.1 -#define CONFIG_GATEWAYIP 192.168.1.1 +#define CFG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index c8c0fc671ab0..204a9b0b5458 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -18,7 +18,7 @@ #define CONFIG_IPADDR 0.0.0.0 /* In order to cause an error */ #define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */ #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_GATEWAYIP 0.0.0.0 +#define CFG_GATEWAYIP 0.0.0.0 #define CONFIG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */ #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2fe056cfef4a..874f75404712 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -48,7 +48,7 @@ */ #define CONFIG_SERVERIP 192.168.11.1 #define CONFIG_IPADDR 192.168.11.10 -#define CONFIG_GATEWAYIP 192.168.11.1 +#define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0 #if defined(CONFIG_ARM64) diff --git a/include/env_default.h b/include/env_default.h index 1621815f257a..7d0af83a5913 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -68,8 +68,8 @@ const char default_environment[] = { #ifdef CONFIG_ROOTPATH "rootpath=" CONFIG_ROOTPATH "\0" #endif -#ifdef CONFIG_GATEWAYIP - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0" +#ifdef CFG_GATEWAYIP + "gatewayip=" __stringify(CFG_GATEWAYIP) "\0" #endif #ifdef CONFIG_NETMASK "netmask=" __stringify(CONFIG_NETMASK) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea7eaef5d15f..e634d868a090 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -47,7 +47,7 @@ CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 CFG_FSL_SERDES2 -CONFIG_GATEWAYIP +CFG_GATEWAYIP CONFIG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM -- 2.25.1