diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig
index 9bbc5c661d4376a05ca21423063af89b8f0346fb..1d7caaff996378b5d554f49ffa01b2405b80e23b 100644
--- a/drivers/fastboot/Kconfig
+++ b/drivers/fastboot/Kconfig
@@ -86,6 +86,13 @@ config FASTBOOT_FLASH_MMC_DEV
 	  regarding the non-volatile storage device. Define this to
 	  the eMMC device that fastboot should use to store the image.
 
+config FASTBOOT_FLASH_NAND_TRIMFFS
+	bool "Skip empty pages when flashing NAND"
+	depends on FASTBOOT_FLASH_NAND
+	help
+	  When flashing NAND enable the DROP_FFS flag to drop trailing all-0xff
+	  pages.
+
 config FASTBOOT_GPT_NAME
 	string "Target name for updating GPT"
 	depends on FASTBOOT_FLASH_MMC && EFI_PARTITION
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 705ed89a659f7bbe414fe1f961ce54dd9c8c7f2f..117ed2e152698b7721448de6af3a4e6e0d084a46 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -590,7 +590,6 @@ CONFIG_EXYNOS_SPL
 CONFIG_EXYNOS_TMU
 CONFIG_FACTORYSET
 CONFIG_FASTBOOT_FLASH_FILLBUF_SIZE
-CONFIG_FASTBOOT_FLASH_NAND_TRIMFFS
 CONFIG_FAST_FLASH_BIT
 CONFIG_FB_ADDR
 CONFIG_FB_BACKLIGHT