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 B0FAAC433FE for ; Sun, 20 Nov 2022 14:10:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A8E1852EB; Sun, 20 Nov 2022 15:09:00 +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="OuLotbBN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D815852C7; Sun, 20 Nov 2022 15:08:42 +0100 (CET) Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (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 9E9A285298 for ; Sun, 20 Nov 2022 15:08: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=trini@konsulko.com Received: by mail-qv1-xf31.google.com with SMTP id cz18so172508qvb.13 for ; Sun, 20 Nov 2022 06:08:38 -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=5gVzBU8aJ6QSiWacMBWkG+4M2ouL5NyjKJZ2Z8msOPI=; b=OuLotbBNorXWHgYxAMfn7zWPDi+HpFEBGuNdoRgq+qcaS6TKWtto4La2ffZSK7LTGt +q9QBpuOHSqj/1ImMt4uAfAqEhXKEeS4Z3gRysFjKnQGX+VAQnGDicaolwdE4ydPIgj6 tdiKbMCiQAcgsBhPcb0O0p31C8evlzdzg1j/M= 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=5gVzBU8aJ6QSiWacMBWkG+4M2ouL5NyjKJZ2Z8msOPI=; b=QqHjfHr8nYUc0NiVPB04nE5J6wmal960cFq051zpqGGJqTHLCJqDJXZ7T55o/Xe94K nRfmk3f0wNPHeQPaj+Q8tOfe75b0Mp26JhVbCDi0zhfIH6G2xjhVnWVHHhey7RD/7uWd /2M1gV1ONgd92shG+0plYfhuVBVervHH1oST7FfepzxJIOUajVfv2Lx+TEqGRlVX7Lux ZZEvzOTcHuwTBXGsSf7uW/Ia5HUno4xHW1kkVa/q0FctD6n7WPTNgkRUu5+B9hNhI/oJ zdK8hYDF7mJBba5pbLK8RqwBl9uJ9tsOEKkKzghAPoEb9Qp/3+By6gOleekjQHtN6Evv PF5w== X-Gm-Message-State: ANoB5pmeEyQlSjaLnc+TZHlwK0Lv4ZfRmnSF7ovkWcVUhAJFFL8l8ypy 0zDGiAeabAdrFnugifw+tciv/FFGVccDkg== X-Google-Smtp-Source: AA0mqf7gefSxv0ll8qNQb6DzdwLxisusF87Y0ljnEQLwuHGF3k2NX8U76C108j3+GjlUFX59OBm8fg== X-Received: by 2002:a05:6214:3113:b0:4bb:7436:49de with SMTP id ks19-20020a056214311300b004bb743649demr13717875qvb.27.1668953317190; Sun, 20 Nov 2022 06:08:37 -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.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:08:36 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 121/241] global: Migrate CONFIG_MMC_SUNXI_SLOT to CFG Date: Sun, 20 Nov 2022 09:07:11 -0500 Message-Id: <20221120140829.3057894-12-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 --- board/sunxi/board.c | 4 ++-- include/configs/sunxi-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 21a2407e062f..356e5f07f688 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -526,8 +526,8 @@ static void mmc_pinmux_setup(int sdc) int board_mmc_init(struct bd_info *bis) { if (!IS_ENABLED(CONFIG_UART0_PORT_F)) { - mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT); - if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT)) + mmc_pinmux_setup(CFG_MMC_SUNXI_SLOT); + if (!sunxi_mmc_init(CFG_MMC_SUNXI_SLOT)) return -1; } diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index f3c8f7002342..1be4cde2b70e 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -70,7 +70,7 @@ #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */ /* mmc config */ -#define CONFIG_MMC_SUNXI_SLOT 0 +#define CFG_MMC_SUNXI_SLOT 0 /* * Miscellaneous configurable options diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a31178b8b6e7..4185a1b9c003 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -129,7 +129,7 @@ CFG_MII_DEFAULT_TSEC CFG_MIU_2BIT_21_7_INTERLEAVED CFG_MIU_2BIT_INTERLEAVED CFG_MMC_DEFAULT_DEV -CONFIG_MMC_SUNXI_SLOT +CFG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS -- 2.25.1