NAND: Remove additional (CONFIG_SYS)_NAND_MAX_CHIPS
NAND_MAX_CHIPS has been replaced by CONFIG_SYS_NAND_MAX_CHIPS, and the latter defaults to 1. Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
parent
6bbb3e93a5
commit
4d2aee2b36
@ -128,7 +128,6 @@
|
|||||||
|
|
||||||
/* NAND flash */
|
/* NAND flash */
|
||||||
#ifdef CONFIG_CMD_NAND
|
#ifdef CONFIG_CMD_NAND
|
||||||
#define CONFIG_NAND_MAX_CHIPS 1
|
|
||||||
#define CONFIG_NAND_ATMEL
|
#define CONFIG_NAND_ATMEL
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
|
#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
|
||||||
|
@ -90,7 +90,6 @@
|
|||||||
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
||||||
/* socket has two chipselects, nCE0 gated by address BIT(14) */
|
/* socket has two chipselects, nCE0 gated by address BIT(14) */
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_SYS_NAND_MAX_CHIPS 1
|
|
||||||
|
|
||||||
/* SPI support */
|
/* SPI support */
|
||||||
#define CONFIG_SPI
|
#define CONFIG_SPI
|
||||||
|
@ -69,7 +69,6 @@
|
|||||||
|
|
||||||
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_SYS_NAND_MAX_CHIPS 1
|
|
||||||
|
|
||||||
/* U-Boot command configuration */
|
/* U-Boot command configuration */
|
||||||
#include <config_cmd_default.h>
|
#include <config_cmd_default.h>
|
||||||
|
@ -270,7 +270,6 @@
|
|||||||
|
|
||||||
/* NAND */
|
/* NAND */
|
||||||
|
|
||||||
#define CONFIG_SYS_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
|
||||||
|
@ -115,7 +115,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
|
|
||||||
|
|
||||||
#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=davinci_nand.1"
|
#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=davinci_nand.1"
|
||||||
#define MTDPARTS_DEFAULT \
|
#define MTDPARTS_DEFAULT \
|
||||||
|
@ -253,7 +253,6 @@
|
|||||||
/* NAND flash */
|
/* NAND flash */
|
||||||
#ifdef CONFIG_CMD_NAND
|
#ifdef CONFIG_CMD_NAND
|
||||||
#define CONFIG_NAND_ATMEL
|
#define CONFIG_NAND_ATMEL
|
||||||
#define CONFIG_SYS_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
|
||||||
|
@ -115,7 +115,6 @@
|
|||||||
|
|
||||||
/* NAND flash */
|
/* NAND flash */
|
||||||
#ifdef CONFIG_CMD_NAND
|
#ifdef CONFIG_CMD_NAND
|
||||||
#define CONFIG_NAND_MAX_CHIPS 1
|
|
||||||
#define CONFIG_NAND_ATMEL
|
#define CONFIG_NAND_ATMEL
|
||||||
#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
|
||||||
|
@ -231,7 +231,6 @@
|
|||||||
|
|
||||||
#define CONFIG_NAND_MXC
|
#define CONFIG_NAND_MXC
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_SYS_NAND_MAX_CHIPS 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* actually this is nothing someone wants to configure!
|
* actually this is nothing someone wants to configure!
|
||||||
|
Loading…
Reference in New Issue
Block a user