From patchwork Thu Jan 30 13:10:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1231419 X-Patchwork-Delegate: sbabic@denx.de 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=JsEDuvjX; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 487ggz1V23z9s1x for ; Fri, 31 Jan 2020 00:10:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ACDC581764; Thu, 30 Jan 2020 14:10:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1580389819; bh=eQj1V7yY31iCSaX8RVzGDxWF2VXtcb7iwt8roW3cjW0=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=JsEDuvjXBhZBFaJNfkBYu7XIB4DvW5m6z5zrjEG8w3Xgxu5lakgBLiQvEtaayOiTO DDSJnSt9u91nVpidV9aJ2D8qIUDVeuWCpk+LeL+bB/cMIupSBtrYy688wa6iT8pBcb nkKeZR+DJlpJbdr4eDe2I1MHkk0nRiDEDJeH/NVoatbzPfje9E6cVcNyIljFMCPLhN x57zQTm5j9UeiUGOHCJB9JII3qr1l+pjieWuwP7HYmMSxDqkwuVc1Bp1tcIEpg8+PH dxUZUWXochp6hi905X9tAOgHtloflNfnj+jzikiflB0a921LG8uLAjE3CWlodBQtSK OmFsprBtnx6qQ== Received: by phobos.denx.de (Postfix, from userid 109) id 9F64581766; Thu, 30 Jan 2020 14:10:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DBFB980929 for ; Thu, 30 Jan 2020 14:10:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=hs@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 487ggn5SfTz1rfcl for ; Thu, 30 Jan 2020 14:10:13 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 487ggn5Mh5z1qqlC for ; Thu, 30 Jan 2020 14:10:13 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id rxyaFu3ZmaLv for ; Thu, 30 Jan 2020 14:10:13 +0100 (CET) X-Auth-Info: //74PGMHqwaCeie/IYbSFwnLkaejHLSy7R/Rrk9IDRE= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Thu, 30 Jan 2020 14:10:13 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id EEFF7184C49; Thu, 30 Jan 2020 14:10:07 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id D15751A005C; Thu, 30 Jan 2020 14:10:07 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Subject: [PATCH] imx6: aristainetos: fix NAND detection with latest mainline Date: Thu, 30 Jan 2020 14:10:05 +0100 Message-Id: <20200130131005.4092249-1-hs@denx.de> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 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.101.4 at phobos.denx.de X-Virus-Status: Clean commit 88718be30010 ("mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND") moved CONFIG_NAND -> CONFIG_MTD_RAW_NAND. Adapt board code to this change, as last merge did not respect the above commit. Signed-off-by: Heiko Schocher --- board/aristainetos/aristainetos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index c79ac1d339..3541717873 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -521,7 +521,7 @@ struct display_info_t const displays[] = { }; size_t display_count = ARRAY_SIZE(displays); -#if defined(CONFIG_NAND) +#if defined(CONFIG_MTD_RAW_NAND) iomux_v3_cfg_t nfc_pads[] = { MX6_PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NO_PAD_CTRL), MX6_PAD_NANDF_ALE__NAND_ALE | MUX_PAD_CTRL(NO_PAD_CTRL),