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 069B8C433FE for ; Sun, 20 Nov 2022 14:12:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 238A285346; Sun, 20 Nov 2022 15:09: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=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="YKrdSReK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EBEA7852DB; Sun, 20 Nov 2022 15:08:50 +0100 (CET) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 095C28528E for ; Sun, 20 Nov 2022 15:08: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-qt1-x834.google.com with SMTP id w4so5971714qts.0 for ; Sun, 20 Nov 2022 06:08:45 -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=PxV3fB9/N4oGf/iXb0fZhtp+JDhEZlzle+NpPH/0I0o=; b=YKrdSReKrkW7hlqhZB4xIdPY0w6Ol3cq+ML7LQeCyMVzF+tiIgCzS9pgIXfbwwTjEk ViQn8uOwLe/XLHXvVUcJlHlwVmcMy/AGUxBBET/tzp5FE1yUtgQfF462RDIarjufLwMJ x8qjwQF7hWkU75Ix8ypUce5/CpYdUS5OU+mYE= 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=PxV3fB9/N4oGf/iXb0fZhtp+JDhEZlzle+NpPH/0I0o=; b=4yu9s1cUuKSRL3GdMeWrWzlYnxQ50+PPwMyD5uSY1q+Pwzux0DOyEy28B2icPAyXfJ Bnz/F5K7sgiSVTMHpwdBOK7/fk19cFPyJWvZ9mKGX71VjjqQSL2WF3d+h3Kh1IoDPti/ yHAjsgiPO6yompTR+sixa06fVDLjTslXisHaiBm4MaZQ3Z5wIJl4HGbF0lINOBcNne2u Yk0/6aq4rFA0Fexg3EkkYIVArSeEJ3KwlkHl8J/eRYXdtlFoCX3lcJl71wH4+sGZQ3Ni U/fpwuRpntBVTf+N0Sf8CN91Knsz3d4vzXsqlAuE1BivmOrIGF1GGIm4Xnsd/0y68jxk iCog== X-Gm-Message-State: ANoB5pk9nSASGRTtgmw0+p2hdk/FXOOITNQlVPD2k77IspSPRwcdrIOS BsTIS7N3qytvZlycShDQmnEaW15hzArV4Q== X-Google-Smtp-Source: AA0mqf6X++JFpFQ4j3AHA+Yg7QRqfStIoFrDWAs5rYdB8irCSVyVH8208VX9ifzsoozCdLbV9i5xPA== X-Received: by 2002:a05:622a:4816:b0:3a5:f994:78c6 with SMTP id fb22-20020a05622a481600b003a5f99478c6mr13894040qtb.2.1668953325378; Sun, 20 Nov 2022 06:08:45 -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.08.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 135/241] global: Migrate CONFIG_NETMASK to CFG Date: Sun, 20 Nov 2022 09:07:25 -0500 Message-Id: <20221120140829.3057894-26-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-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/MCR3000.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/poleg.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README b/README index 8ab897f09641..f5b4669b97c7 100644 --- a/README +++ b/README @@ -758,7 +758,7 @@ The following options need to be configured: (Environment variable "gatewayip") - Subnet mask: - CONFIG_NETMASK + CFG_NETMASK Defines a default value for the subnet mask (or routing prefix) which is used to determine if an IP diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 647e23f380b8..1357d682c7f7 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -19,7 +19,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 7bc86eb8b5f6..535b5064f193 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -28,7 +28,7 @@ /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 99f1df087e36..043e188189e1 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -31,7 +31,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 4b20da4a23eb..88e3d72ef67f 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -31,7 +31,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 5afd8383c1bd..014405779fee 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -32,7 +32,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 9d5f0e1c0964..364eaa448dce 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -24,7 +24,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 807d591c9f12..cc67a268a8fe 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -26,7 +26,7 @@ #ifdef CONFIG_MCFFEC # define CFG_IPADDR 192.162.1.2 -# define CONFIG_NETMASK 255.255.255.0 +# define CFG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index d61ed82ab3bf..1248b367ae62 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -54,7 +54,7 @@ #define CFG_IPADDR 192.168.0.3 #define CONFIG_SERVERIP 192.168.0.1 -#define CONFIG_NETMASK 255.0.0.0 +#define CFG_NETMASK 255.0.0.0 /* Miscellaneous configurable options */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 28315eef765d..f1287844486b 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -333,7 +333,7 @@ #define CONFIG_SERVERIP 192.168.1.1 #define CFG_GATEWAYIP 192.168.1.1 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 0258a70d923b..8f7841163936 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -15,7 +15,7 @@ /* Networking */ #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 4db3465cd9b7..387fb3f69c83 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -35,7 +35,7 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 88505885ca85..4f2addd42d8b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -37,7 +37,7 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7e718b48e423..3cf56e98faf8 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -21,7 +21,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 0e8e24dd7bd2..0c879cc06bc7 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -15,7 +15,7 @@ #define USDHC2_BASE_ADDR 0x5b020000 #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index b8418373abae..c0d5e6f0aa06 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -32,7 +32,7 @@ #undef CFG_IPADDR #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 061c445bd9db..fdaeb6588146 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -22,7 +22,7 @@ #endif #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 808d69d0c865..3da98a5165e4 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -17,7 +17,7 @@ /* NAND support */ #define CFG_IPADDR 192.168.10.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 #define CFG_FDTADDR 0x84000000 diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 0d38645c0e60..1f923c2d4834 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -17,7 +17,7 @@ /* Default Env vars */ #define CFG_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 CFG_NETMASK 255.255.255.0 #define CFG_GATEWAYIP 0.0.0.0 #define CONFIG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */ diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 62e74de8aea3..be295e73caa7 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -18,7 +18,7 @@ /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 3e4309512cc1..e824af8273a1 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -16,7 +16,7 @@ /* Default environemnt variables */ #define CONFIG_SERVERIP 192.168.0.1 #define CFG_IPADDR 192.168.0.2 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ "stdout=serial\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 3ec3caade49c..02a091ee0369 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -49,7 +49,7 @@ #define CONFIG_SERVERIP 192.168.11.1 #define CFG_IPADDR 192.168.11.10 #define CFG_GATEWAYIP 192.168.11.1 -#define CONFIG_NETMASK 255.255.255.0 +#define CFG_NETMASK 255.255.255.0 #if defined(CONFIG_ARM64) /* ARM Trusted Firmware */ diff --git a/include/env_default.h b/include/env_default.h index 5ee28a54960d..0a8ccaf52c3a 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -71,8 +71,8 @@ const char default_environment[] = { #ifdef CFG_GATEWAYIP "gatewayip=" __stringify(CFG_GATEWAYIP) "\0" #endif -#ifdef CONFIG_NETMASK - "netmask=" __stringify(CONFIG_NETMASK) "\0" +#ifdef CFG_NETMASK + "netmask=" __stringify(CFG_NETMASK) "\0" #endif #ifdef CFG_HOSTNAME "hostname=" CFG_HOSTNAME "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c8e0a85c124c..41312519749c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -144,7 +144,7 @@ CFG_MXC_USB_PORTSC CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CFG_NAND_CS_INIT CFG_NETDEV -CONFIG_NETMASK +CFG_NETMASK CONFIG_NORBOOT CONFIG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN -- 2.25.1