From c680df7e84d3736ada08e4f0caa5a8b770e781ee Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 22 Aug 2019 12:28:04 +0200 Subject: mtd: nand: raw: Move CONFIG_SYS_NAND_USE_FLASH_BBT to Kconfig Convert CONFIG_SYS_NAND_USE_FLASH_BBT to Kconfig, update defconfigs, headers and whitelist. Please note that this symbol already was used in Kconfig (imply in CONFIG_NAND_ATMEL) which did not work, since this symbol was not available in Kconfig. This changes now with this patch and all boards with CONFIG_NAND_ATMEL will have BBT enabled. Which is what I also need on my GARDENA AT91SAM based board. Signed-off-by: Stefan Roese Cc: Eugen Hristev Cc: Miquel Raynal Cc: Gregory CLEMENT [trini: Rework such that the configs are unchanged to start with] Signed-off-by: Tom Rini --- include/configs/colibri-imx6ull.h | 1 - include/configs/da850evm.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/db-xc3-24g4xg.h | 1 - include/configs/devkit3250.h | 1 - include/configs/imx6_logic.h | 1 - include/configs/m53menlo.h | 1 - include/configs/mvebu_armada-8k.h | 1 - include/configs/mx53ard.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/pcm058.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/x530.h | 2 -- 14 files changed, 15 deletions(-) (limited to 'include/configs') diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 05af222..7367174 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -153,7 +153,6 @@ /* used to initialize CONFIG_SYS_NAND_BASE_LIST which is unused */ #define CONFIG_SYS_NAND_BASE -1 #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_NAND_USE_FLASH_BBT /* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 4efe955..dea7b97 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -130,7 +130,6 @@ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_ENV_SECT_SIZE (128 << 10) #endif -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K #define CONFIG_SYS_NAND_CS 3 diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 5b59a92..6ff86df 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -32,7 +32,6 @@ #endif /* NAND */ -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION /* Keep device tree and initrd in lower memory so the kernel can access them */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 6ed58ce..73962de 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -46,7 +46,6 @@ #endif /* NAND */ -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION /* diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h index 0f75ad7..86d11e4 100644 --- a/include/configs/db-xc3-24g4xg.h +++ b/include/configs/db-xc3-24g4xg.h @@ -22,7 +22,6 @@ #define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */ /* NAND */ -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION /* Keep device tree and initrd in lower memory so the kernel can access them */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index c93a5de..16031c1 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -98,7 +98,6 @@ #define CONFIG_SYS_NAND_BLOCK_SIZE 0x20000 #define CONFIG_SYS_NAND_PAGE_SIZE NAND_LARGE_BLOCK_PAGE_SIZE -#define CONFIG_SYS_NAND_USE_FLASH_BBT /* * USB diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index dbf5665..d6b7477 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000 -#define CONFIG_SYS_NAND_USE_FLASH_BBT /* MTD device */ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index a432259..49f11ea 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -70,7 +70,6 @@ #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_MXC_NAND_HWECC -#define CONFIG_SYS_NAND_USE_FLASH_BBT /* Environment is in NAND */ #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index d4bf25b..3be3683 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_NAND_USE_FLASH_BBT /* * Ethernet Driver configuration diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 46ff99b..d25629f 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -28,7 +28,6 @@ #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_MXC_NAND_HWECC -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 56dff39..d5f9346 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -133,7 +133,6 @@ #ifdef CONFIG_NAND #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K #define CONFIG_SYS_NAND_CS 3 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index b0415b2..f0c82b8 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_NAND_USE_FLASH_BBT #endif /* DMA stuff, needed for GPMI/MXS NAND support */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 3b0dc77..5fd8f38 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -153,7 +153,6 @@ #define CONFIG_SYS_NAND_MASK_CLE 0x4000 #define CONFIG_SYS_NAND_MASK_ALE 0x2000 #define CONFIG_SYS_NAND_CS 2 -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_LARGEPAGE diff --git a/include/configs/x530.h b/include/configs/x530.h index fa5bcc3..432611c 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -39,7 +39,6 @@ /* NAND */ #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define BBT_CUSTOM_SCAN @@ -74,7 +73,6 @@ #endif /* NAND */ -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -- cgit v1.1