mtd: nand: raw: Move CONFIG_SYS_NAND_USE_FLASH_BBT to Kconfig
Subsystems (3)
PATCH 1/1 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.
--- configs/colibri-imx6ull_defconfig | 1 + configs/da850evm_nand_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-mv784mp-gp_defconfig | 1 + configs/db-xc3-24g4xg_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/imx6q_logic_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2e_hs_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/k2l_hs_evm_defconfig | 1 + configs/m53menlo_defconfig | 1 + configs/mx53ard_defconfig | 1 + configs/omapl138_lcdk_defconfig | 2 +- configs/pcm058_defconfig | 1 + configs/x530_defconfig | 1 + drivers/mtd/nand/raw/Kconfig | 5 +++++ 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 -- scripts/config_whitelist.txt | 1 - 36 files changed, 25 insertions(+), 17 deletions(-)
configs/colibri-imx6ull_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_DM_MMC=y CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXS=y CONFIG_NAND_MXS_DT=y CONFIG_MTD_UBI_FASTMAP=y
configs/da850evm_nand_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_MTD=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
configs/db-88f6820-amc_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1
configs/db-mv784mp-gp_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_SATA_MV=y CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y
configs/db-xc3-24g4xg_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_SYS_I2C_MVTWSI=y CONFIG_MTD=y CONFIG_MTD_DEVICE=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y
configs/devkit3250_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_LPC32XX_SLC=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_PHYLIB=y
configs/imx6q_logic_defconfig +1 -0
@@ -70,6 +70,7 @@ CONFIG_LED_GPIO=y CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXS=y CONFIG_NAND_MXS_DT=y CONFIG_PHYLIB=y
configs/k2e_evm_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_TI_AEMIF=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2e_hs_evm_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_TI_AEMIF=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2g_evm_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2g_hs_evm_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2hk_evm_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_TI_AEMIF=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2hk_hs_evm_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_TI_AEMIF=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2l_evm_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_TI_AEMIF=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/k2l_hs_evm_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_TI_AEMIF=y CONFIG_MISC=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y
configs/m53menlo_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y
configs/mx53ard_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_FSL_ESDHC_IMX=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXC=y CONFIG_MII=y CONFIG_SMC911X=y
configs/omapl138_lcdk_defconfig +1 -1
@@ -44,6 +44,7 @@ CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MTD=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
@@ -57,7 +58,6 @@ CONFIG_PHY_DA8XX_USB=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y -CONFIG_USE_TINY_PRINTF=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_OHCI_HCD=y
configs/pcm058_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_DM=y CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0
configs/x530_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_NAND=y +CONFIG_SYS_NAND_USE_FLASH_BBT=y CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1
drivers/mtd/nand/raw/Kconfig +5 -0
@@ -15,6 +15,11 @@ config SYS_NAND_DRIVER_ECC_LAYOUT Omit standard ECC layouts to safe space. Select this if your driver is known to provide its own ECC layout. +config SYS_NAND_USE_FLASH_BBT + bool "Enable BBT (Bad Block Table) support" + help + Enable the BBT (Bad Block Table) usage. + config NAND_ATMEL bool "Support Atmel NAND controller" imply SYS_NAND_USE_FLASH_BBT
include/configs/colibri-imx6ull.h +0 -1
@@ -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
include/configs/da850evm.h +0 -1
@@ -131,7 +131,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
include/configs/db-88f6820-amc.h +0 -1
@@ -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 */
include/configs/db-mv784mp-gp.h +0 -1
@@ -46,7 +46,6 @@#endif /* NAND */ -#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_ONFI_DETECTION /*
include/configs/db-xc3-24g4xg.h +0 -1
@@ -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 */
include/configs/devkit3250.h +0 -1
@@ -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
include/configs/imx6_logic.h +0 -1
@@ -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 */
include/configs/m53menlo.h +0 -1
@@ -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
include/configs/mvebu_armada-8k.h +0 -1
@@ -58,7 +58,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
include/configs/mx53ard.h +0 -1
@@ -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
include/configs/omapl138_lcdk.h +0 -1
@@ -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
include/configs/pcm058.h +0 -1
@@ -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 */
include/configs/ti_armv7_keystone2.h +0 -1
@@ -154,7 +154,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
include/configs/x530.h +0 -2
@@ -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
scripts/config_whitelist.txt +0 -1
@@ -3337,7 +3337,6 @@ CONFIG_SYS_NAND_SELECT_DEVICE CONFIG_SYS_NAND_SIZE CONFIG_SYS_NAND_SPL_KERNEL_OFFS CONFIG_SYS_NAND_SPL_SIZE -CONFIG_SYS_NAND_USE_FLASH_BBT CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_NAND_U_BOOT_RELOC CONFIG_SYS_NAND_U_BOOT_RELOC_SP
Signature · 1 line
2.23.0
PATCH 1/1 mtd: nand: raw: Move CONFIG_SYS_NAND_USE_FLASH_BBT to Kconfig
Quoted 9 lines · Stefan Roese
Convert
CONFIG_SYS_NAND_USE_FLASH_BBTtoKconfig, update defconfigs, headers and whitelist.Please note that this symbol already was used in
Kconfig(imply inCONFIG_NAND_ATMEL) which did not work, since this symbol was not available inKconfig. This changes now with this patch and all boards withCONFIG_NAND_ATMELwill have BBT enabled. Which is what I also need on my GARDENA AT91SAM based board.
Quoted 4 lines
Signed-off-by Stefan Roese <[email protected]>Cc Eugen Hristev <[email protected]>Cc Miquel Raynal <[email protected]>Cc Gregory CLEMENT <[email protected]>
Now, I had to rework this slightly. In order to not change behavior, all of the platforms that might have been intending to use this, but hadn't been, have it turned off for now to keep behavior the same, due to how imply works. Patches for platforms to enable this feature would be appropriate still for this release.
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190826/79e4750c/attachment.sig>