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 F3992C433F5 for ; Tue, 3 May 2022 09:25:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DC618393F; Tue, 3 May 2022 11:25:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="my3GVct+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F2418390C; Tue, 3 May 2022 11:25:16 +0200 (CEST) Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) (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 DABB38393F for ; Tue, 3 May 2022 11:25:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pl1-x636.google.com with SMTP id k1so5880833pll.4 for ; Tue, 03 May 2022 02:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TmQWY3NhR+xyjleuKHrkc2R/wiyLwImYMVzDRwIH1yQ=; b=my3GVct+BhImriA+TM0BbiCfNFeTQq0GjhQYdDIXfcz4nrdqZuz48iPi56UDsTBZA7 mr9gqUK5D6dWNCnTOJVyrMmvPHwJx+bK4VOhSe3H7xwTjo7yBuepIy2cqWjPZb25zZfm K2Hlqqur5s2guZCZXiutlJT3Bll6X/PrFppc7NQktnfjuk+nuhHVyUXe9WlTZJT08Fb8 dA4AW+ZhQQiSqpPNRGbFLY/E5Nj8EMGfMzqmSJD2ObBCwVkrovcgvV6YKoNxlRza1b5R WeACZLSchn3Ora4pwYtPoITwcnKOabrr+wVCnXakwqVKQeGxr58ylS+AaPifaOUa9GL2 YCKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TmQWY3NhR+xyjleuKHrkc2R/wiyLwImYMVzDRwIH1yQ=; b=5uovJIW7QW5e04n5A2EYwwraxwCIO45fOsrQa5GmYYJcV1Oea6/8UPvPe7kVT2B5Fs r49Pt/rIg+Lmre6/MuTgAg8ETOrwDEKkdOBk9Y6eUGn6X+zKMiBTueFgGqHX1KIcgL+3 G2gzN7bMYjjgmXuGW4z62/gDaAOQ9+L54arq6lKIG9kjvNoJx12kD7dUVfkQNh0xJECV AqADX8wIwzCD2L/MSJWeO/a1MTdRtxK8wXBD8lJuHBq8fqNAt63LGmdBjFG9MaCkoySI OCCoeoVOtwJa3uPhVlmwQ4No9A5EXWiiKm9BW7GqwF+CyuvW+XmrS7jdGk26IO3N19Bj 1pXQ== X-Gm-Message-State: AOAM531fcpqJIa61w7U2FLguePvCp1E/IvotYirYwJyFQwyaRKd71dkg MJwueanshVPFUcN8x0Y+VGoYofjBDqQ= X-Google-Smtp-Source: ABdhPJynKgvQWP34CORAZbuTE7FP+0ldIBXzin+Vko1j/RcMv/TOWvIIk19ZSP5Lvbl5PDFQZG4Twg== X-Received: by 2002:a17:90a:d584:b0:1b8:7864:1735 with SMTP id v4-20020a17090ad58400b001b878641735mr3726509pju.126.1651569908505; Tue, 03 May 2022 02:25:08 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:68ea:4820:dd09:759d]) by smtp.gmail.com with ESMTPSA id p9-20020a170902b08900b0015e8d4eb2c3sm5933305plr.269.2022.05.03.02.25.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 02:25:07 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Cc: Chris Packham , Bin Meng , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Patrice Chotard , Patrick Delaunay , Rick Chen , Samuel Egli , Sean Anderson , Simon Glass , Stefan Roese , Tero Kristo , Wolfgang Denk Subject: [PATCH] Convert CONFIG_MTD_CONCAT to Kconfig Date: Tue, 3 May 2022 21:24:57 +1200 Message-Id: <20220503092457.4099093-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.36.0 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.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_MTD_CONCAT Signed-off-by: Chris Packham --- This touches octeontx_common.h but only to remove a line that is already commented out. Other than that etamin was the only board that had this enabled. configs/etamin_defconfig | 1 + drivers/mtd/Kconfig | 8 ++++++++ include/configs/etamin.h | 1 - include/configs/octeontx_common.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index ba7a0665dedb..34b9fff5ded2 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -87,6 +87,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y # CONFIG_SPL_DM_MMC is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_CONCAT=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_OMAP_ECCSCHEME_BCH16_CODE_HW=y CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 588ebe9119b9..4088267dd111 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -22,6 +22,14 @@ config MTD_NOR_FLASH help Enable support for parallel NOR flash. +config MTD_CONCAT + bool "Enable MTD device concatenation" + depends on MTD + help + Enable support for concatenating multiple physical MTD devices + into a single logical device. The larger logical device can then + be partitioned. + config SYS_MTDPARTS_RUNTIME bool "Allow MTDPARTS to be configured at runtime" depends on MTD diff --git a/include/configs/etamin.h b/include/configs/etamin.h index dc83ab71908b..9cf93924df93 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -151,7 +151,6 @@ #define ETAMIN_NAND_GPMC_CONFIG4 0x16051807 #define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e #define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80 -#define CONFIG_MTD_CONCAT /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index bcf8b41cfb63..81dbff2d672f 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -64,7 +64,6 @@ /** EMMC specific defines */ #if defined(CONFIG_NAND_OCTEONTX) -/*#define CONFIG_MTD_CONCAT */ #define CONFIG_SYS_MAX_NAND_DEVICE 8 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5b882b2670ca..cecdda678191 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -389,7 +389,6 @@ CONFIG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC_NAME -CONFIG_MTD_CONCAT CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MTD_PARTITION CONFIG_MVGBE_PORTS -- 2.36.0