[PoC 132/241] global: Migrate CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/mtd/nand/raw/davinci_nand.c | 4 ++--
 include/configs/omapl138_lcdk.h     | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index e4e144bd7c83..25cd685555e8 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -266,7 +266,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat,
 static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 #if defined(CONFIG_SYS_NAND_PAGE_2K)
 	.eccbytes = 40,
-#ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+#ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 	.eccpos = {
 		6,   7,  8,  9, 10,	11, 12, 13, 14, 15,
 		22, 23, 24, 25, 26,	27, 28, 29, 30, 31,
@@ -287,7 +287,7 @@ static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 	.oobfree = {
 		{.offset = 2, .length = 22, },
 	},
-#endif	/* #ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */
+#endif	/* #ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */
 #elif defined(CONFIG_SYS_NAND_PAGE_4K)
 	.eccbytes = 80,
 	.eccpos = {
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index b1fc437395dd..5384c1f470c5 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -109,7 +109,7 @@
 #define CFG_SYS_NAND_BASE		DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
 #define CFG_SYS_NAND_MASK_CLE	0x10
 #define CFG_SYS_NAND_MASK_ALE	0x8
-#define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+#define CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 #define CFG_SYS_NAND_U_BOOT_SIZE	SZ_512K
 #define CFG_SYS_NAND_U_BOOT_DST	0xc1080000
 #define CFG_SYS_NAND_U_BOOT_START	CFG_SYS_NAND_U_BOOT_DST
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8fdece74ef1e..a7409a7f4978 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -141,7 +141,7 @@ CFG_MXC_UART_BASE
 CFG_MXC_USB_FLAGS
 CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
-CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
 CONFIG_NETDEV
 CONFIG_NETMASK
-- 
2.25.1