From patchwork Wed Jan 24 02:09:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 865129 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DPz7uPT8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR7sG2K4bz9s74 for ; Wed, 24 Jan 2018 13:09:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D74A2C21F44; Wed, 24 Jan 2018 02:09:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1E001C21E55; Wed, 24 Jan 2018 02:09:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4033EC21C93; Wed, 24 Jan 2018 02:09:24 +0000 (UTC) Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by lists.denx.de (Postfix) with ESMTPS id 5A56CC21E55 for ; Wed, 24 Jan 2018 02:09:23 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id t22so3145168ioa.7 for ; Tue, 23 Jan 2018 18:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=d+RzAW/YTVIsZhnFjX93Ur12GBy0npPMpEaU4Y+TgDY=; b=DPz7uPT8GoroRj6wRC6JXgJ0egQPF7pWLBuVlj6IEyyM3NSrjzcexafrb3c6DihFwR bSqfBDLBtuNJAIDIFwwwj3QplwIaKYgJ+N3rkf7ASLgBBd+YykTsGkkntz8vDiEAY7LY LSpp8RvtPDT8DxzYc2brZgATxTWHewlyXuhiZbZ3IGlEKZl9Rn3J2syJKWAJ2X21WpGR FLpc3vSZhmcqKST7ePn+FZu5ux+iSLAp8NHVsw6WG3bS7273EsimX1YgujrOZu81eTdq u11D+1MDUwyy7WDNZzJzmhEvX5lwLWTMGo4sJCaFEqC/2rzNWdDZ+qsL3TLkkZyNhVtU 1YXQ== 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=d+RzAW/YTVIsZhnFjX93Ur12GBy0npPMpEaU4Y+TgDY=; b=PFjjxYT9Q/NggnHryAbL9FX/EOqrhIoejRTEVMAlqkbQY5RufZb59Ts6HorwOqJWG5 AMg1oOra0HXBIJBj2NMB0ve2kZFS/x0Uw/EbfJw6sFWWYxZyAPEJX6rMysZZL9GRPOEC A9b/tLvnHsha8y5slP30ClMp1zXabFCaPmlt8sQF2GdeWt5c8Egg0uQK1oq7UHCfTptz jVjz+frEPJtNYYOenDKTz6HO8PkreoN3Bi2xeS+fIPt66Xc3gSL9NypaHFiy5ZxxEBnQ tjorWPzVFGKtYNxU0cMqRY2FeOm3vRyIacIQFNc9g0UWjMGoTc6StkJonM8J/+isJ+cC gHfw== X-Gm-Message-State: AKwxytdZWot8H3B+nZ0KtNQig86YNIdXlOAMmY2IV0lsLCQiZvnfTchR dmzZwOzDTPAb6NFfSFSe4B4= X-Google-Smtp-Source: AH8x224fOfmbmXqGwLd0Bx4RYNkTRl0fEhInyz3qWIR6EviBpgFC0qpXtjuNqgoxCA5BdWWL0tqDCw== X-Received: by 10.107.22.199 with SMTP id 190mr7138606iow.242.1516759761713; Tue, 23 Jan 2018 18:09:21 -0800 (PST) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id y91sm10575087ioi.62.2018.01.23.18.09.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 18:09:21 -0800 (PST) From: Adam Ford To: adam.ford@logicpd.com Date: Tue, 23 Jan 2018 20:09:10 -0600 Message-Id: <1516759750-20769-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Udit Agarwal , Vinitha Pillai-B57223 , u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2] Convert CONFIG_CMD_NAND to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_CMD_NAND Signed-off-by: Adam Ford --- V2: Remove SUNXI default since this is selected when NAND_SUNXI is Since they cannot both recursively check each other. This was causing some trouble. V1: Several boards check for the presence of CONFIG_CMD_NAND instead of CONFIG_NAND when setting up their NAND parameters. This will now define CONFIG_NAND if CMD_NAND is set. cmd/Kconfig | 2 +- configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/pfla02_defconfig | 1 + include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 1 - include/configs/pfla02.h | 1 - include/configs/sama5d27_som1_ek.h | 1 - 13 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 35fe9d5..a16cf74 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -763,7 +763,7 @@ config CMD_MMC config CMD_NAND bool "nand" - default y if NAND_SUNXI + select NAND help NAND support. diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig index e464951..28c9029 100644 --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig index 1e368d7..7acd747 100644 --- a/configs/ls1088aqds_qspi_defconfig +++ b/configs/ls1088aqds_qspi_defconfig @@ -11,6 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig index 659bc4f..cb8b426 100644 --- a/configs/ls1088aqds_sdcard_qspi_defconfig +++ b/configs/ls1088aqds_sdcard_qspi_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig index 19c76b6..5cc652c 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig index 8a08846..62128ed 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_qspi_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index a7466f1..ccba0fc 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig index 2e3c287..c72992e 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 029c9de..59ee623 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 8fbf890..f7d08c1 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -156,7 +156,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index d0066e3..fcc08f5 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -142,7 +142,6 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index ae03310..9f18519 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_NAND /* Enable NAND support */ #define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_NAND_MXS diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index fdf19ad..3c3ddfe 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ /* NAND flash */ -#undef CONFIG_CMD_NAND /* SPI flash */ #define CONFIG_SF_DEFAULT_SPEED 66000000