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 865E0C433FE for ; Sat, 19 Nov 2022 23:51:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E100C852AF; Sun, 20 Nov 2022 00:46:47 +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="Nm0qHtQi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D29685129; Sun, 20 Nov 2022 00:46:15 +0100 (CET) Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (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 5760C850EA for ; Sun, 20 Nov 2022 00:46: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=trini@konsulko.com Received: by mail-qv1-xf2b.google.com with SMTP id p8so5170434qvn.5 for ; Sat, 19 Nov 2022 15:46:00 -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=yISrF5nTwTbFGaRCoJ5pZVumuXkOahAhh3FkXdT+Q/A=; b=Nm0qHtQirB8oOe1/Q1yManoZZqosJYQX8FKWlhK9pT1HhLYfEau8p5fvQzNFHPnUwd un8H4ae1+D92j/bqDL+Wuknm2xt9kiz3LHbp2Rqc17XZvjVKz2X55y2Bf3jto4Ygmunq E0ifoHxZw1qCP4NQlJc9oNxNg/NqRFaB58mOc= 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=yISrF5nTwTbFGaRCoJ5pZVumuXkOahAhh3FkXdT+Q/A=; b=P9rOz7Kokr2HFymBJJ5xC4VKtHa4LNEYecgB8txiEp0OiOo2sX2VqOXiydEl5AwByo lwZgNA4O7ovhg8u6czbCVBu5ORxC/CvHbAjNoS21KYK7WqQdNj1MKEJhQI24ARa+hZhQ 8YzjTtNuyZKn2kk2F6m3wWGkUGDxdzkcnx5c2fBCCHukLulgL+lMw36cTdNuwmKoW608 6T7hlkIV1KapGMaIpTx0k+vxWFpRrt/myI4Wbr6wsiVJUUcBUj256/1qCr9PusH1ulQN RB4e2nkPqUa2O5jjdKjDhlSmZteDLpuJWxZ0tsR+iQ4e1BQY6RYSR/+SKYLqL3vtB/8h d/sA== X-Gm-Message-State: ANoB5pm9q1GYdVyLRLHBCfnzijo9eadPOjABHdf4/82Co3XED2dioW9k op0+yQniHr1PTuLU/qw0qNZo2ntnRHNOAg== X-Google-Smtp-Source: AA0mqf4azP0zisNXZup/kAARhZSOfcM8xwK4d0p3NkXStgvX/wMAZFJwcK+6Bib4sgINnh4PHeYZ7g== X-Received: by 2002:a0c:e30e:0:b0:4bc:16b3:6a85 with SMTP id s14-20020a0ce30e000000b004bc16b36a85mr12014419qvl.129.1668901558957; Sat, 19 Nov 2022 15:45:58 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-55ec-b699-c19f-3363.res6.spectrum.com. [2603:6081:7b00:6400:55ec:b699:c19f:3363]) by smtp.gmail.com with ESMTPSA id y11-20020a37f60b000000b006ce1bfbd603sm5169743qkj.124.2022.11.19.15.45.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Nov 2022 15:45:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 22/38] Convert CONFIG_NAND_KMETER1 et al to Kconfig Date: Sat, 19 Nov 2022 18:45:29 -0500 Message-Id: <20221119234545.404563-22-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221119234545.404563-1-trini@konsulko.com> References: <20221119234545.404563-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 This converts the following to Kconfig: CONFIG_NAND_ECC_BCH CONFIG_NAND_KIRKWOOD CONFIG_NAND_KMETER1 Signed-off-by: Tom Rini --- arch/arm/mach-kirkwood/include/mach/config.h | 1 - configs/kmcoge5ne_defconfig | 1 + drivers/mtd/nand/raw/Kconfig | 13 +++++++++++++ include/configs/km/km-mpc83xx.h | 1 - include/configs/kmcoge5ne.h | 2 -- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index a2781e25a23b..a6de7676294b 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -34,7 +34,6 @@ * NAND configuration */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_KIRKWOOD #define CFG_SYS_NAND_BASE 0xD8000000 /* MV_DEFADR_NANDF */ #define NAND_ALLOW_ERASE_ALL 1 #endif diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 71d196533f7e..c2a17c6212f1 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -235,6 +235,7 @@ CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y +CONFIG_NAND_KMETER1=y CONFIG_DM_ETH_PHY=y CONFIG_QE_UEC=y # CONFIG_PCI is not set diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index eb37b6275998..338a3562a4ac 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -225,6 +225,19 @@ config NAND_FSL_IFC help Enable the Freescale Integrated Flash Controller NAND driver. +config NAND_KIRKWOOD + bool "Support for Kirkwood NAND controller" + depends on ARCH_KIRKWOOD + default y + +config NAND_ECC_BCH + bool + +config NAND_KMETER1 + bool "Support KMETER1 NAND controller" + depends on VENDOR_KM + select NAND_ECC_BCH + config NAND_LPC32XX_MLC bool "Support LPC32XX_MLC controller" select SYS_NAND_SELF_INIT diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index e6a3613b7a24..840a4d5401f5 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -57,7 +57,6 @@ {1, {I2C_NULL_HOP} } } #if defined(CONFIG_CMD_NAND) -#define CONFIG_NAND_KMETER1 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE #endif diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 2be996aaaf08..c24d6ad8bc2d 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -9,8 +9,6 @@ #define __CONFIG_H #define CONFIG_HOSTNAME "kmcoge5ne" -#define CONFIG_NAND_ECC_BCH -#define CONFIG_NAND_KMETER1 #define NAND_MAX_CHIPS 1 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ -- 2.25.1