Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

NAND: remove NAND_MAX_CHIPS definitions

Browse source 
This change follows the change by Wolfgang Grandegger (commit 6c869637fe),
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>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Vladimir Zapolskiy 2011-11-20 16:10:16 +02:00 committed by Scott Wood
parent d3022c5f5c
commit 6bbb3e93a5
24 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/configs/P1_P2_RDB.h
View file

@ -273,11 +273,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#endif #endif
#endif #endif
#define CONFIG_CMD_NAND
#define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE} #define CONFIG_SYS_NAND_BASE_LIST {CONFIG_SYS_NAND_BASE}
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_MTD_NAND_VERIFY_WRITE #define CONFIG_MTD_NAND_VERIFY_WRITE
#define CONFIG_CMD_NAND 1
#define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_NAND_FSL_ELBC 1
#define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024) #define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024)

3
include/configs/SIMPC8313.h
View file

@ -144,10 +144,9 @@
#endif #endif
#define CONFIG_SYS_FPGA_BASE 0xFF000000 #define CONFIG_SYS_FPGA_BASE 0xFF000000
#define CONFIG_CMD_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_MTD_NAND_VERIFY_WRITE #define CONFIG_MTD_NAND_VERIFY_WRITE
#define CONFIG_CMD_NAND 1
#define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_NAND_FSL_ELBC 1
#define CONFIG_SYS_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE \ #define CONFIG_SYS_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE \

1
include/configs/VCMA9.h
View file

@ -237,7 +237,6 @@
#define CONFIG_NAND_S3C2410 #define CONFIG_NAND_S3C2410
#define CONFIG_SYS_S3C2410_NAND_HWECC #define CONFIG_SYS_S3C2410_NAND_HWECC
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_BASE 0x4E000000 #define CONFIG_SYS_NAND_BASE 0x4E000000
#define CONFIG_S3C24XX_CUSTOM_NAND_TIMING #define CONFIG_S3C24XX_CUSTOM_NAND_TIMING
#define CONFIG_S3C24XX_TACLS 1 #define CONFIG_S3C24XX_TACLS 1

4
include/configs/aria.h
View file

@ -247,13 +247,9 @@
*/ */
#define CONFIG_CMD_NAND /* enable NAND support */ #define CONFIG_CMD_NAND /* enable NAND support */
#define CONFIG_JFFS2_NAND /* with JFFS2 on it */ #define CONFIG_JFFS2_NAND /* with JFFS2 on it */
#define CONFIG_NAND_MPC5121_NFC #define CONFIG_NAND_MPC5121_NFC
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
/* /*
* Configuration parameters for MPC5121 NAND driver * Configuration parameters for MPC5121 NAND driver

1
include/configs/bf526-ezbrd.h
View file

@ -70,7 +70,6 @@
#define CONFIG_DRIVER_NAND_BFIN #define CONFIG_DRIVER_NAND_BFIN
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#endif #endif

1
include/configs/bf527-ad7160-eval.h
View file

@ -69,7 +69,6 @@
#define CONFIG_DRIVER_NAND_BFIN #define CONFIG_DRIVER_NAND_BFIN
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#endif #endif

1
include/configs/bf527-ezkit.h
View file

@ -69,7 +69,6 @@
#define CONFIG_DRIVER_NAND_BFIN #define CONFIG_DRIVER_NAND_BFIN
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#endif #endif

1
include/configs/bf548-ezkit.h
View file

@ -131,7 +131,6 @@
#define CONFIG_DRIVER_NAND_BFIN #define CONFIG_DRIVER_NAND_BFIN
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
/* /*

1
include/configs/cm-bf527.h
View file

@ -68,7 +68,6 @@
#define CONFIG_BFIN_NFC_CTL_VAL 0x0033 #define CONFIG_BFIN_NFC_CTL_VAL 0x0033
#define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#endif #endif

1
include/configs/cpu9260.h
View file

@ -295,7 +295,6 @@
/* NAND flash */ /* NAND flash */
#define CONFIG_NAND_ATMEL #define CONFIG_NAND_ATMEL
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_NAND_DBW_8 1 #define CONFIG_SYS_NAND_DBW_8 1

1
include/configs/da830evm.h
View file

@ -115,7 +115,6 @@
#define CONFIG_SYS_CLE_MASK 0x10 #define CONFIG_SYS_CLE_MASK 0x10
#define CONFIG_SYS_ALE_MASK 0x8 #define CONFIG_SYS_ALE_MASK 0x8
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
#endif #endif
#ifdef CONFIG_USE_NOR #ifdef CONFIG_USE_NOR

1
include/configs/da850evm.h
View file

@ -182,7 +182,6 @@
#define CONFIG_SYS_ALE_MASK 0x8 #define CONFIG_SYS_ALE_MASK 0x8
#undef CONFIG_SYS_NAND_HW_ECC #undef CONFIG_SYS_NAND_HW_ECC
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
#endif #endif
/* /*

1
include/configs/ea20.h
View file

@ -197,7 +197,6 @@
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #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 */ #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif

1
include/configs/hawkboard.h
View file

@ -114,7 +114,6 @@
/* Max number of NAND devices */ /* Max number of NAND devices */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE_LIST { 0x62000000, } #define CONFIG_SYS_NAND_BASE_LIST { 0x62000000, }
#define NAND_MAX_CHIPS 1
/* Block 0--not used by bootcode */ /* Block 0--not used by bootcode */
#define CONFIG_ENV_OFFSET 0x0 #define CONFIG_ENV_OFFSET 0x0

1
include/configs/km/km_arm.h
View file

@ -133,7 +133,6 @@
* NAND Flash configuration * NAND Flash configuration
*/ */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define BOOTFLASH_START 0x0 #define BOOTFLASH_START 0x0

1
include/configs/m28evk.h
View file

@ -154,7 +154,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x60000000 #define CONFIG_SYS_NAND_BASE 0x60000000
#define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define NAND_MAX_CHIPS 8
/* Environment is in NAND */ /* Environment is in NAND */
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND

2
include/configs/mecp5123.h
View file

@ -178,9 +178,7 @@
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#define CONFIG_NAND_MPC5121_NFC #define CONFIG_NAND_MPC5121_NFC
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
/* /*
* Configuration parameters for MPC5121 NAND driver * Configuration parameters for MPC5121 NAND driver

1
include/configs/mpc5121ads.h
View file

@ -242,7 +242,6 @@
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_MAX_NAND_DEVICE 2 #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 */ #define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */
/* /*

1
include/configs/mv-common.h
View file

@ -132,7 +132,6 @@
*/ */
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif

2
include/configs/pdm360ng.h
View file

@ -225,9 +225,7 @@
#define CONFIG_CMD_NAND /* enable NAND support */ #define CONFIG_CMD_NAND /* enable NAND support */
#define CONFIG_NAND_MPC5121_NFC #define CONFIG_NAND_MPC5121_NFC
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #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 */ #define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */
/* /*

1
include/configs/pm9261.h
View file

@ -233,7 +233,6 @@
/* NAND flash */ /* NAND flash */
#define CONFIG_NAND_ATMEL #define CONFIG_NAND_ATMEL
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_NAND_DBW_8 1 #define CONFIG_SYS_NAND_DBW_8 1

1
include/configs/qi_lb60.h
View file

@ -117,7 +117,6 @@
#define CONFIG_SYS_NAND_OOBSIZE 128 #define CONFIG_SYS_NAND_OOBSIZE 128
#define CONFIG_SYS_NAND_BASE 0xB8000000 #define CONFIG_SYS_NAND_BASE 0xB8000000
#define CONFIG_SYS_ONENAND_BASE CONFIG_SYS_NAND_BASE #define CONFIG_SYS_ONENAND_BASE CONFIG_SYS_NAND_BASE
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl.*/ #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl.*/
#define CONFIG_NAND_SPL_TEXT_BASE 0x80000000 #define CONFIG_NAND_SPL_TEXT_BASE 0x80000000

1
include/configs/smdk2410.h
View file

@ -211,7 +211,6 @@
#define CONFIG_NAND_S3C2410 #define CONFIG_NAND_S3C2410
#define CONFIG_SYS_S3C2410_NAND_HWECC #define CONFIG_SYS_S3C2410_NAND_HWECC
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_BASE 0x4E000000 #define CONFIG_SYS_NAND_BASE 0x4E000000
#endif #endif

1
include/configs/tnetv107x_evm.h
View file

@ -90,7 +90,6 @@
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE #define CONFIG_MTD_DEVICE
#define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_NAND
#define NAND_MAX_CHIPS 1
#define CONFIG_ENV_OFFSET 0x180000 #define CONFIG_ENV_OFFSET 0x180000
/* /*