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 E3FDDC433FE for ; Sun, 20 Nov 2022 13:35:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E2D18524F; Sun, 20 Nov 2022 14:34:15 +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="APwyUf0o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D93A0851E9; Sun, 20 Nov 2022 14:34:04 +0100 (CET) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (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 1B0BA851A9 for ; Sun, 20 Nov 2022 14:34:01 +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-qv1-xf34.google.com with SMTP id n12so418977qvr.11 for ; Sun, 20 Nov 2022 05:34:01 -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=hp+kFtbATPihNIJ/PNhIzhvW+mXy2YXp8Pd3qcLmrPs=; b=APwyUf0oYO7ht8+O5jHC5XcpCrkMAZB1iTPr5zgvlbmeWmckdsMf/ujlGFnb7sazva BCTrxNJMZ6e2xiiRedeRh484h58tyD5n0G9pdumE8ZLJaoEMmmbQ8hguZoXm4qcneMf/ +oRuQeb1Bx8ku6hO3aR19BqtGrmdWotNJ06KI= 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=hp+kFtbATPihNIJ/PNhIzhvW+mXy2YXp8Pd3qcLmrPs=; b=EQkYtQthp6HVv2oAHEbFOSLiHz5rwe+swfCQKWQVMqnYywzcDVAhIiRCW4G0dnNY9O UJWjM0qtTi3asYPyq3Lvj8RAjIey4AgvkaCKrRQB43o3sHh2pxKeuXaNFEV2IE7j48zG C6T5h2JM1yEOtwou/zxIBVMEFRiYGFGOryg/ETTOYSxbfqrUy98cROX9oFP++GEPaxth ZF7gu33eoqOCJcLN3n5cp2inW903vJADaofS2Sc1eX3TWpNlFWa2D7b2IhK9eOCdRz0H sAz2GpVarcv6bISJJKcc2l3yqfHiVzYASaU/8QV8cbVMTEuRj1C1WIlBeihy+ZGvuiyG H/oA== X-Gm-Message-State: ANoB5pmMyTjQYiIGhGemkYeka1DQsVVp5XIlBODUETq4OKS2MGF3ru2z cKlmde7900JmYInt6gq58RTLh/eJDI19hA== X-Google-Smtp-Source: AA0mqf4nSD5Ez47jxXQGsRKNZt/QD360UJOic3GepMb051a9gdSb4u6UMOhMBr32Vou3H0XPOZIrHA== X-Received: by 2002:a05:6214:3512:b0:4c6:9d70:b3a8 with SMTP id nk18-20020a056214351200b004c69d70b3a8mr4708940qvb.74.1668951239755; Sun, 20 Nov 2022 05:33:59 -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.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:33:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 005/241] global: Migrate CONFIG_DM9000_BASE to CFG Date: Sun, 20 Nov 2022 08:29:56 -0500 Message-Id: <20221120133352.3055600-6-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 --- board/timll/devkit8000/devkit8000.c | 4 ++-- include/configs/M5253DEMO.h | 6 +++--- include/configs/at91sam9261ek.h | 6 +++--- include/configs/ci20.h | 6 +++--- include/configs/devkit8000.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 0808ca1a54c0..39103de02ed4 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -79,7 +79,7 @@ int board_init(void) static void gpmc_dm9000_config(void) { enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], - CONFIG_DM9000_BASE, GPMC_SIZE_16M); + CFG_DM9000_BASE, GPMC_SIZE_16M); } /* @@ -102,7 +102,7 @@ int misc_init_r(void) #ifdef CONFIG_DRIVER_DM9000 /* Configure GPMC registers for DM9000 */ enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], - CONFIG_DM9000_BASE, GPMC_SIZE_16M); + CFG_DM9000_BASE, GPMC_SIZE_16M); /* Use OMAP DIE_ID as MAC address */ if (!eth_env_get_enetaddr("ethaddr", enetaddr)) { diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 7e37c6d11997..223a843fc695 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -20,9 +20,9 @@ env/embedded.o(.text*); #ifdef CONFIG_DRIVER_DM9000 -# define CONFIG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300) -# define DM9000_IO CONFIG_DM9000_BASE -# define DM9000_DATA (CONFIG_DM9000_BASE + 4) +# define CFG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300) +# define DM9000_IO CFG_DM9000_BASE +# define DM9000_DATA (CFG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG # define CONFIG_DM9000_BYTE_SWAPPED diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 56247e390bf6..d58c0f4bbe24 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -35,9 +35,9 @@ #endif /* Ethernet */ -#define CONFIG_DM9000_BASE 0x30000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 4) +#define CFG_DM9000_BASE 0x30000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT #define CONFIG_DM9000_NO_SROM diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 3329c24fa68c..bc8b699b84f8 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -18,9 +18,9 @@ #define CFG_SYS_NS16550_CLK 48000000 /* Ethernet: davicom DM9000 */ -#define CONFIG_DM9000_BASE 0xb6000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 2) +#define CFG_DM9000_BASE 0xb6000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 2) /* Miscellaneous configuration options */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 46410595c2bc..824e0e448eea 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -18,9 +18,9 @@ /* Hardware drivers */ /* DM9000 */ -#define CONFIG_DM9000_BASE 0x2c000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 0x400) +#define CFG_DM9000_BASE 0x2c000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 0x400) #define CONFIG_DM9000_USE_16BIT 1 #define CONFIG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 414f0078e4d7..7c6fc0a07bf7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5,7 +5,7 @@ CFG_DFU_ALT_BOOT_EMMC CFG_DFU_ALT_BOOT_SD CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS -CONFIG_DM9000_BASE +CFG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT -- 2.25.1