Convert CONFIG_SYS_NAND_NO_SUBPAGE_WRITE to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_NAND_NO_SUBPAGE_WRITE

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index 4309d9338664e2cbd531abd25dc2cd24a2f3e4e9..f24decf5e43de1eb4ce1d281081e567371182fb3 100644 (file)
--- a/README
+++ b/README
@@ -1806,11 +1806,6 @@ Low Level (hardware related) configuration options:
                If defined, the x86 reset vector code is included. This is not
                needed when U-Boot is running from Coreboot.
 
-- CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
-               Option to disable subpage write in NAND driver
-               driver that uses this:
-               drivers/mtd/nand/raw/davinci_nand.c
-
 Freescale QE/FMAN Firmware Support:
 -----------------------------------
 

diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index 977348e73fcc1c519526eba588d17c48407ddb73..25007793b3a0e3793a8ad2bacc4dbb1b6f0fc14c 100644 (file)
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -78,6 +78,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
+CONFIG_SYS_NAND_NO_SUBPAGE_WRITE=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000

diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig
index afba285ffb22d822c99c5ebe811dc4dc8a7780a6..6c8a284e7c70146a07039d310754a061ed3e2340 100644 (file)
--- a/configs/k2e_hs_evm_defconfig
+++ b/configs/k2e_hs_evm_defconfig
@@ -53,6 +53,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
+CONFIG_SYS_NAND_NO_SUBPAGE_WRITE=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000

diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 6c4563912b5b7eec45322fdc4d4911ba3bf5a716..fec29f2c9119e9f94518b51c8e5a0c69652f60d5 100644 (file)
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -78,6 +78,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
+CONFIG_SYS_NAND_NO_SUBPAGE_WRITE=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000

diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig
index 33624badae0e36265ea142b86654013623cd0e54..f6ac484f2e85e185075ffd06df78c5eddb6ef48b 100644 (file)
--- a/configs/k2hk_hs_evm_defconfig
+++ b/configs/k2hk_hs_evm_defconfig
@@ -53,6 +53,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
+CONFIG_SYS_NAND_NO_SUBPAGE_WRITE=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000

diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index e28054bcc72cc5d993047615cce5ba36c29213be..bb91aa3534a982d8b52f3824288ec17f3680cd09 100644 (file)
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -78,6 +78,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
+CONFIG_SYS_NAND_NO_SUBPAGE_WRITE=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000

diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig
index 8f8bb5491305f5ac311be633d1c73ca6fb273c18..d10965a70fc8ffb091b9319adbe60c5b0e8a2012 100644 (file)
--- a/configs/k2l_hs_evm_defconfig
+++ b/configs/k2l_hs_evm_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
+CONFIG_SYS_NAND_NO_SUBPAGE_WRITE=y
 CONFIG_NAND_DAVINCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=30000000

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 0e428418b25d880e44640978775df6be5fe84c03..3585031ddfa88f9ff08191c40e5373cca3736fd3 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -41,6 +41,10 @@ config SYS_NAND_USE_FLASH_BBT
        help
          Enable the BBT (Bad Block Table) usage.
 
+config SYS_NAND_NO_SUBPAGE_WRITE
+       bool "Disable subpage write support"
+       depends on NAND_ARASAN || NAND_DAVINCI || NAND_KIRKWOOD
+
 config NAND_ATMEL
        bool "Support Atmel NAND controller"
        select SYS_NAND_SELF_INIT

diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 6c01ab813e5a2fe2e6857bd7345c0e3271e20602..b8b4b28b3d678404ef943c3ba1ca3619e24e1572 100644 (file)
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -68,7 +68,6 @@
 
 #define CONFIG_SYS_NAND_LARGEPAGE
 #define CONFIG_SYS_NAND_BASE_LIST              { 0x30000000, }
-#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
 
 #define DFU_ALT_INFO_MMC \
        "dfu_alt_info_mmc=" \