[U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions

newer
[U-Boot] [PATCH v4] cmd_fat: add...

Vladimir Zapolskiy

20 Nov 2011 20 Nov '11

3:10 p.m.

This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

The change is based on u-boot.git/master, this branch contains 3 new boards with the defined NAND_MAX_CHIPS macro, which are not present in u-boot-nand-flash.git/master.

Vladimir Zapolskiy (1): NAND: remove NAND_MAX_CHIPS definitions

-- 1.7.5.4

Show replies by date

Vladimir Zapolskiy

20 Nov 20 Nov

3:10 p.m.

New subject: [U-Boot] [PATCH] NAND: remove NAND_MAX_CHIPS definitions

This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 00fa74d..cee788a 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -273,11 +273,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #endif

+#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024)

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 77be360..0976077 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -144,10 +144,9 @@ #endif #define CONFIG_SYS_FPGA_BASE 0xFF000000

+#define CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1

#define CONFIG_SYS_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE \ diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index a370c15..5cc8ece 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -237,7 +237,6 @@ #define CONFIG_NAND_S3C2410 #define CONFIG_SYS_S3C2410_NAND_HWECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_BASE 0x4E000000 #define CONFIG_S3C24XX_CUSTOM_NAND_TIMING #define CONFIG_S3C24XX_TACLS 1 diff --git a/include/configs/aria.h b/include/configs/aria.h index cf2e7d4..c9f0076 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -247,13 +247,9 @@ */ #define CONFIG_CMD_NAND /* enable NAND support */ #define CONFIG_JFFS2_NAND /* with JFFS2 on it */ - - #define CONFIG_NAND_MPC5121_NFC #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE

/* * Configuration parameters for MPC5121 NAND driver diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 1945c03..0031093 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -70,7 +70,6 @@ #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_CMD_NAND #endif

diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index 9c35f2d..fa05103 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -69,7 +69,6 @@ #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #endif

diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 1256e81..d80eac2 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -69,7 +69,6 @@ #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #endif

diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 3eadcef..89adfef 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -131,7 +131,6 @@ #define CONFIG_DRIVER_NAND_BFIN #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1

/* diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 4f2b904..b15a1eb 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -68,7 +68,6 @@ #define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_CMD_NAND #endif

diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h index 0c86d62..21a514b 100644 --- a/include/configs/cpu9260.h +++ b/include/configs/cpu9260.h @@ -295,7 +295,6 @@

#ifdef CONFIG_USE_NOR diff --git a/include/configs/da850_am18xxevm.h b/include/configs/da850_am18xxevm.h index 92b83ff..68fc5f6 100644 --- a/include/configs/da850_am18xxevm.h +++ b/include/configs/da850_am18xxevm.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_ALE_MASK 0x8 #undef CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -#define NAND_MAX_CHIPS 1 #endif

/* diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 4c14370..4e32c75 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_ALE_MASK 0x8 #undef CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -#define NAND_MAX_CHIPS 1 #endif

/* diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 74fec3f..cc0f5b0 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -197,7 +197,6 @@ #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -#define NAND_MAX_CHIPS 1 #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif

diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h index 638643a..356817c 100644 --- a/include/configs/hawkboard.h +++ b/include/configs/hawkboard.h @@ -113,7 +113,6 @@ /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE_LIST { 0x62000000, } -#define NAND_MAX_CHIPS 1 /* Block 0--not used by bootcode */ #define CONFIG_ENV_OFFSET 0x0

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 700124c..9c8d222 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -133,7 +133,6 @@ * NAND Flash configuration */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1

#define BOOTFLASH_START 0x0

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index d4bd207..0fb33ae 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x60000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define NAND_MAX_CHIPS 8

/* Environment is in NAND */ #define CONFIG_ENV_IS_IN_NAND diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index ed9282b..f5765b0 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -178,9 +178,7 @@ #define CONFIG_CMD_NAND #define CONFIG_NAND_MPC5121_NFC #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE

/* * Configuration parameters for MPC5121 NAND driver diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index c3d3afd..01df8b1 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -242,7 +242,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000

#define CONFIG_SYS_MAX_NAND_DEVICE 2 -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE #define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */

/* diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 3f5fcc6..1a63791 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -132,7 +132,6 @@ */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index f0154e0..8afc3c0 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -225,9 +225,7 @@ #define CONFIG_CMD_NAND /* enable NAND support */ #define CONFIG_NAND_MPC5121_NFC #define CONFIG_SYS_NAND_BASE 0x40000000 - #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE #define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */

/* diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 55455e7..ee5905b 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -232,7 +232,6 @@

/* NAND flash */ #define CONFIG_NAND_ATMEL -#define NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_DBW_8 1 diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h index f989595..f2e605a 100644 --- a/include/configs/qi_lb60.h +++ b/include/configs/qi_lb60.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 128 #define CONFIG_SYS_NAND_BASE 0xB8000000 #define CONFIG_SYS_ONENAND_BASE CONFIG_SYS_NAND_BASE -#define NAND_MAX_CHIPS 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl.*/ #define CONFIG_NAND_SPL_TEXT_BASE 0x80000000 diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 77c0a08..7315984 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -211,7 +211,6 @@ #define CONFIG_NAND_S3C2410 #define CONFIG_SYS_S3C2410_NAND_HWECC #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_BASE 0x4E000000 #endif

diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h index 4bced0c..7c3f334 100644 --- a/include/configs/tnetv107x_evm.h +++ b/include/configs/tnetv107x_evm.h @@ -90,7 +90,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE #define CONFIG_JFFS2_NAND -#define NAND_MAX_CHIPS 1 #define CONFIG_ENV_OFFSET 0x180000

-- 1.7.5.4

Scott Wood

6 Jan 6 Jan

12:41 a.m.

New subject: [U-Boot] [PATCH] NAND: remove NAND_MAX_CHIPS definitions

On 11/20/2011 08:10 AM, Vladimir Zapolskiy wrote:

...

This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

Signed-off-by: Vladimir Zapolskiy vz@mleia.com Cc: Wolfgang Grandegger wg@grandegger.com Cc: Scott Wood scottwood@freescale.com

Applied to u-boot-nand-flash (and a patch coming to get some additional instances that crept in, plus instances of CONFIG_SYS_NAND_MAX_CHIPS that are set to the default value of 1).

Marek: this removes NAND_MAX_CHIPS from m28evk.h, which set it to the non-default value of 8. This setting was never effective, since NAND_MAX_CHIPS stopped being used used years before m28evk.h was introduced. Does this board want CONFIG_SYS_NAND_MAX_CHIPS = 8?

-Scott

Marek Vasut

1:51 a.m.

New subject: [U-Boot] [PATCH] NAND: remove NAND_MAX_CHIPS definitions

...

On 11/20/2011 08:10 AM, Vladimir Zapolskiy wrote:

...
This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

Signed-off-by: Vladimir Zapolskiy vz@mleia.com Cc: Wolfgang Grandegger wg@grandegger.com Cc: Scott Wood scottwood@freescale.com

Applied to u-boot-nand-flash (and a patch coming to get some additional instances that crept in, plus instances of CONFIG_SYS_NAND_MAX_CHIPS that are set to the default value of 1).

Marek: this removes NAND_MAX_CHIPS from m28evk.h, which set it to the non-default value of 8. This setting was never effective, since NAND_MAX_CHIPS stopped being used used years before m28evk.h was introduced. Does this board want CONFIG_SYS_NAND_MAX_CHIPS = 8?

I suspect this was indeed never effective either. And so far, MAX_NAND_CHIPS isn't necessary there.

...

-Scott

Vladimir Zapolskiy

6 Dec 6 Dec

2:58 p.m.

New subject: [U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions

Hi Scott,

On 20.11.2011 16:10, Vladimir Zapolskiy wrote:

...

This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

The change is based on u-boot.git/master, this branch contains 3 new boards with the defined NAND_MAX_CHIPS macro, which are not present in u-boot-nand-flash.git/master.

Vladimir Zapolskiy (1): NAND: remove NAND_MAX_CHIPS definitions

include/configs/P1_P2_RDB.h | 3 +-- include/configs/SIMPC8313.h | 3 +-- include/configs/VCMA9.h | 1 - include/configs/aria.h | 4 ---- include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/cm-bf527.h | 1 - include/configs/cpu9260.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850_am18xxevm.h | 1 - include/configs/da850evm.h | 1 - include/configs/ea20.h | 1 - include/configs/hawkboard.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/m28evk.h | 1 - include/configs/mecp5123.h | 2 -- include/configs/mpc5121ads.h | 1 - include/configs/mv-common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/pm9261.h | 1 - include/configs/qi_lb60.h | 1 - include/configs/smdk2410.h | 1 - include/configs/tnetv107x_evm.h | 1 - 25 files changed, 2 insertions(+), 32 deletions(-)

is there any problem with this pending change?

-- With best wishes, Vladimir

Scott Wood

6:27 p.m.

New subject: [U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions

On 12/06/2011 07:58 AM, Vladimir Zapolskiy wrote:

...

Hi Scott,

On 20.11.2011 16:10, Vladimir Zapolskiy wrote:

...
This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

The change is based on u-boot.git/master, this branch contains 3 new boards with the defined NAND_MAX_CHIPS macro, which are not present in u-boot-nand-flash.git/master.

Vladimir Zapolskiy (1): NAND: remove NAND_MAX_CHIPS definitions

include/configs/P1_P2_RDB.h | 3 +-- include/configs/SIMPC8313.h | 3 +-- include/configs/VCMA9.h | 1 - include/configs/aria.h | 4 ---- include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/cm-bf527.h | 1 - include/configs/cpu9260.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850_am18xxevm.h | 1 - include/configs/da850evm.h | 1 - include/configs/ea20.h | 1 - include/configs/hawkboard.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/m28evk.h | 1 - include/configs/mecp5123.h | 2 -- include/configs/mpc5121ads.h | 1 - include/configs/mv-common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/pm9261.h | 1 - include/configs/qi_lb60.h | 1 - include/configs/smdk2410.h | 1 - include/configs/tnetv107x_evm.h | 1 - 25 files changed, 2 insertions(+), 32 deletions(-)

is there any problem with this pending change?

No, looks good.

-Scott

Vladimir Zapolskiy

7:34 p.m.

New subject: [U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions

On 06.12.2011 19:27, Scott Wood wrote:

...

On 12/06/2011 07:58 AM, Vladimir Zapolskiy wrote:

...
Hi Scott,

On 20.11.2011 16:10, Vladimir Zapolskiy wrote:

...
This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files.

The change is based on u-boot.git/master, this branch contains 3 new boards with the defined NAND_MAX_CHIPS macro, which are not present in u-boot-nand-flash.git/master.

Vladimir Zapolskiy (1): NAND: remove NAND_MAX_CHIPS definitions

include/configs/P1_P2_RDB.h | 3 +-- include/configs/SIMPC8313.h | 3 +-- include/configs/VCMA9.h | 1 - include/configs/aria.h | 4 ---- include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/cm-bf527.h | 1 - include/configs/cpu9260.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850_am18xxevm.h | 1 - include/configs/da850evm.h | 1 - include/configs/ea20.h | 1 - include/configs/hawkboard.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/m28evk.h | 1 - include/configs/mecp5123.h | 2 -- include/configs/mpc5121ads.h | 1 - include/configs/mv-common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/pm9261.h | 1 - include/configs/qi_lb60.h | 1 - include/configs/smdk2410.h | 1 - include/configs/tnetv107x_evm.h | 1 - 25 files changed, 2 insertions(+), 32 deletions(-)

is there any problem with this pending change?

No, looks good.

Being a NAND Flash custodian, would you like to pick it up?

-- With best wishes, Vladimir

Scott Wood

7:56 p.m.

New subject: [U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions

On 12/06/2011 12:34 PM, Vladimir Zapolskiy wrote:

...

On 06.12.2011 19:27, Scott Wood wrote:

...
On 12/06/2011 07:58 AM, Vladimir Zapolskiy wrote:

...
Hi Scott,

is there any problem with this pending change?

No, looks good.

Being a NAND Flash custodian, would you like to pick it up?

Yes, when I get to applying patches for the next merge window.

-Scott

Vladimir Zapolskiy

8:02 p.m.

New subject: [U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions

On 06.12.2011 20:56, Scott Wood wrote:

...

On 12/06/2011 12:34 PM, Vladimir Zapolskiy wrote:

...
On 06.12.2011 19:27, Scott Wood wrote:

...
On 12/06/2011 07:58 AM, Vladimir Zapolskiy wrote:

...
Hi Scott,

is there any problem with this pending change?

No, looks good.

Being a NAND Flash custodian, would you like to pick it up?

Yes, when I get to applying patches for the next merge window.

That's great, thank you a lot.

-- With best wishes, Vladimir

4869

Age (days ago)

4916

Last active (days ago)

List overview

Download

8 comments

3 participants

tags (0)

participants (3)

Marek Vasut
Scott Wood
Vladimir Zapolskiy