Skip to contentSkip to conversation

Convert CONFIG_MTD_CONCAT to Kconfig

PATCH In review Chris Packham 3 participants 4 messages May 3, 2022 – May 11, 2022 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Convert CONFIG_MTD_CONCAT to Kconfig

This converts the following to Kconfig:
CONFIG_MTD_CONCAT

---
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(-)
configs/etamin_defconfig +1 -0
index ba7a0665dedb..34b9fff5ded2 100644
@@ -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
drivers/mtd/Kconfig +8 -0
index 588ebe9119b9..4088267dd111 100644
@@ -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
include/configs/etamin.h +0 -1
index dc83ab71908b..9cf93924df93 100644
@@ -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 \
include/configs/octeontx_common.h +0 -1
index bcf8b41cfb63..81dbff2d672f 100644
@@ -64,7 +64,6 @@
 /** EMMC specific defines */
 
 #if defined(CONFIG_NAND_OCTEONTX)
-/*#define CONFIG_MTD_CONCAT */
 #define CONFIG_SYS_MAX_NAND_DEVICE 8
 #endif
 
scripts/config_whitelist.txt +0 -1
index 5b882b2670ca..cecdda678191 100644
@@ -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
Signature · 1 line
2.36.0
Reviewed-by on v1 1/1
#2 lore raw
In reply to Chris Packham
Quoted 8 lines · Chris Packham

This converts the following to Kconfig:
CONFIG_MTD_CONCAT

---
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.

Thanks,
Stefan

Quoted 67 lines
  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(-)
configs/etamin_defconfig +1 -0
index ba7a0665dedb..34b9fff5ded2 100644
@@ -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
drivers/mtd/Kconfig +8 -0
index 588ebe9119b9..4088267dd111 100644
@@ -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
include/configs/etamin.h +0 -1
index dc83ab71908b..9cf93924df93 100644
@@ -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 \
include/configs/octeontx_common.h +0 -1
index bcf8b41cfb63..81dbff2d672f 100644
@@ -64,7 +64,6 @@
  /** EMMC specific defines */
 
  #if defined(CONFIG_NAND_OCTEONTX)
-/*#define CONFIG_MTD_CONCAT */
  #define CONFIG_SYS_MAX_NAND_DEVICE 8
  #endif
 
scripts/config_whitelist.txt +0 -0
index 5b882b2670ca..cecdda678191 100644

scripts/config_whitelist.txt CONFIG_MMC_SUNXI_SLOT · line 394

Quoted 7 lines
scripts/config_whitelist.txt +0 -1
@@ -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

Viele Grüße,
Stefan Roese

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]