From patchwork Tue May 26 19:06:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1298338 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Wk396FZCz9sVV for ; Wed, 27 May 2020 05:06:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1576681CAA; Tue, 26 May 2020 21:06:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id A6FB181CC1; Tue, 26 May 2020 21:06:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) (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 6833D818F9 for ; Tue, 26 May 2020 21:06:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f66.google.com with SMTP id y9so315980qvs.4 for ; Tue, 26 May 2020 12:06:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ny8t6ccnauugR5tXFbRsjgojFF2EocE5m7wWELH2wik=; b=OZ7jcrI11wYpWlgkpQKrqlzNOga97oCbcG4uyRlE8lt2Q6oIuZry8So2gU0cDHk1RA kN5IxjpqzHvKmJcgmwwM0XnJYWCtjDiGldRNT47MDdnzO0OUhyTJogT/lH93AaBpPcpD iqlfwyb6JWvJQkhyEVpXdyI3x5SmT2xIv+HVgJHBLkSU1ic3orUk6HiVMl/4kHM9OFaH Dts09S1pBBJUoM1I2YAmSLg5G4LSL5arcEMAbFxKi51vi2G2MOKHxT15IxSWndGRqARX xjJX+Jr8SaLcQYJcEPM2spqpAcxOUnpznT3Yc9D3Rp0kfyFagtcdolLpSAM6dNHQWNno IEaQ== X-Gm-Message-State: AOAM533Raqe/gcs/gA7CZNXxwGMXtGnKwae7US03spAt7c3z/YFCqVWS uHOQVbEkyTUsq6veIBEtVNrp8bbrww== X-Google-Smtp-Source: ABdhPJwR5rmb06KzizndybEXt45xJ3AjD9pfteKT2y+RDWqFQY+AgH+zhht9mL7Wc7vEwpupAXJ2hA== X-Received: by 2002:a0c:b44c:: with SMTP id e12mr21105850qvf.30.1590519983865; Tue, 26 May 2020 12:06:23 -0700 (PDT) Received: from bill-the-cat.local (2606-a000-1401-826f-11dd-a836-9d7f-3845.inf6.spectrum.com. [2606:a000:1401:826f:11dd:a836:9d7f:3845]) by smtp.gmail.com with ESMTPSA id y185sm10618qkd.83.2020.05.26.12.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 12:06:23 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Eric Nelson Subject: [PATCH 2/8] mx6memcal: Finish migration to defconfig options Date: Tue, 26 May 2020 15:06:13 -0400 Message-Id: <20200526190619.29583-2-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200526190619.29583-1-trini@konsulko.com> References: <20200526190619.29583-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean The config header for this platform uses '#undef' in a number of cases. All of the MMC related ones were already handled correctly in the defconfig file. In the case of CONFIG_CMD_FUSE, the command was being built and enabled via defconfig. Disable it in the defconfig, cleanup the header. Cc: Eric Nelson Signed-off-by: Tom Rini --- configs/mx6memcal_defconfig | 1 + include/configs/mx6memcal.h | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 8b5e0ff9b134..ed24b7996b6b 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x20000000 +# CONFIG_CMD_FUSE is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_CACHE=y diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index 3d79a7e43765..b774b167f648 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -13,11 +13,6 @@ #include "mx6_common.h" #include "imx6_spl.h" -#undef CONFIG_MMC -#undef CONFIG_SPL_MMC_SUPPORT -#undef CONFIG_GENERIC_MMC -#undef CONFIG_CMD_FUSE - #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) #define CONFIG_MXC_UART