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 37467C4167D for ; Sun, 20 Nov 2022 14:16:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A9FEC85422; Sun, 20 Nov 2022 15:09:59 +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="Aq9PT1Yg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A1D88532E; Sun, 20 Nov 2022 15:09:25 +0100 (CET) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (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 0BBC085304 for ; Sun, 20 Nov 2022 15:09: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=trini@konsulko.com Received: by mail-qk1-x729.google.com with SMTP id p18so6536703qkg.2 for ; Sun, 20 Nov 2022 06:09:17 -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=3MywX0VuD45WO7xSR5c+HZaQf4z1rY528LxrZOapDQo=; b=Aq9PT1Ygmyx125q3hrm2uCYBOgmMogzAr/+lv5Q8n5z6eaKQSCDBUuSvEgKK10pkG5 BjvTd1dXKmed/gDegV160CTeaH2DYXMsW+ymbNSQNdH50f0JH/Lzmba8GIXDm/KKcXIQ BaAzT96HuL9NZROO2YE9uasjGQ58V8Mo41pTc= 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=3MywX0VuD45WO7xSR5c+HZaQf4z1rY528LxrZOapDQo=; b=E5puIEtHyNLUFCtx4eV1YmohX1JmoXZE6zWCfvfBObGunuAU0jXwD6xocNLDDfYC7k e7NLI0bA+nQJKMNNTl1dXzpv9jymxnNrbTiJvO0SvZLBNSVnQFuGOHvw/42rJcX6mIA8 T/5uEcxbEyr17G0JytGb4PozN7ewtAKDCNOUK30XBRFBDoLTAS0g5nHxqXvicJceS1Ou Dju/AF9VshnHHOEz51UK7L0a2aqodNld5+TigNXEwa1BlLABCmpToISGYv7qDuJhr7s3 Dj4LEXrd8+NISMAT/OoWMpI+6fkJxRKGFpVn8CMt5rBxwpGr6Xpk7D8rr8Cdy2SqI8n0 GFwA== X-Gm-Message-State: ANoB5pkozszp8TGhZB1xr0NvbBFeTeVhIJxAPa95gkKZhO6BQQz/azXw zBamQILj9sMoeqKBVzEb7P5DpMKydAVosw== X-Google-Smtp-Source: AA0mqf6gEKRDGEP+ETA3E397Y0qCk9BA6vaDZ7sKBY5vTXFUv0QZMLvMqlzz9KpyxxtUsAEQVSaXlQ== X-Received: by 2002:a37:6ca:0:b0:6fa:d53f:d404 with SMTP id 193-20020a3706ca000000b006fad53fd404mr12890299qkg.353.1668953328653; Sun, 20 Nov 2022 06:08:48 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:48 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 140/241] global: Migrate CONFIG_OVERWRITE_ETHADDR_ONCE to CFG Date: Sun, 20 Nov 2022 09:07:30 -0500 Message-Id: <20221120140829.3057894-31-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/M5253DEMO.h | 2 +- include/configs/M5275EVB.h | 2 +- include/configs/eb_cpu5282.h | 2 +- include/env_flags.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index f5b4669b97c7..d3659e7b54a2 100644 --- a/README +++ b/README @@ -1123,7 +1123,7 @@ The following options need to be configured: these parameters. Alternatively, if you define _both_ an ethaddr in the - default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default + default env _and_ CFG_OVERWRITE_ETHADDR_ONCE, a default Ethernet address is installed in the environment, which can be changed exactly ONCE by the user. [The serial# is unaffected by this, i. e. it remains diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index bf31d203e664..3bb22b8d50cd 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -26,7 +26,7 @@ # undef CONFIG_DM9000_DEBUG # define CFG_DM9000_BYTE_SWAPPED -# define CONFIG_OVERWRITE_ETHADDR_ONCE +# define CFG_OVERWRITE_ETHADDR_ONCE # define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 951209fbd750..9f73237749aa 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -39,7 +39,7 @@ #define CFG_SYS_I2C_PINMUX_SET (0x000F) #ifdef CONFIG_MCFFEC -# define CONFIG_OVERWRITE_ETHADDR_ONCE +# define CFG_OVERWRITE_ETHADDR_ONCE #endif /* FEC_ENET */ #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index e8d85bdd78f2..49bf6fa4a280 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -45,7 +45,7 @@ *----------------------------------------------------------------------*/ #ifdef CONFIG_MCFFEC -#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CFG_OVERWRITE_ETHADDR_ONCE #endif /*------------------------------------------------------------------------- diff --git a/include/env_flags.h b/include/env_flags.h index e4e40169aed0..de1cdd013cda 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -48,7 +48,7 @@ enum env_flags_varaccess { #ifdef CONFIG_ENV_OVERWRITE #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma," #else -#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE +#ifdef CFG_OVERWRITE_ETHADDR_ONCE #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc," #else #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo," diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a5c5644e65dd..cb85e39ad2cd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -149,7 +149,7 @@ CFG_NORBOOT CFG_NUM_DSP_CPUS CFG_ODROID_REV_AIN CFG_OTHBOOTARGS -CONFIG_OVERWRITE_ETHADDR_ONCE +CFG_OVERWRITE_ETHADDR_ONCE CONFIG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO CONFIG_PEN_ADDR_BIG_ENDIAN -- 2.25.1