kernel: move CONFIG_F2FS_CHECK_FS to generic kernel config

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index db753308eec0c64ec148ee8be0d421c34ff6bf32..79ba672967dc25e5d7a5d1f833ede88e423a8d8e 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -206,10 +206,7 @@ define KernelPackage/fs-f2fs
   SUBMENU:=$(FS_MENU)
   TITLE:=F2FS filesystem support
   DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +!LINUX_4_19:kmod-nls-base
   SUBMENU:=$(FS_MENU)
   TITLE:=F2FS filesystem support
   DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +!LINUX_4_19:kmod-nls-base

-  KCONFIG:= \
-       CONFIG_F2FS_FS \
-       CONFIG_F2FS_FS_POSIX_ACL=n \
-       CONFIG_F2FS_CHECK_FS=n
+  KCONFIG:=CONFIG_F2FS_FS

   FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko
   AUTOLOAD:=$(call AutoLoad,30,f2fs,1)
 endef
   FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko
   AUTOLOAD:=$(call AutoLoad,30,f2fs,1)
 endef

diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default
index 284ba04bb8f3ccb62f746464939de5ae2d25b375..db2c5c8a307c164b8436cc4400f7946e36814656 100644 (file)
--- a/target/linux/apm821xx/sata/config-default
+++ b/target/linux/apm821xx/sata/config-default
@@ -15,7 +15,6 @@ CONFIG_GENERIC_PHY=y
 CONFIG_SATA_DWC=y
 # CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_EXT4_FS=y
 CONFIG_SATA_DWC=y
 # CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_F2FS_FS=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y

diff --git a/target/linux/armvirt/config-4.19 b/target/linux/armvirt/config-4.19
index 945cf91893275e35e6a57c18c2b8d9082d922b06..6dbc5aecfddab0f76d76ebf5c26a19a5ce35dec2 100644 (file)
--- a/target/linux/armvirt/config-4.19
+++ b/target/linux/armvirt/config-4.19
@@ -55,7 +55,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DTC=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 CONFIG_DTC=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_F2FS_FS=y
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4
index f2c43a3ff2fb0026ad90efe11775f713acd293e4..806de23964ad90cb4a37cddefdf9495bc28ea098 100644 (file)
--- a/target/linux/armvirt/config-5.4
+++ b/target/linux/armvirt/config-5.4
@@ -68,7 +68,6 @@ CONFIG_DMA_REMAP=y
 CONFIG_DTC=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 CONFIG_DTC=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_F2FS_FS=y
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index 3de757ae266153292ce7e37338d0ccb24601d50d..6f4478f18e1478e70d83fb42a7429a7818c6cc6e 100644 (file)
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -1403,6 +1403,7 @@ CONFIG_EXTRA_TARGETS=""
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 # CONFIG_EZX_PCAP is not set

+# CONFIG_F2FS_CHECK_FS is not set

 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS is not set
 # CONFIG_F2FS_FS_ENCRYPTION is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS is not set
 # CONFIG_F2FS_FS_ENCRYPTION is not set

diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19
index d38ebe10e43b6f17536a8a6e1f9aefb9dc232c86..8435ece397b1ed1b0649c332cd529b1dc02c4526 100644 (file)
--- a/target/linux/imx6/config-4.19
+++ b/target/linux/imx6/config-4.19
@@ -188,7 +188,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FEC=y
 CONFIG_FIXED_PHY=y
 CONFIG_F2FS_FS=y
 CONFIG_FEC=y
 CONFIG_FIXED_PHY=y

diff --git a/target/linux/malta/config-4.19 b/target/linux/malta/config-4.19
index 3cb1b34eaecfff367ef7e848b91523b7b13634ac..862f869704b070e990abac6eade2b3bff23bf360 100644 (file)
--- a/target/linux/malta/config-4.19
+++ b/target/linux/malta/config-4.19
@@ -93,7 +93,6 @@ CONFIG_DTC=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
 CONFIG_F2FS_FS=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y

diff --git a/target/linux/mediatek/mt7623/config-4.19 b/target/linux/mediatek/mt7623/config-4.19
index 01c96b1f0a86ce455dc73636818083493d99ba3b..843497227919cff786b35bf3b41ff7bafb87b15e 100644 (file)
--- a/target/linux/mediatek/mt7623/config-4.19
+++ b/target/linux/mediatek/mt7623/config-4.19
@@ -173,7 +173,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
 CONFIG_ELF_CORE=y
 CONFIG_EXT4_FS=y
 CONFIG_EINT_MTK=y
 CONFIG_ELF_CORE=y
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_F2FS_FS=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/mvebu/config-4.19 b/target/linux/mvebu/config-4.19
index 5dbbb59562273d02cbd83bb6a2c716377f7938f3..7a13cd50c9dc136d8135e41cccb7b25145e6ffce 100644 (file)
--- a/target/linux/mvebu/config-4.19
+++ b/target/linux/mvebu/config-4.19
@@ -176,7 +176,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_F2FS_FS=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/octeon/config-4.19 b/target/linux/octeon/config-4.19
index 49ecd3d43a0d8247e9a365c7b70df7d8b35a6f57..3385271beda005701a1e359a7b8486b2b46594b9 100644 (file)
--- a/target/linux/octeon/config-4.19
+++ b/target/linux/octeon/config-4.19
@@ -73,7 +73,6 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FAT_FS=y
 CONFIG_FIXED_PHY=y
 CONFIG_F2FS_FS=y
 CONFIG_FAT_FS=y
 CONFIG_FIXED_PHY=y

diff --git a/target/linux/omap/config-4.19 b/target/linux/omap/config-4.19
index db37a89e5bb2ab6ab1f3755996f01c3caa84f332..3ecabead882a4b7d78c98bcd3d826ac2ce8c8cd3 100644 (file)
--- a/target/linux/omap/config-4.19
+++ b/target/linux/omap/config-4.19
@@ -238,7 +238,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_EXTCON_PALMAS=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON=y
 CONFIG_EXTCON_PALMAS=y
 CONFIG_EXTCON_USB_GPIO=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=y
 CONFIG_F2FS_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=y

diff --git a/target/linux/sunxi/config-4.19 b/target/linux/sunxi/config-4.19
index 5f682d2c51b91729d8cec2ae8093a3db1b77338e..e3ac9f4f2dd00208ff8356daceb6c46a0f1cdfd9 100644 (file)
--- a/target/linux/sunxi/config-4.19
+++ b/target/linux/sunxi/config-4.19
@@ -170,7 +170,6 @@ CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FAT_FS=y
 CONFIG_FB=y
 CONFIG_F2FS_FS=y
 CONFIG_FAT_FS=y
 CONFIG_FB=y

diff --git a/target/linux/tegra/config-4.19 b/target/linux/tegra/config-4.19
index 86299a719689934fc447b7257c014583aa7274bb..20eead79cebb18c790e8347accda0e8f008faca1 100644 (file)
--- a/target/linux/tegra/config-4.19
+++ b/target/linux/tegra/config-4.19
@@ -195,7 +195,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y

diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 6baedf035dc6a8c7a0ce077833cd84fe081dde78..f6eef50e75fa51f3de84dafd8936591a548a994d 100644 (file)
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -210,7 +210,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y

diff --git a/target/linux/x86/config-4.19 b/target/linux/x86/config-4.19
index 412fdf900b690a06a2edb74da3e6bcad94058240..fad10dfef4fc468a1cb965c0dc3a214a97d573cf 100644 (file)
--- a/target/linux/x86/config-4.19
+++ b/target/linux/x86/config-4.19
@@ -128,7 +128,6 @@ CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y
 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_F2FS_FS=y
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y

diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
index 66cca96005547d3c9a02bac6b04590567f01d025..83d9cf2e0509238291166f9f69e334036bb6084e 100644 (file)
--- a/target/linux/x86/config-5.4
+++ b/target/linux/x86/config-5.4
@@ -145,7 +145,6 @@ CONFIG_EFI_EARLYCON=y
 # CONFIG_EISA is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y
 # CONFIG_EISA is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_F2FS_FS=y
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y

diff --git a/target/linux/zynq/config-4.19 b/target/linux/zynq/config-4.19
index 86033b031a9ca677cf1a11f7f922dc0f7c648bc8..1581521d89b4d27d72192dcd88829254ce870d70 100644 (file)
--- a/target/linux/zynq/config-4.19
+++ b/target/linux/zynq/config-4.19
@@ -192,7 +192,6 @@ CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y

diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4
index 090846036e9729d0a9a00bbce5a363e0f8a212ea..5b7b0ebfb32e83baa67ec6263376d1cd47ebc0ce 100644 (file)
--- a/target/linux/zynq/config-5.4
+++ b/target/linux/zynq/config-5.4
@@ -203,7 +203,6 @@ CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y

-# CONFIG_F2FS_CHECK_FS is not set

 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y