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 63A37C433FE for ; Sun, 20 Nov 2022 14:11:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAE5E8532E; Sun, 20 Nov 2022 15:09:25 +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="pJFJbaWO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9042852CE; Sun, 20 Nov 2022 15:08:44 +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 A7689852AA for ; Sun, 20 Nov 2022 15:08:40 +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 w4so5971630qts.0 for ; Sun, 20 Nov 2022 06:08:40 -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=xGP8/vt35sYIE/oWfJM17YIvF3z0tD29baZKT7YaV1o=; b=pJFJbaWOD5O+1rh/TThvvL1KWapZbcMa4BeD+IUBDK8TydH8lxgIKzU3XUU/alS70w Ph6GpcIRcMU4aCPNRbUMQlzDn2oM8/RCI7UevVz6ogt5CABGG4NKXtfhmxOVf8INvslp SqYG/UgsxjRd3lE2zBAC/08R1/3HPThS/pao8= 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=xGP8/vt35sYIE/oWfJM17YIvF3z0tD29baZKT7YaV1o=; b=DRJx8229ooVhExB0rcmnXH5JI93OfX+4nO3fp/kIZ4Y8KZBpStxVJAYjQnmcCBDFDb fliB0Nt8VSrCECY4Y49cU16tijZwFpcg0nZlnmxkwONg1F49djxSRUN/kIXLQ0S4tCug qR8FZAGw7x6Ua2IEPZ8m3UbUmvzp5NGHouOlZ9X4sOlqaEqYomFG/+WlTf2k8o6waR1x IeKie76QR+LmLLg0MGxXRB7NwOxYvb+mR4YHbKBRde/o3cPoXs4Kawxjv/4y+cnVrtm/ PFu1BC4FrZOsUhQNiLEG8nOqAUySaJOnMgdEP91yWqzBjtjWLKBeyjraK+0vJwDqdbGE uGwA== X-Gm-Message-State: ANoB5pnPht6En7ZKqLBEjlTL+H4biXoHhh2N/D9V4Q+ezIZCKqhZaHyz cjSW8lRlB7ItjHIhLvdKPQ0eDIMRYiyMnA== X-Google-Smtp-Source: AA0mqf5S6CBKkgD6KjMPFe5vW14XzS+Yml48eK5B5c7pwg6xUx6v3Y6hMcK78GHP5K65O8qXQKJGvQ== X-Received: by 2002:a05:622a:1b09:b0:3a5:92a5:4455 with SMTP id bb9-20020a05622a1b0900b003a592a54455mr14000859qtb.113.1668953319015; Sun, 20 Nov 2022 06:08:39 -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.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 124/241] global: Migrate CONFIG_MVGBE_PORTS to CFG Date: Sun, 20 Nov 2022 09:07:14 -0500 Message-Id: <20221120140829.3057894-15-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 --- drivers/net/mvgbe.c | 6 +++--- include/configs/SBx81LIFKW.h | 2 +- include/configs/SBx81LIFXCAT.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/openrd.h | 4 ++-- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/sheevaplug.h | 2 +- scripts/config_whitelist.txt | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index a77c05743262..373bb8b0d239 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -37,8 +37,8 @@ DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_MVGBE_PORTS -# define CONFIG_MVGBE_PORTS {0, 0} +#ifndef CFG_MVGBE_PORTS +# define CFG_MVGBE_PORTS {0, 0} #endif #define MV_PHY_ADR_REQUEST 0xee @@ -832,7 +832,7 @@ int mvgbe_initialize(struct bd_info *bis) struct eth_device *dev; int devnum; int ret; - u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS; + u8 used_ports[MAX_MVGBE_DEVS] = CFG_MVGBE_PORTS; for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) { /*skip if port is configured not to use */ diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index bad34d9771ec..861ae530336a 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -43,7 +43,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ +#define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 9a9663b34ba8..418221ca72b3 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -48,7 +48,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ +#define CFG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 2a70db5e9382..8a9591ff29e1 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -20,7 +20,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #endif /* diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 07cec38b50d0..68afe96239e6 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -31,7 +31,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_DOCKSTAR_H */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 733020d3e261..2b312e52b135 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -27,7 +27,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +#define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index ede21a4e2c57..a5f62497a731 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -39,7 +39,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable one port */ +#define CFG_MVGBE_PORTS {1, 0} /* enable one port */ #define CONFIG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index bc517286b113..c10e991d6589 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -39,7 +39,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index c4f53e6e4004..b21151e312c9 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -34,7 +34,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +#define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ #define CONFIG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 242f92e6fd72..5eeaeadd4bec 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -28,7 +28,7 @@ * Ethernet driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index f719ecb5fe0b..12f8a3c933cc 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -22,7 +22,7 @@ * This board has PCIe Wifi card, so allow Ethernet to be disabled */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 11 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index db45585ba313..ea3a5215e8c9 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -18,7 +18,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #endif /* diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 9676ccc982f5..bfa132dbfe58 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -43,7 +43,7 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 8 #endif /* CONFIG_CMD_NET */ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 76c4aed6fd91..85cbd0bab07d 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -47,7 +47,7 @@ #endif /* CONFIG_SPL_BUILD */ /* Ethernet driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 1 #endif /* _CONFIG_NSA310S_H */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index ec3a0e0676d7..1d1915a98520 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -38,9 +38,9 @@ */ #ifdef CONFIG_CMD_NET # ifdef CONFIG_BOARD_IS_OPENRD_BASE -# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +# define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ # else -# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +# define CFG_MVGBE_PORTS {1, 1} /* enable both ports */ # endif # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE # define CONFIG_PHY_BASE_ADR 0x0 diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index af750e86ee98..c48590123bd2 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -26,7 +26,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_E02_H */ diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 016da6d04b0b..5d26a45f1426 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -72,7 +72,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_POGO_V4_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index a228dac2ee92..d4d968285fbd 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -24,7 +24,7 @@ /* * Ethernet Driver configuration */ -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 24d09c1a4be2..92dec899cad7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -132,7 +132,7 @@ CFG_MMC_DEFAULT_DEV CFG_MMC_SUNXI_SLOT CFG_MONITOR_IS_IN_RAM CFG_MTD_NAND_VERIFY_WRITE -CONFIG_MVGBE_PORTS +CFG_MVGBE_PORTS CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE -- 2.25.1