From 27b5bae2ec1b9b7864e13bce5e416ff27beb1614 Mon Sep 17 00:00:00 2001
From: Rui Salvaterra <rsalvaterra@gmail.com>
Date: Mon, 5 Apr 2021 19:04:40 +0100
Subject: [PATCH] treewide: remove redundant ubifs kconfig symbols

For the targets which enable ubifs, these symbols are already part of the
generic kconfigs. Drop them from the target kconfigs.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
---
 target/linux/apm821xx/nand/config-default    | 1 -
 target/linux/at91/sama5/config-default       | 4 ----
 target/linux/ath79/mikrotik/config-default   | 3 ---
 target/linux/ath79/nand/config-default       | 3 ---
 target/linux/bcm4908/config-5.4              | 4 ----
 target/linux/bcm53xx/config-5.4              | 4 ----
 target/linux/bcm63xx/smp/config-default      | 4 ----
 target/linux/bmips/nand/config-default       | 4 ----
 target/linux/imx6/config-5.10                | 4 ----
 target/linux/imx6/config-5.4                 | 4 ----
 target/linux/ipq40xx/config-5.4              | 4 ----
 target/linux/ipq806x/config-5.4              | 4 ----
 target/linux/ipq807x/config-default          | 3 ---
 target/linux/kirkwood/config-5.10            | 3 ---
 target/linux/kirkwood/config-5.4             | 3 ---
 target/linux/lantiq/xrx200/config-5.10       | 4 ----
 target/linux/lantiq/xrx200/config-5.4        | 4 ----
 target/linux/lantiq/xway/config-5.10         | 2 --
 target/linux/lantiq/xway/config-5.4          | 2 --
 target/linux/layerscape/armv7/config-5.4     | 4 ----
 target/linux/layerscape/armv8_64b/config-5.4 | 4 ----
 target/linux/mediatek/mt7622/config-5.10     | 3 ---
 target/linux/mediatek/mt7623/config-5.4      | 4 ----
 target/linux/mediatek/mt7629/config-5.4      | 4 ----
 target/linux/mpc85xx/p1010/config-default    | 4 ----
 target/linux/mpc85xx/p1020/config-default    | 4 ----
 target/linux/mvebu/config-5.10               | 3 ---
 target/linux/mvebu/config-5.4                | 3 ---
 target/linux/omap/config-5.4                 | 4 ----
 target/linux/oxnas/ox820/config-default      | 3 ---
 target/linux/pistachio/config-5.4            | 4 ----
 target/linux/ramips/mt7621/config-5.10       | 3 ---
 target/linux/ramips/mt7621/config-5.4        | 3 ---
 33 files changed, 114 deletions(-)

diff --git a/target/linux/apm821xx/nand/config-default b/target/linux/apm821xx/nand/config-default
index db60838cf3..060f2abf06 100644
--- a/target/linux/apm821xx/nand/config-default
+++ b/target/linux/apm821xx/nand/config-default
@@ -39,7 +39,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_RTL8366_SMI=y
 CONFIG_RTL8367B_PHY=y
 CONFIG_SENSORS_LM90=y
diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default
index e9d9bf7f3f..20c6414035 100644
--- a/target/linux/at91/sama5/config-default
+++ b/target/linux/at91/sama5/config-default
@@ -507,10 +507,6 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 CONFIG_TOUCHSCREEN_PROPERTIES=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default
index b89ef5f8ed..1e637bdfd3 100644
--- a/target/linux/ath79/mikrotik/config-default
+++ b/target/linux/ath79/mikrotik/config-default
@@ -32,9 +32,6 @@ CONFIG_PHY_AR7200_USB=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_SPI_RB4XX=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/target/linux/ath79/nand/config-default b/target/linux/ath79/nand/config-default
index 9ae059508f..6d8ff2d576 100644
--- a/target/linux/ath79/nand/config-default
+++ b/target/linux/ath79/nand/config-default
@@ -18,8 +18,5 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_PHY_AR7200_USB=y
 CONFIG_SGL_ALLOC=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/target/linux/bcm4908/config-5.4 b/target/linux/bcm4908/config-5.4
index 22bcdd4784..0b1514fd53 100644
--- a/target/linux/bcm4908/config-5.4
+++ b/target/linux/bcm4908/config-5.4
@@ -213,10 +213,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VMAP_STACK=y
diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4
index f57bfd36b6..e1b09c3f93 100644
--- a/target/linux/bcm53xx/config-5.4
+++ b/target/linux/bcm53xx/config-5.4
@@ -353,10 +353,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB_SUPPORT=y
diff --git a/target/linux/bcm63xx/smp/config-default b/target/linux/bcm63xx/smp/config-default
index 127c42e253..745153e898 100644
--- a/target/linux/bcm63xx/smp/config-default
+++ b/target/linux/bcm63xx/smp/config-default
@@ -34,10 +34,6 @@ CONFIG_SMP=y
 CONFIG_SMP_UP=y
 CONFIG_TREE_RCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
 CONFIG_ZLIB_DEFLATE=y
diff --git a/target/linux/bmips/nand/config-default b/target/linux/bmips/nand/config-default
index 16f7bdaf6d..eeb45b82f1 100644
--- a/target/linux/bmips/nand/config-default
+++ b/target/linux/bmips/nand/config-default
@@ -20,10 +20,6 @@ CONFIG_MTD_UBI_BLOCK=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_SGL_ALLOC=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_XXHASH=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/target/linux/imx6/config-5.10 b/target/linux/imx6/config-5.10
index 26db2fc50e..befdbaefab 100644
--- a/target/linux/imx6/config-5.10
+++ b/target/linux/imx6/config-5.10
@@ -466,10 +466,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx6/config-5.4
index 1012b0647f..553f1bff3e 100644
--- a/target/linux/imx6/config-5.4
+++ b/target/linux/imx6/config-5.4
@@ -433,10 +433,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index 0fb49355cb..09181cf53e 100644
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -444,10 +444,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index 68ed6ec0c7..d52feee505 100644
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -498,10 +498,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
diff --git a/target/linux/ipq807x/config-default b/target/linux/ipq807x/config-default
index f44e54d6c4..295a7b4200 100644
--- a/target/linux/ipq807x/config-default
+++ b/target/linux/ipq807x/config-default
@@ -624,9 +624,6 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UCS2_STRING=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNINLINE_SPIN_UNLOCK=y
diff --git a/target/linux/kirkwood/config-5.10 b/target/linux/kirkwood/config-5.10
index ad8cf89182..22a10dc7ce 100644
--- a/target/linux/kirkwood/config-5.10
+++ b/target/linux/kirkwood/config-5.10
@@ -267,9 +267,6 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TINY_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4
index f7eac5e811..a7347e42fb 100644
--- a/target/linux/kirkwood/config-5.4
+++ b/target/linux/kirkwood/config-5.4
@@ -264,9 +264,6 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TINY_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/lantiq/xrx200/config-5.10 b/target/linux/lantiq/xrx200/config-5.10
index 7f3048135a..51d8b6dcdf 100644
--- a/target/linux/lantiq/xrx200/config-5.10
+++ b/target/linux/lantiq/xrx200/config-5.10
@@ -84,10 +84,6 @@ CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_SUPPORT=y
diff --git a/target/linux/lantiq/xrx200/config-5.4 b/target/linux/lantiq/xrx200/config-5.4
index fc857fe72a..4782014285 100644
--- a/target/linux/lantiq/xrx200/config-5.4
+++ b/target/linux/lantiq/xrx200/config-5.4
@@ -79,10 +79,6 @@ CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_SUPPORT=y
diff --git a/target/linux/lantiq/xway/config-5.10 b/target/linux/lantiq/xway/config-5.10
index cfd03acc7e..0716679aee 100644
--- a/target/linux/lantiq/xway/config-5.10
+++ b/target/linux/lantiq/xway/config-5.10
@@ -42,8 +42,6 @@ CONFIG_SGL_ALLOC=y
 CONFIG_SOC_TYPE_XWAY=y
 CONFIG_SOC_XWAY=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_SUPPORT=y
diff --git a/target/linux/lantiq/xway/config-5.4 b/target/linux/lantiq/xway/config-5.4
index ae73ae147d..3f58576242 100644
--- a/target/linux/lantiq/xway/config-5.4
+++ b/target/linux/lantiq/xway/config-5.4
@@ -38,8 +38,6 @@ CONFIG_RTL8367B_PHY=y
 CONFIG_RTL8367_PHY=y
 CONFIG_SGL_ALLOC=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_SUPPORT=y
diff --git a/target/linux/layerscape/armv7/config-5.4 b/target/linux/layerscape/armv7/config-5.4
index 35c8eed8da..f58849d273 100644
--- a/target/linux/layerscape/armv7/config-5.4
+++ b/target/linux/layerscape/armv7/config-5.4
@@ -726,10 +726,6 @@ CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 # CONFIG_TSN is not set
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4
index b6289916c5..32412ab49f 100644
--- a/target/linux/layerscape/armv8_64b/config-5.4
+++ b/target/linux/layerscape/armv8_64b/config-5.4
@@ -906,10 +906,6 @@ CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_TREE_SRCU=y
 CONFIG_TSN=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UIO=y
 CONFIG_UIO_AEC=y
 CONFIG_UIO_CIF=y
diff --git a/target/linux/mediatek/mt7622/config-5.10 b/target/linux/mediatek/mt7622/config-5.10
index 7df7968162..8a8908831a 100644
--- a/target/linux/mediatek/mt7622/config-5.10
+++ b/target/linux/mediatek/mt7622/config-5.10
@@ -416,9 +416,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UCLAMP_TASK is not set
 # CONFIG_UNMAP_KERNEL_AT_EL0 is not set
 CONFIG_USB=y
diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4
index 45ae7a4261..faf78f2217 100644
--- a/target/linux/mediatek/mt7623/config-5.4
+++ b/target/linux/mediatek/mt7623/config-5.4
@@ -493,10 +493,6 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4
index 1c7d54cd37..55544506b5 100644
--- a/target/linux/mediatek/mt7629/config-5.4
+++ b/target/linux/mediatek/mt7629/config-5.4
@@ -351,10 +351,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/mpc85xx/p1010/config-default b/target/linux/mpc85xx/p1010/config-default
index 12fe598223..8a065f7944 100644
--- a/target/linux/mpc85xx/p1010/config-default
+++ b/target/linux/mpc85xx/p1010/config-default
@@ -10,7 +10,3 @@ CONFIG_REALTEK_PHY=y
 CONFIG_RED_15W_REV1=y
 CONFIG_TL_WDR4900_V1=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default
index 28e9138241..c9a84a344a 100644
--- a/target/linux/mpc85xx/p1020/config-default
+++ b/target/linux/mpc85xx/p1020/config-default
@@ -48,9 +48,5 @@ CONFIG_SWCONFIG_B53_PHY_DRIVER=y
 # CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
 CONFIG_TREE_RCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_WS_AP3710I=y
 CONFIG_XPS=y
diff --git a/target/linux/mvebu/config-5.10 b/target/linux/mvebu/config-5.10
index 9196c5c30e..48ed448180 100644
--- a/target/linux/mvebu/config-5.10
+++ b/target/linux/mvebu/config-5.10
@@ -404,9 +404,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/mvebu/config-5.4 b/target/linux/mvebu/config-5.4
index 1453a651da..52833b2394 100644
--- a/target/linux/mvebu/config-5.4
+++ b/target/linux/mvebu/config-5.4
@@ -398,9 +398,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/omap/config-5.4 b/target/linux/omap/config-5.4
index 3e2cc70d27..742fdd213e 100644
--- a/target/linux/omap/config-5.4
+++ b/target/linux/omap/config-5.4
@@ -700,10 +700,6 @@ CONFIG_TWL4030_WATCHDOG=y
 # CONFIG_TWL6030_USB is not set
 CONFIG_TWL6040_CORE=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
 CONFIG_USB=y
diff --git a/target/linux/oxnas/ox820/config-default b/target/linux/oxnas/ox820/config-default
index 9ec3a7fdaa..b846b6ed8f 100644
--- a/target/linux/oxnas/ox820/config-default
+++ b/target/linux/oxnas/ox820/config-default
@@ -90,9 +90,6 @@ CONFIG_SMP_ON_UP=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_SECURITY=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress-ox820.h"
 CONFIG_XPS=y
diff --git a/target/linux/pistachio/config-5.4 b/target/linux/pistachio/config-5.4
index 890bb57ff9..4093a8d88f 100644
--- a/target/linux/pistachio/config-5.4
+++ b/target/linux/pistachio/config-5.4
@@ -351,10 +351,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_COMMON=y
diff --git a/target/linux/ramips/mt7621/config-5.10 b/target/linux/ramips/mt7621/config-5.10
index adbd0c8c6c..171b0d3cca 100644
--- a/target/linux/ramips/mt7621/config-5.10
+++ b/target/linux/ramips/mt7621/config-5.10
@@ -283,9 +283,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4
index 5a2d10329d..68841a7c83 100644
--- a/target/linux/ramips/mt7621/config-5.4
+++ b/target/linux/ramips/mt7621/config-5.4
@@ -272,9 +272,6 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
-- 
2.30.2