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 42772C433FE for ; Sun, 20 Nov 2022 13:37:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BCE648529F; Sun, 20 Nov 2022 14:34:38 +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="UmsFheDz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A45C85222; Sun, 20 Nov 2022 14:34:13 +0100 (CET) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 8FAD285222 for ; Sun, 20 Nov 2022 14:34:08 +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-x731.google.com with SMTP id p18so6506849qkg.2 for ; Sun, 20 Nov 2022 05:34:08 -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=+4eK+pZpSC1ykqjU8gud+o4KPgTAlOS26RCes2YFW/g=; b=UmsFheDzkxIL+aUmyFUn4dmqSn4mUCNyvMN2j/yLnUPIyhvYyzEzGFU2SyZTC6rJgh SPPjzH4SpbECSLFa4H3Y3YI6sKKbePHeXd6fZbMcSoAWKOd80gvi8JGmLP/UID0O7QyG inbL8q+eW9BGxBFWXU6zjCzUu2gixGgNISULo= 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=+4eK+pZpSC1ykqjU8gud+o4KPgTAlOS26RCes2YFW/g=; b=ZtqVv+ZAAD+9iz5G2fcrYgTlTB4PBVhHp9k68k/7rEKeQuX40a/MKU9yuodDd3gYjX IUlhMge3jqo35FoY25hC29xk6ufCAmIkGjNTYfVLgqV2cS0OYIoWMyRr098GNDWG8tbL F0JI6p479vHrO8zrPNwt7GiiMzxRJKJsLITyVzJEG/woKuryCWjnir/2jsZ4AW+4jbjU 0QJ1gIPXfd/3zL0hk4iTQPnVt1bkmFJ5cPOgXRg3tdER3t5AQXA2tKSLofdDZf/2TqM5 xrn+yRbcxdZmaH5PWfB01rMczLKOGhn1MVqB61EX1RaJoTrbK82n9BIvU3shuIuTejy8 IKKQ== X-Gm-Message-State: ANoB5pnxZeMu5+Rdy2U9Wzf+brR1Xq+pUzOHZTrWnk0mXX5OJgVbyVz8 CmgE3lWKg+JhacmeFPapux9npO0AiKrxug== X-Google-Smtp-Source: AA0mqf4YlxtC5YxVNWozkb4QWSukjU5NiuTIha/bVIj14EGFNBqxl1A/BcqfDjpZzI5eadHakJ9TJA== X-Received: by 2002:a37:9a15:0:b0:6fb:6221:18a3 with SMTP id c21-20020a379a15000000b006fb622118a3mr12986148qke.230.1668951248025; Sun, 20 Nov 2022 05:34:08 -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.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:07 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 017/241] global: Migrate CONFIG_ENV_SROM_BANK to CFG Date: Sun, 20 Nov 2022 08:30:08 -0500 Message-Id: <20221120133352.3055600-18-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/samsung/smdkc100/smdkc100.c | 6 +++--- board/samsung/smdkv310/smdkv310.c | 6 +++--- include/configs/exynos5-common.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smdkv310.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index b944e44c1ac4..4f46911b0b4d 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -25,16 +25,16 @@ static void smc9115_pre_init(void) u32 smc_bw_conf, smc_bc_conf; /* gpio configuration GPK0CON */ - gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); + gpio_cfg_pin(S5PC100_GPIO_K00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); /* Ethernet needs bus width of 16 bits */ - smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bw_conf = SMC_DATA16_WIDTH(CFG_ENV_SROM_BANK); smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe) | SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4) | SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0); /* Select and configure the SROMC bank */ - s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); + s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); } int board_init(void) diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c index bb61ba1f81c6..47483a26a622 100644 --- a/board/samsung/smdkv310/smdkv310.c +++ b/board/samsung/smdkv310/smdkv310.c @@ -24,17 +24,17 @@ static void smc9115_pre_init(void) u32 smc_bw_conf, smc_bc_conf; /* gpio configuration GPK0CON */ - gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); + gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); /* Ethernet needs bus width of 16 bits */ - smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bw_conf = SROMC_DATA16_WIDTH(CFG_ENV_SROM_BANK); smc_bc_conf = SROMC_BC_TACS(0x0F) | SROMC_BC_TCOS(0x0F) | SROMC_BC_TACC(0x0F) | SROMC_BC_TCOH(0x0F) | SROMC_BC_TAH(0x0F) | SROMC_BC_TACP(0x0F) | SROMC_BC_PMC(0x0F); /* Select and configure the SROMC bank */ - s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); + s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); } int board_init(void) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index dd322c2b3a79..0490c2dad53e 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -50,7 +50,7 @@ /* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/ /* Enable Time Command */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index ffa1a1fcb0ef..ccb7ec38d033 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -94,7 +94,7 @@ * Ethernet Contoller driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ +#define CFG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ #endif /* CONFIG_CMD_NET */ #endif /* __CONFIG_H */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index af0c8200fc23..1f137dba90f7 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -42,7 +42,7 @@ /* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/ #endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 831f8a99ea5c..5de121b41ca0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -17,7 +17,7 @@ CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 -CONFIG_ENV_SROM_BANK +CFG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE CONFIG_ETHBASE -- 2.25.1