kernel: Move CONFIG_F2FS_FS_SECURITY to generic kernel config

Move the CONFIG_F2FS_FS_SECURITY kernel configuration option to the
generic kernel configuration.

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 0abd5285db48b30aab0d6f2c5dcea7965d7a1f60..db753308eec0c64ec148ee8be0d421c34ff6bf32 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -209,7 +209,6 @@ define KernelPackage/fs-f2fs
   KCONFIG:= \
        CONFIG_F2FS_FS \
        CONFIG_F2FS_FS_POSIX_ACL=n \
-       CONFIG_F2FS_FS_SECURITY=n \
        CONFIG_F2FS_CHECK_FS=n
   FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko
   AUTOLOAD:=$(call AutoLoad,30,f2fs,1)

diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default
index 15aed962d5d28a2ba51e687a19ae58e7dbd7ceb4..284ba04bb8f3ccb62f746464939de5ae2d25b375 100644 (file)
--- a/target/linux/apm821xx/sata/config-default
+++ b/target/linux/apm821xx/sata/config-default
@@ -17,7 +17,6 @@ CONFIG_SATA_DWC=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_GPIOLIB=y

diff --git a/target/linux/armvirt/config-4.19 b/target/linux/armvirt/config-4.19
index a9a17ecae38a9caaf457657b946b7d2b41dcef5c..945cf91893275e35e6a57c18c2b8d9082d922b06 100644 (file)
--- a/target/linux/armvirt/config-4.19
+++ b/target/linux/armvirt/config-4.19
@@ -57,7 +57,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_POINTER=y

diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4
index 30ad3d26eab330d329acf1cbde1d5742d7149693..f2c43a3ff2fb0026ad90efe11775f713acd293e4 100644 (file)
--- a/target/linux/armvirt/config-5.4
+++ b/target/linux/armvirt/config-5.4
@@ -70,7 +70,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_POINTER=y

diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index 6c88e4159321ba5bbd00f165f371b7233456189e..3de757ae266153292ce7e37338d0ccb24601d50d 100644 (file)
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -1407,6 +1407,7 @@ CONFIG_EXTRA_TARGETS=""
 # CONFIG_F2FS_FS is not set
 # CONFIG_F2FS_FS_ENCRYPTION is not set
 # CONFIG_F2FS_FS_POSIX_ACL is not set
+# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y

diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19
index 5a3d0296801256df3d8139990a0cf782f2c46670..d38ebe10e43b6f17536a8a6e1f9aefb9dc232c86 100644 (file)
--- a/target/linux/imx6/config-4.19
+++ b/target/linux/imx6/config-4.19
@@ -190,7 +190,6 @@ 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_F2FS_FS_SECURITY is not set
 CONFIG_FEC=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/malta/config-4.19 b/target/linux/malta/config-4.19
index 1f1b6fb54918d68204fe08c0dd4911f432a42783..3cb1b34eaecfff367ef7e848b91523b7b13634ac 100644 (file)
--- a/target/linux/malta/config-4.19
+++ b/target/linux/malta/config-4.19
@@ -95,7 +95,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y

diff --git a/target/linux/mediatek/mt7623/config-4.19 b/target/linux/mediatek/mt7623/config-4.19
index edf285c45a7c6643c1aea2724c0094563199f5ea..01c96b1f0a86ce455dc73636818083493d99ba3b 100644 (file)
--- a/target/linux/mediatek/mt7623/config-4.19
+++ b/target/linux/mediatek/mt7623/config-4.19
@@ -175,7 +175,6 @@ CONFIG_ELF_CORE=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FREEZER=y

diff --git a/target/linux/mvebu/config-4.19 b/target/linux/mvebu/config-4.19
index 1eae0a55db4a2388ec6e8bd6d6d05efecabdc4df..5dbbb59562273d02cbd83bb6a2c716377f7938f3 100644 (file)
--- a/target/linux/mvebu/config-4.19
+++ b/target/linux/mvebu/config-4.19
@@ -178,7 +178,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FS_IOMAP=y

diff --git a/target/linux/octeon/config-4.19 b/target/linux/octeon/config-4.19
index d9a624d3b8ad3930e6b1feaaa6397175d7a609e7..49ecd3d43a0d8247e9a365c7b70df7d8b35a6f57 100644 (file)
--- a/target/linux/octeon/config-4.19
+++ b/target/linux/octeon/config-4.19
@@ -75,7 +75,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FAT_FS=y
 CONFIG_FIXED_PHY=y
 CONFIG_FRAME_WARN=2048

diff --git a/target/linux/omap/config-4.19 b/target/linux/omap/config-4.19
index ead207fc2dc84e32bd44ee7c331da5d804ad2fa5..db37a89e5bb2ab6ab1f3755996f01c3caa84f332 100644 (file)
--- a/target/linux/omap/config-4.19
+++ b/target/linux/omap/config-4.19
@@ -240,7 +240,6 @@ CONFIG_EXTCON_PALMAS=y
 CONFIG_EXTCON_USB_GPIO=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=y
 CONFIG_FB_CMDLINE=y

diff --git a/target/linux/sunxi/config-4.19 b/target/linux/sunxi/config-4.19
index 37b45c666da0353bca822af245c36740a0b63a94..5f682d2c51b91729d8cec2ae8093a3db1b77338e 100644 (file)
--- a/target/linux/sunxi/config-4.19
+++ b/target/linux/sunxi/config-4.19
@@ -172,7 +172,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y

diff --git a/target/linux/tegra/config-4.19 b/target/linux/tegra/config-4.19
index 0650783f8b396ec7365ce3464298dfe49689bdf3..86299a719689934fc447b7257c014583aa7274bb 100644 (file)
--- a/target/linux/tegra/config-4.19
+++ b/target/linux/tegra/config-4.19
@@ -197,7 +197,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y

diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 968bcb46208b459b15febb96337710b4f23a92c9..6baedf035dc6a8c7a0ce077833cd84fe081dde78 100644 (file)
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -212,7 +212,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y

diff --git a/target/linux/x86/config-4.19 b/target/linux/x86/config-4.19
index 34c10ae4093858b39ae31fa5178999a25afbf7ef..412fdf900b690a06a2edb74da3e6bcad94058240 100644 (file)
--- a/target/linux/x86/config-4.19
+++ b/target/linux/x86/config-4.19
@@ -130,7 +130,6 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
index a2b18f33f0f847655b690011e5fe940bae06456a..66cca96005547d3c9a02bac6b04590567f01d025 100644 (file)
--- a/target/linux/x86/config-5.4
+++ b/target/linux/x86/config-5.4
@@ -147,7 +147,6 @@ CONFIG_EFI_EARLYCON=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y

diff --git a/target/linux/zynq/config-4.19 b/target/linux/zynq/config-4.19
index c12bd5f8c18cede6624a3a4e44aead4ac53ac93b..86033b031a9ca677cf1a11f7f922dc0f7c648bc8 100644 (file)
--- a/target/linux/zynq/config-4.19
+++ b/target/linux/zynq/config-4.19
@@ -194,7 +194,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y

diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4
index d389a27a03ca1463a274a719d437d517244b3e49..090846036e9729d0a9a00bbce5a363e0f8a212ea 100644 (file)
--- a/target/linux/zynq/config-5.4
+++ b/target/linux/zynq/config-5.4
@@ -205,7 +205,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXTCON=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y