NAND: remove remaining NAND_MAX_CHIPS definitions
PATCH 1/1 NAND: remove remaining 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.
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(-)
Signature · 1 line
1.7.5.4
PATCH 1/1 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.
--- 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(-)
include/configs/P1_P2_RDB.h +1 -2
@@ -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)
include/configs/SIMPC8313.h +1 -2
@@ -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 \
include/configs/VCMA9.h +0 -1
@@ -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
include/configs/aria.h +0 -4
@@ -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
include/configs/bf526-ezbrd.h +0 -1
@@ -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
include/configs/bf527-ad7160-eval.h +0 -1
@@ -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
include/configs/bf527-ezkit.h +0 -1
@@ -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
include/configs/bf548-ezkit.h +0 -1
@@ -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/*
include/configs/cm-bf527.h +0 -1
@@ -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
include/configs/cpu9260.h +0 -1
@@ -295,7 +295,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
include/configs/da830evm.h +0 -1
@@ -115,7 +115,6 @@#define CONFIG_SYS_CLE_MASK 0x10#define CONFIG_SYS_ALE_MASK 0x8#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND devices */ -#define NAND_MAX_CHIPS 1#endif #ifdef CONFIG_USE_NOR
include/configs/da850_am18xxevm.h +0 -1
@@ -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 /*
include/configs/da850evm.h +0 -1
@@ -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 /*
include/configs/ea20.h +0 -1
@@ -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
include/configs/hawkboard.h +0 -1
@@ -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
include/configs/km/km_arm.h +0 -1
@@ -133,7 +133,6 @@* NAND Flash configuration */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define NAND_MAX_CHIPS 1#define BOOTFLASH_START 0x0
include/configs/m28evk.h +0 -1
@@ -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
include/configs/mecp5123.h +0 -2
@@ -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
include/configs/mpc5121ads.h +0 -1
@@ -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 */ /*
include/configs/mv-common.h +0 -1
@@ -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
include/configs/pdm360ng.h +0 -2
@@ -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 */ /*
include/configs/pm9261.h +0 -1
@@ -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
include/configs/qi_lb60.h +0 -1
@@ -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
include/configs/smdk2410.h +0 -1
@@ -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
include/configs/tnetv107x_evm.h +0 -1
@@ -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/*
Signature · 1 line
1.7.5.4
PATCH 1/1 NAND: remove NAND_MAX_CHIPS definitions
Quoted 7 lines · Vladimir Zapolskiy
This change follows the change by Wolfgang Grandegger (commit
6c869637fef), which allows to remove uselessNAND_MAX_CHIPSdefinitions in board config files.Signed-off-by Vladimir Zapolskiy <[email protected]>Cc Wolfgang Grandegger <[email protected]>Cc Scott Wood <[email protected]>
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
PATCH 1/1 NAND: remove NAND_MAX_CHIPS definitions
Quoted 9 lines · Vladimir Zapolskiy
Quoted 7 lines
This change follows the change by Wolfgang Grandegger (commit
6c869637fef), which allows to remove uselessNAND_MAX_CHIPSdefinitions in board config files.Signed-off-by Vladimir Zapolskiy <[email protected]>Cc Wolfgang Grandegger <[email protected]>Cc Scott Wood <[email protected]>
Quoted 8 lines
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_CHIPSthat are set to the default value of 1).Marek: this removes
NAND_MAX_CHIPSfromm28evk.h, which set it to the non-default value of 8. This setting was never effective, sinceNAND_MAX_CHIPSstopped being used used years beforem28evk.hwas introduced. Does this board wantCONFIG_SYS_NAND_MAX_CHIPS= 8?
I suspect this was indeed never effective either. And so far, MAX_NAND_CHIPS isn't necessary there.
M
Quoted 2 lines
-Scott
PATCH 1/1 NAND: remove remaining NAND_MAX_CHIPS definitions
In reply to Vladimir ZapolskiyHi Scott,
Quoted 29 lines · Vladimir Zapolskiy
This change follows the change by Wolfgang Grandegger (commit
6c869637fef), which allows to remove uselessNAND_MAX_CHIPSdefinitions in board config files.The change is based on u-boot.git/master, this branch contains 3 new boards with the defined
NAND_MAX_CHIPSmacro, which are not present in u-boot-nand-flash.git/master.Vladimir Zapolskiy (1):
NAND: removeNAND_MAX_CHIPSdefinitionsinclude/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 --
Quoted 9 lines
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?
Signature · 2 lines
With best wishes, Vladimir
PATCH 1/1 NAND: remove remaining NAND_MAX_CHIPS definitions
Quoted 44 lines · Vladimir Zapolskiy
Hi Scott,
Quoted 31 lines · Vladimir Zapolskiy
This change follows the change by Wolfgang Grandegger (commit
6c869637fef),
which allows to remove uselessNAND_MAX_CHIPSdefinitions in board config files.The change is based on u-boot.git/master, this branch contains 3 new boards
with the definedNAND_MAX_CHIPSmacro, which are not present in u-boot-nand-flash.git/master.Vladimir Zapolskiy (1):
NAND: removeNAND_MAX_CHIPSdefinitionsinclude/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 --Quoted 9 lines
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(-)
Quoted 1 line
is there any problem with this pending change?
No, looks good.
-Scott
PATCH 1/1 NAND: remove remaining NAND_MAX_CHIPS definitions
Quoted 45 lines · Scott Wood
Quoted 44 lines · Vladimir Zapolskiy
Hi Scott,
Quoted 40 lines · Vladimir Zapolskiy
This change follows the change by Wolfgang Grandegger (commit
6c869637fef),
which allows to remove uselessNAND_MAX_CHIPSdefinitions in board config files.The change is based on u-boot.git/master, this branch contains 3 new boards
with the definedNAND_MAX_CHIPSmacro, which are not present in u-boot-nand-flash.git/master.Vladimir Zapolskiy (1):
NAND: removeNAND_MAX_CHIPSdefinitionsinclude/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(-)
Quoted 4 lines
Quoted 1 line
is there any problem with this pending change?
No, looks good.
Being a NAND Flash custodian, would you like to pick it up?
Signature · 2 lines
With best wishes, Vladimir
PATCH 1/1 NAND: remove remaining NAND_MAX_CHIPS definitions
Quoted 9 lines · Vladimir Zapolskiy
Quoted 7 lines · Scott Wood
Quoted 3 lines · Vladimir Zapolskiy
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
PATCH 1/1 NAND: remove remaining NAND_MAX_CHIPS definitions
Quoted 5 lines · Scott Wood
Quoted 4 lines · Vladimir Zapolskiy
Quoted 3 lines · Scott Wood
Quoted 2 lines · Vladimir Zapolskiy
Hi Scott,
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
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.
Signature · 2 lines
With best wishes, Vladimir