From patchwork Tue May 26 19:06:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1298337 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 49Wk3005lQz9sVH for ; Wed, 27 May 2020 05:06:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F406C81CC1; Tue, 26 May 2020 21:06:29 +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 CCD9A81CC1; Tue, 26 May 2020 21:06:27 +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-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (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 0252780677 for ; Tue, 26 May 2020 21:06:24 +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-qk1-f196.google.com with SMTP id c12so2906007qkk.13 for ; Tue, 26 May 2020 12:06:24 -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; bh=8liT+uBclNn853fyb2zfQfOZwYLLenb9vi73BwZc5mo=; b=SJe+CFq2pI2afg3Su1an9a5mOpKF2L5O/gomnlFWvCoGgCpdA3IkG+hKSGA5As2LgN sQ3FsZ4hGB0HhKhqjpxT4ZRg61bzceARSjrlvf8kbtgLV9n0Euw7u7vlxcP0v+6cFUyA CnywSNOwk5zKpcTcSRZDy6L+TLAORw4X1ukjmkZI6boEfglM5MOh/w7iRvtYXJ+LAf1N GgiRPxTlRqmxX/724r19ibJBMEJ8PNX40xoRoeuQmbkymLbHs9Fz7+t2nWVEeeoNLC+6 C2pAhPv5fPbV/JEABilbgLRyLotyZDl/LjQBP/pNuDvKIEt1fn4jSNDC5AWsD+ZTaEQG M7zQ== X-Gm-Message-State: AOAM5314Tsnqx7xeDVCq8KDntiJ3Z1FjBI9aUx8DGoYgVR3sSI1FUhjM Tu2g6m/ei29Dczg/tW22Yt6RQTMOYA== X-Google-Smtp-Source: ABdhPJxgRh2CMAJ9pILXXjajDw9hYu6uoTMvce7x96m3N/oqljoLiIMIDiZA5DjO3Y+4ZPnpLtHd9g== X-Received: by 2002:a37:be87:: with SMTP id o129mr305063qkf.7.1590519982963; Tue, 26 May 2020 12:06:22 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 12:06:22 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Stefano Babic Subject: [PATCH 1/8] pfla02: Rework excluding NAND from SPL Date: Tue, 26 May 2020 15:06:12 -0400 Message-Id: <20200526190619.29583-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 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 Rather than only enable CONFIG_CMD_NAND for non-SPL builds, move the CMD options to defconfig and rework the guards to not try and call the function in SPL builds. Cc: Stefano Babic Signed-off-by: Tom Rini Acked-by: Stefano Babic --- A grep around for setup_gpmi_nand() shows that other platforms will just make an empty function in similar situations. --- board/phytec/pfla02/pfla02.c | 8 ++++---- configs/pfla02_defconfig | 2 +- include/configs/pfla02.h | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index fed8f52e3e1d..0a961cc8a5a4 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -117,7 +117,7 @@ static iomux_v3_cfg_t const gpios_pads[] = { IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) /* NAND */ static iomux_v3_cfg_t const nfc_pads[] = { IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL)), @@ -274,7 +274,7 @@ static void setup_gpios(void) SETUP_IOMUX_PADS(gpios_pads); } -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) static void setup_gpmi_nand(void) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; @@ -361,7 +361,7 @@ int board_init(void) setup_gpios(); -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) setup_gpmi_nand(); #endif return 0; @@ -657,7 +657,7 @@ void board_init_f(ulong dummy) .refr = 7, /* 8 refresh commands per refresh cycle */ }; -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) /* Enable NAND */ setup_gpmi_nand(); #endif diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 5e5bbb05bd5e..52cebd9e22ed 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -37,7 +37,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -# CONFIG_CMD_NAND is not set +CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index d4a7de7df6a2..4162a71ca661 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -41,15 +41,11 @@ #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 0 */ #define CONFIG_SYS_I2C_SPEED 100000 -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_NAND /* Enable NAND support */ -#define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_ONFI_DETECTION -#endif /* DMA stuff, needed for GPMI/MXS NAND support */