Convert CONFIG_SYS_NAND_SIZE to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_NAND_SIZE

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

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 5483efeb39b43abdd096d65a97f9f334b0a1ddba..eb37b627599803f4ee708a2e970c378f6c900f98 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -461,6 +461,11 @@ config NAND_MXC
          This enables the NAND driver for the NAND flash controller on the
          i.MX27 / i.MX31 / i.MX5 processors.
 
+config SYS_NAND_SIZE
+       int "Size of NAND in kilobytes"
+       depends on NAND_MXC && SPL_NAND_SUPPORT
+       default 268435456
+
 config NAND_MXS
        bool "MXS NAND support"
        depends on MX23 || MX28 || MX6 || MX7 || IMX8 || IMX8M

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 47ea51c50724261f5d40af7dc585c72e0a3c9076..a39fe5f28a8789fa0233729ab303972e879237da 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -94,7 +94,6 @@
 
 #ifdef CONFIG_CMD_NAND
 #      define CONFIG_SYS_NAND_BASE             CONFIG_SYS_CS2_BASE
-#      define CONFIG_SYS_NAND_SIZE             1
 #      define CONFIG_SYS_NAND_BASE_LIST        { CONFIG_SYS_NAND_BASE }
 #      define NAND_ALLOW_ERASE_ALL     1
 #endif

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index a2e36cc86736898b3b4af46bc67a51e0d49166e7..f0734712eaa5a1e8b8ae85276be248573aea816c 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -95,7 +95,6 @@
 #endif
 
 #      define CONFIG_SYS_NAND_BASE             CONFIG_SYS_CS2_BASE
-#      define CONFIG_SYS_NAND_SIZE             1
 #      define CONFIG_SYS_NAND_BASE_LIST        { CONFIG_SYS_NAND_BASE }
 #      define NAND_ALLOW_ERASE_ALL     1
 

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index a20b41bdf07c5c3d25b3613f5f5a7d066025db04..36522419172eb02963b391285cecd7cfde85dedd 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -85,12 +85,6 @@
 
 /* Watchdog */
 
-/*
- * NAND SPL
- */
-
-#define CONFIG_SYS_NAND_SIZE           (256 * 1024 * 1024)
-
 /*
  * Extra Environments
  */

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 538aad9a7bbbbd71a89912dd5434909313d1f113..5460c12a17e84bf0581ed4b6f680d66bef21b43e 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -96,7 +96,6 @@
 #define        CONFIG_SYS_NAND_U_BOOT_START    CONFIG_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_DST     CONFIG_TEXT_BASE
 
-#define CONFIG_SYS_NAND_SIZE           (SZ_256M)
 #define CONFIG_SYS_NAND_ECCSIZE                256
 #define CONFIG_SYS_NAND_ECCBYTES       3
 #define CONFIG_SYS_NAND_ECCPOS         { 40, 41, 42, 43, 44, 45, 46, 47, \

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 5ab087da8bd017921d476e40963e6bcc723bc0e0..f130c630dde8612fd92dcfc62ea872aa51e75e22 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -130,7 +130,6 @@
 #define        CONFIG_SYS_NAND_U_BOOT_START    CONFIG_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_DST     CONFIG_TEXT_BASE
 
-#define CONFIG_SYS_NAND_SIZE           (256 * SZ_1M)
 #define CONFIG_SYS_NAND_ECCSIZE                256
 #define CONFIG_SYS_NAND_ECCBYTES       3
 #define CONFIG_SYS_NAND_ECCPOS         { 40, 41, 42, 43, 44, 45, 46, 47, \