From 0cd03259644dcb967fcd6b31c3a92984125a1fe3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 12 Nov 2022 17:36:50 -0500 Subject: [PATCH] Convert CONFIG_SYS_NAND_SIZE to Kconfig This converts the following to Kconfig: CONFIG_SYS_NAND_SIZE Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- drivers/mtd/nand/raw/Kconfig | 5 +++++ include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/m53menlo.h | 6 ------ include/configs/smartweb.h | 1 - include/configs/taurus.h | 1 - 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 5483efe..eb37b62 100644 --- 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 47ea51c..a39fe5f 100644 --- 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 a2e36cc..f073471 100644 --- 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 a20b41b..3652241 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -86,12 +86,6 @@ /* Watchdog */ /* - * NAND SPL - */ - -#define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024) - -/* * Extra Environments */ #define CONFIG_HOSTNAME "m53menlo" diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 538aad9..5460c12 100644 --- 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 5ab087d..f130c63 100644 --- 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, \ -- 2.7.4