diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/BMW.h | 2 | ||||
| -rw-r--r-- | include/configs/CPU87.h | 2 | ||||
| -rw-r--r-- | include/configs/GEN860T.h | 2 | ||||
| -rw-r--r-- | include/configs/IDS8247.h | 2 | ||||
| -rw-r--r-- | include/configs/MIP405.h | 2 | ||||
| -rw-r--r-- | include/configs/NETPHONE.h | 2 | ||||
| -rw-r--r-- | include/configs/NETTA.h | 2 | ||||
| -rw-r--r-- | include/configs/NETTA2.h | 2 | ||||
| -rw-r--r-- | include/configs/NETVIA.h | 2 | ||||
| -rw-r--r-- | include/configs/PCIPPC2.h | 2 | ||||
| -rw-r--r-- | include/configs/PCIPPC6.h | 2 | ||||
| -rw-r--r-- | include/configs/PIP405.h | 2 | ||||
| -rw-r--r-- | include/configs/PM520.h | 2 | ||||
| -rw-r--r-- | include/configs/PM826.h | 2 | ||||
| -rw-r--r-- | include/configs/PM828.h | 2 | ||||
| -rw-r--r-- | include/configs/SXNI855T.h | 2 | ||||
| -rw-r--r-- | include/configs/TQM85xx.h | 2 | ||||
| -rw-r--r-- | include/configs/VCMA9.h | 2 | ||||
| -rw-r--r-- | include/configs/at91rm9200dk.h | 2 | ||||
| -rw-r--r-- | include/configs/delta.h | 2 | ||||
| -rw-r--r-- | include/configs/omap2420h4.h | 2 | ||||
| -rw-r--r-- | include/configs/stxxtc.h | 2 | ||||
| -rw-r--r-- | include/configs/svm_sc8xx.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/nand_ids.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/nand_legacy.h | 2 | ||||
| -rw-r--r-- | include/nand.h | 4 | 
26 files changed, 27 insertions, 27 deletions
| diff --git a/include/configs/BMW.h b/include/configs/BMW.h index bb7856f67..11d19c6f7 100644 --- a/include/configs/BMW.h +++ b/include/configs/BMW.h @@ -86,7 +86,7 @@  /* CONFIG_CMD_DOC required legacy NAND support */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #if 0  #define CONFIG_PCI		1 diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 3879d9b27..d325c4d07 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -191,7 +191,7 @@  #endif -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  /*   * Miscellaneous configurable options diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 037b115c1..422ed32aa 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -280,7 +280,7 @@  #define CFG_FPGA_PROG_FEEDBACK -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  /*   * Verbose help from command monitor. diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 29dc6234b..029bb9914 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -262,7 +262,7 @@   */  #if defined(CONFIG_CMD_NAND) -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_NAND0_BASE 0xE1000000  #define CFG_MAX_NAND_DEVICE     1       /* Max number of NAND devices           */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index d683b87ae..66235e37b 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -88,7 +88,7 @@  #endif -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define	 CFG_HUSH_PARSER  #define	 CFG_PROMPT_HUSH_PS2 "> " diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index 27e7ab9bc..6c18b8169 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -502,7 +502,7 @@  /****************************************************************/  /* NAND */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_NAND_BASE		NAND_BASE  #define CONFIG_MTD_NAND_ECC_JFFS2  #define CONFIG_MTD_NAND_VERIFY_WRITE diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 56c76d325..1f1bc540b 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -621,7 +621,7 @@  /****************************************************************/  /* NAND */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_NAND_BASE			NAND_BASE  #define CONFIG_MTD_NAND_VERIFY_WRITE  #define CONFIG_MTD_NAND_UNSAFE diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index b8c48482a..9a1f1d6da 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -503,7 +503,7 @@  /****************************************************************/  /* NAND */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_NAND_BASE		NAND_BASE  #define CONFIG_MTD_NAND_ECC_JFFS2  #define CONFIG_MTD_NAND_VERIFY_WRITE diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index 1293fb0e2..c02959418 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -397,7 +397,7 @@  /*****************************************************************************/ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2 diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index 268b0343a..6ebaa85e8 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -84,7 +84,7 @@  #define CONFIG_PCI		1  #define CONFIG_PCI_PNP		1	/* PCI plug-and-play */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  /*   * Miscellaneous configurable options diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index 250b58604..9202794ab 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -86,7 +86,7 @@  #define CONFIG_PCI		1  #define CONFIG_PCI_PNP		1	/* PCI plug-and-play */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  /*   * Miscellaneous configurable options diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 5890012b4..2ceda001c 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -77,7 +77,7 @@  #define CONFIG_CMD_BSP -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define	 CFG_HUSH_PARSER  #define	 CFG_PROMPT_HUSH_PS2 "> " diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 259178f85..5e0bb056d 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -88,7 +88,7 @@  #if !defined(CONFIG_BOOT_ROM)  /* DoC requires legacy NAND for now */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #endif diff --git a/include/configs/PM826.h b/include/configs/PM826.h index 36e9aa56e..190e2a442 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -180,7 +180,7 @@  #endif -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  /*   * Disk-On-Chip configuration diff --git a/include/configs/PM828.h b/include/configs/PM828.h index abf593cf7..96c0edf93 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -183,7 +183,7 @@  /*   * Disk-On-Chip configuration   */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_DOC_SHORT_TIMEOUT  #define CFG_MAX_DOC_DEVICE	1	/* Max number of DOC devices	*/ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index aefc7eecb..c5d538686 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -195,7 +195,7 @@  */  /* NAND flash support */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CONFIG_MTD_NAND_ECC_JFFS2  #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices	*/  #define SECTORSIZE 512 diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index 964193fc0..d84554e37 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -345,7 +345,7 @@  /* NAND FLASH */  #ifdef CONFIG_NAND -#undef CFG_NAND_LEGACY +#undef CONFIG_NAND_LEGACY  #define CONFIG_NAND_FSL_UPM	1 diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index ad8db613e..02cabb2fb 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -254,7 +254,7 @@   */  #if defined(CONFIG_CMD_NAND) -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/  #define SECTORSIZE 512 diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index cd2eae206..fca431e3b 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -116,7 +116,7 @@  #define CONFIG_CMD_MII  #define CONFIG_CMD_NAND -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/  #define SECTORSIZE 512 diff --git a/include/configs/delta.h b/include/configs/delta.h index 14fde1a95..1db962aaf 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -217,7 +217,7 @@  /*   * NAND Flash   */ -#undef CFG_NAND_LEGACY +#undef CONFIG_NAND_LEGACY  #define CFG_NAND0_BASE		0x0 /* 0x43100040 */ /* 0x10000000 */  #undef CFG_NAND1_BASE diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index aac5d0fc7..afdcba411 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -151,7 +151,7 @@  /*   *  Board NAND Info.   */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_NAND_ADDR 0x04000000  /* physical address to access nand at CS0*/  #define CFG_MAX_NAND_DEVICE 1	/* Max number of NAND devices */ diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 2bdce303c..37a52cf7e 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -449,7 +449,7 @@  /****************************************************************/  /* NAND */ -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  #define CFG_NAND_BASE		NAND_BASE  #define CONFIG_MTD_NAND_ECC_JFFS2  #define CONFIG_MTD_NAND_VERIFY_WRITE diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index 70336b5eb..bbbfa15db 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -151,7 +151,7 @@  #define CONFIG_CMD_DATE -#define CFG_NAND_LEGACY +#define CONFIG_NAND_LEGACY  /*   * Miscellaneous configurable options diff --git a/include/linux/mtd/nand_ids.h b/include/linux/mtd/nand_ids.h index d9eb91182..e7aa26df0 100644 --- a/include/linux/mtd/nand_ids.h +++ b/include/linux/mtd/nand_ids.h @@ -28,7 +28,7 @@  #ifndef __LINUX_MTD_NAND_IDS_H  #define __LINUX_MTD_NAND_IDS_H -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY  #error This module is for the legacy NAND support  #endif diff --git a/include/linux/mtd/nand_legacy.h b/include/linux/mtd/nand_legacy.h index b05e7267e..4494bc569 100644 --- a/include/linux/mtd/nand_legacy.h +++ b/include/linux/mtd/nand_legacy.h @@ -36,7 +36,7 @@  #ifndef __LINUX_MTD_NAND_LEGACY_H  #define __LINUX_MTD_NAND_LEGACY_H -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY  #error This module is for the legacy NAND support  #endif diff --git a/include/nand.h b/include/nand.h index 764e9f972..4c2b76dd4 100644 --- a/include/nand.h +++ b/include/nand.h @@ -26,7 +26,7 @@  extern void nand_init(void); -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY  #include <linux/mtd/compat.h>  #include <linux/mtd/mtd.h>  #include <linux/mtd/nand.h> @@ -128,5 +128,5 @@ void board_nand_select_device(struct nand_chip *nand, int chip);  __attribute__((noreturn)) void nand_boot(void); -#endif /* !CFG_NAND_LEGACY */ +#endif /* !CONFIG_NAND_LEGACY */  #endif |