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 025B8C433FE for ; Sun, 20 Nov 2022 13:43:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23860852EB; Sun, 20 Nov 2022 14:35:24 +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="dr9lP87Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AB0C285280; Sun, 20 Nov 2022 14:34:38 +0100 (CET) Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (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 9259185261 for ; Sun, 20 Nov 2022 14:34:35 +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-x835.google.com with SMTP id s4so5904465qtx.6 for ; Sun, 20 Nov 2022 05:34:35 -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=SlDSo4zL+PzAK/0nasnGnSRM1sg2Ts2DYbd8QpPjQ94=; b=dr9lP87ZzqfAGV1zw6tHama9wVB/aU88OqoEyic/u8nsQHP6lRqRkVIAW2Pxl3BZJm QQHuyFBXAJwLpb4YrXsM8/7NYi4VA+DDhPM+dd02yq1vIjAE8Re8jKQRq5p7NyF/9iWo LQRS+4YFAD/4YZgDzIPdgZAgJDVfoLsmZl87o= 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=SlDSo4zL+PzAK/0nasnGnSRM1sg2Ts2DYbd8QpPjQ94=; b=WGn6jD7yorSeiB168JUOpFrB6hqWSzgZvut8c6/Vn3JztNE7UBNWiXe2UpMt1CNG1h Rd+0qtA7MkKglMqGTdHZVXZbRrbvcBNoVCKAZFB6lZb3SQWJpgA7ZAmnFm5q2P4jlQ/O r7bjrWFcRWX2bvppuHP0CmL7aEt6DIf1TApwytYImQBmetWm9Ln8vux41EF6zS7Wi9+u 6n33hbv+aOUVZv1WbtZqWc1t9iU38ZHTML+u2aRA4v2KV+pRmWz1eVdYWbQ2xFqd302U HrVOei+MYqG0FE+GmpQXKnSk5aZr6nqhkufY3CbRn6jPQcKmb/m7YYdsS3WUd6nFKjni Mi1w== X-Gm-Message-State: ANoB5plpHdg5vJrOwK/PzxOeR0xbWhSZ6gdDziIhrCAdxfeY/wXC0Br6 YQ/yI3po3yPmzyVAEoeOYyX7+Uc4VGC4Kw== X-Google-Smtp-Source: AA0mqf6oi9CPvN8dQG7foVwZi/PBEBozUiSwnv2DUBe6SrnYbcv7gO+CH29naofcVnWnSSXVo649aw== X-Received: by 2002:ac8:100f:0:b0:3a5:eeb:88a8 with SMTP id z15-20020ac8100f000000b003a50eeb88a8mr13818146qti.1.1668951275060; Sun, 20 Nov 2022 05:34:35 -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.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:34 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 057/241] global: Migrate CONFIG_I2C_ENV_EEPROM_BUS to CFG Date: Sun, 20 Nov 2022 08:30:48 -0500 Message-Id: <20221120133352.3055600-58-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 --- env/Kconfig | 4 ++-- env/eeprom.c | 18 +++++++++--------- scripts/config_whitelist.txt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index 5a7e2f299b06..1c7a414321ce 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -78,12 +78,12 @@ config ENV_IS_IN_EEPROM still be one byte because the extra address bits are hidden in the chip address. - - CONFIG_I2C_ENV_EEPROM_BUS + - CFG_I2C_ENV_EEPROM_BUS if you have an Environment on an EEPROM reached over I2C muxes, you can define here, how to reach this EEPROM. For example: - #define CONFIG_I2C_ENV_EEPROM_BUS 1 + #define CFG_I2C_ENV_EEPROM_BUS 1 EEPROM which holds the environment, is reached over a pca9547 i2c mux with address 0x70, channel 3. diff --git a/env/eeprom.c b/env/eeprom.c index f8556a47213c..192e0f3af6d0 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -15,7 +15,7 @@ #include #include #include -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) #include #endif #include @@ -28,16 +28,16 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) { int rcode; -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) int old_bus = i2c_get_bus_num(); - if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS) - i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS); + if (old_bus != CFG_I2C_ENV_EEPROM_BUS) + i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS); #endif rcode = eeprom_read(dev_addr, offset, buffer, cnt); -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif @@ -48,16 +48,16 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) { int rcode; -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) int old_bus = i2c_get_bus_num(); - if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS) - i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS); + if (old_bus != CFG_I2C_ENV_EEPROM_BUS) + i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS); #endif rcode = eeprom_write(dev_addr, offset, buffer, cnt); -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 44956bff3940..440bef90575d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,7 @@ CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME CFG_HSMMC2_8BIT CFG_HW_ENV_SETTINGS -CONFIG_I2C_ENV_EEPROM_BUS +CFG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS CONFIG_I2C_MVTWSI CONFIG_I2C_MVTWSI_BASE0 -- 2.25.1