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 83D58C4332F for ; Sun, 20 Nov 2022 13:52:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7AF408526B; Sun, 20 Nov 2022 14:38:20 +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="UjcAiJlR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40B5C85313; Sun, 20 Nov 2022 14:38:14 +0100 (CET) Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (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 407758526B for ; Sun, 20 Nov 2022 14:34:34 +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-x832.google.com with SMTP id cg5so5884217qtb.12 for ; Sun, 20 Nov 2022 05:34:34 -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=79xtcON3Z5+Rst/dZIGO0K9OkohI/b20o1/F2dmKDUE=; b=UjcAiJlR6U5C5TO8MmWBgM6qRfP4YqToTTpJmDRRFhWsqKZW6ye/Rf5b0PoFJ4dEYW HqAEHkSN48wWbXIhazinje17N73cSTdRd0ogwBBy+HHMbRK4mifnDdPVqiOmylyaZ3+s rphKrw9ozsJPGQdbGVadGkzbcZNRl4JaSokDw= 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=79xtcON3Z5+Rst/dZIGO0K9OkohI/b20o1/F2dmKDUE=; b=P30d0IYAuuEme3+zYLCCOE+E3+J7A8RLM0j2CQAP+zBq721INgBDmvyGJjm9O4G0Tf vqkMYUvDQQ57kNkcCej6DlHvgkX1NNumcmJKZv8fB5wHIDWleVKWlQeqbRAb5bKf/MQ+ o2ocZjXve5eumuOZph4ls947tgDEm6hbEC9tkodFufEYShFnA1LnYRvcNFUIH7mm+E2x ercYjWOxtI/t8medcBgjZcdrpChljLWdEBg21fcslNVT9ELSrEmdiYLCGlu27jrPmq31 KqFL3unVOteCivhfWzDy71VW6EHFNF0qdlocaOGcwgxDLwNamHp4+IdaeJU9ZqUDkUHi IWMg== X-Gm-Message-State: ANoB5pkikmhUz833YZjeXT2iOH/aWadnJN5YFW/jDU4COsEEYiNnNBvL NzbPXQySz/E/VqzZgLwiiTzbvxy0QXvPnQ== X-Google-Smtp-Source: AA0mqf4kvC3GNcYohY2KN+9Nh8lCCIQo7LZz1up7NAfwNXSm++eG3l7uv+BQxMPhYpRtrnqOkkmXEQ== X-Received: by 2002:ac8:4688:0:b0:3a5:3622:6831 with SMTP id g8-20020ac84688000000b003a536226831mr3257443qto.479.1668951273711; Sun, 20 Nov 2022 05:34:33 -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.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 055/241] global: Migrate CONFIG_HSMMC2_8BIT to CFG Date: Sun, 20 Nov 2022 08:30:46 -0500 Message-Id: <20221120133352.3055600-56-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 --- drivers/mmc/omap_hsmmc.c | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/omap5_uevm.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index a2595d19e7f6..80dd70f087e2 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -1560,7 +1560,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio, #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \ defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \ defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \ - defined(CONFIG_HSMMC2_8BIT) + defined(CFG_HSMMC2_8BIT) /* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */ host_caps_val |= MMC_MODE_8BIT; #endif diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index c66650c8e8d1..577a622d42c9 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -20,7 +20,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT #ifndef CONFIG_SPL_BUILD #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index dacfd41ccedf..afacf70e74a9 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -36,7 +36,7 @@ #include /* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT /* CPSW Ethernet */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 06de4dbeb6d5..5a795fe99171 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -36,7 +36,7 @@ * we don't need to do it twice. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT #include diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index ac3fcacc68ed..30def6abf8f4 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -49,7 +49,7 @@ #include /* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT /* * Default to using SPI for environment, etc. diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index d7fa2d43914a..8a9a6dfc4c34 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -33,7 +33,7 @@ /* MMC ENV related defines */ /* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT /* Required support for the TCA642X GPIO we have on the uEVM */ #define CFG_SYS_I2C_TCA642X_BUS_NUM 4 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0fc29f456c13..d7265e370d05 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -55,7 +55,7 @@ CFG_G_DNL_UMS_PRODUCT_NUM CFG_G_DNL_UMS_VENDOR_NUM CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME -CONFIG_HSMMC2_8BIT +CFG_HSMMC2_8BIT CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS -- 2.25.1