[DistroKit] [PATCH v1 6/9] mips: kernel-malta: enable UBIFS

[Oleksij Rempel <o.rempel@pengutronix.de>]

Other platform are enabling UBIFS now. Enable it for MIPS malta too.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 configs/platform-mips/kernelconfig-malta      | 42 ++++++++++++++++---
 configs/platform-mips/kernelconfig-malta.diff | 38 +----------------
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/configs/platform-mips/kernelconfig-malta b/configs/platform-mips/kernelconfig-malta
index 41f77b74..d21db8c6 100644
--- a/configs/platform-mips/kernelconfig-malta
+++ b/configs/platform-mips/kernelconfig-malta
@@ -1452,7 +1452,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_LPDDR is not set
 # end of LPDDR & LPDDR2 PCM memory drivers
 
-CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
@@ -3258,7 +3258,39 @@ CONFIG_TMPFS=y
 # CONFIG_CONFIGFS_FS is not set
 # end of Pseudo filesystems
 
-# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS 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_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+# CONFIG_UBIFS_FS_AUTHENTICATION is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_EROFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V2=y
@@ -3525,7 +3557,7 @@ CONFIG_CRYPTO_CRC32C=y
 #
 # Compression
 #
-CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 # CONFIG_CRYPTO_LZ4 is not set
@@ -3644,8 +3676,8 @@ CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_XXHASH=y
 # CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_ZSTD_COMMON=y
diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff
index 7c0ceeb2..5fa2c0c0 100644
--- a/configs/platform-mips/kernelconfig-malta.diff
+++ b/configs/platform-mips/kernelconfig-malta.diff
@@ -4,8 +4,6 @@ ea4829d5ac8a0aa3ee33fc132702ae88
 # CONFIG_ACENIC is not set
 # CONFIG_ACORN_PARTITION is undefined
 # CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_ADFS_FS is undefined
-# CONFIG_AFFS_FS is undefined
 # CONFIG_AG71XX is undefined
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_DWC is not set
@@ -82,8 +80,6 @@ CONFIG_AX88796=m
 CONFIG_BCM_NET_PHYLIB=m
 # CONFIG_BE2ISCSI is not set
 # CONFIG_BE2NET is not set
-# CONFIG_BEFS_FS is undefined
-# CONFIG_BFS_FS is undefined
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_BLK_DEV_BSG=y
@@ -180,7 +176,6 @@ CONFIG_CPU_MIPSR2_IRQ_VI=y
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_RM7000 is not set
 CONFIG_CPU_RMAP=y
-# CONFIG_CRAMFS is undefined
 CONFIG_CRASH_CORE=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -204,7 +199,6 @@ CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
@@ -293,13 +287,10 @@ CONFIG_DNOTIFY=y
 # CONFIG_E1000E is not set
 # CONFIG_E100 is not set
 # CONFIG_EARLY_PRINTK is undefined
-# CONFIG_ECRYPT_FS is undefined
-# CONFIG_EFS_FS is undefined
 CONFIG_ELF_CORE=y
 # CONFIG_ENIC is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is undefined
 # CONFIG_ET131X is not set
 CONFIG_FB=y
 # CONFIG_FB_3DFX is not set
@@ -418,8 +409,6 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 CONFIG_HAVE_PCI=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 # CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN is undefined
-# CONFIG_HFSPLUS_FS is undefined
-# CONFIG_HFS_FS is undefined
 CONFIG_HID=m
 # CONFIG_HIDRAW is not set
 # CONFIG_HID_A4TECH is not set
@@ -520,7 +509,6 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
 # CONFIG_HOTPLUG_PCI is not set
-# CONFIG_HPFS_FS is undefined
 # CONFIG_HP_ILO is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_BA431 is not set
@@ -674,7 +662,6 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ISCSI_TCP=m
 # CONFIG_ISDN is not set
 # CONFIG_IXGBE is not set
-# CONFIG_JFFS2_FS is undefined
 # CONFIG_JME is not set
 # CONFIG_JZ4740_WDT is undefined
 # CONFIG_KARMA_PARTITION is undefined
@@ -807,7 +794,6 @@ CONFIG_MD_RAID456=m
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_VX855 is not set
 CONFIG_MII=y
-# CONFIG_MINIX_FS is undefined
 # CONFIG_MINIX_SUBPARTITION is undefined
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_CM=y
@@ -832,7 +818,6 @@ CONFIG_MIPS_PLATFORM_DEVICES=y
 # CONFIG_MIPS_RAW_APPENDED_DTB is not set
 # CONFIG_MIPS_VPE_LOADER is not set
 # CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_FILESYSTEMS is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISDN is undefined
 CONFIG_MODULE_SRCVERSION_ALL=y
@@ -889,7 +874,6 @@ CONFIG_MTD_OOPS=m
 # CONFIG_MTD_PHYSMAP_OF is undefined
 # CONFIG_MTD_PHYSMAP_VERSATILE is undefined
 # CONFIG_MTD_PMC551 is not set
-CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MULTIPLEXER=y
 # CONFIG_MUX_ADG792A is not set
@@ -1162,8 +1146,6 @@ CONFIG_NVMEM_SYSFS=y
 # CONFIG_NVMEM_U_BOOT_ENV is not set
 # CONFIG_OF_GPIO is undefined
 CONFIG_OF_MDIO=m
-# CONFIG_OMFS_FS is undefined
-# CONFIG_ORANGEFS_FS is undefined
 # CONFIG_OSF_PARTITION is undefined
 # CONFIG_OVERLAY_FS is not set
 # CONFIG_OVERLAY_FS_DEBUG is undefined
@@ -1301,12 +1283,9 @@ CONFIG_POWER_RESET_SYSCON=y
 # CONFIG_PRESTERA is undefined
 CONFIG_PROC_KCORE=y
 CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PSTORE is undefined
 # CONFIG_QED is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QLCNIC is not set
-# CONFIG_QNX4FS_FS is undefined
-# CONFIG_QNX6FS_FS is undefined
 CONFIG_QSEMI_PHY=m
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
@@ -1409,7 +1388,6 @@ CONFIG_RFKILL=m
 # CONFIG_RFKILL_LEDS is undefined
 CONFIG_RFS_ACCEL=y
 # CONFIG_RMI4_CORE is not set
-# CONFIG_ROMFS_FS is undefined
 CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
@@ -1619,7 +1597,7 @@ CONFIG_SMSC_PHY=m
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
 # CONFIG_SOFT_WATCHDOG is undefined
 # CONFIG_SOLARIS_X86_PARTITION is undefined
-# CONFIG_SQUASHFS is undefined
+# CONFIG_SQUASHFS is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is undefined
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is undefined
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is undefined
@@ -1652,7 +1630,6 @@ CONFIG_SYNC_R4K=y
 CONFIG_SYSFS_SYSCALL=y
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_SYSV68_PARTITION is undefined
-# CONFIG_SYSV_FS is undefined
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R3_5=y
 CONFIG_SYS_HAS_CPU_MIPS32_R5=y
@@ -1711,18 +1688,8 @@ CONFIG_TIMER_PROBE=y
 # CONFIG_TPS65010 is undefined
 CONFIG_TUN=m
 # CONFIG_TXGBE is not set
-# CONFIG_UBIFS_ATIME_SUPPORT is undefined
-# CONFIG_UBIFS_FS is undefined
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
-# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
-# CONFIG_UBIFS_FS_LZO is undefined
-# CONFIG_UBIFS_FS_SECURITY is undefined
-# CONFIG_UBIFS_FS_XATTR is undefined
-# CONFIG_UBIFS_FS_ZLIB is undefined
-# CONFIG_UBIFS_FS_ZSTD is undefined
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UEVENT_HELPER_PATH is undefined
-# CONFIG_UFS_FS is undefined
 # CONFIG_UHID is not set
 CONFIG_UIO=m
 # CONFIG_UIO_AEC is not set
@@ -1771,7 +1738,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_VMXNET3 is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VXFS_FS is undefined
 CONFIG_WAR_ICACHE_REFILLS=y
 # CONFIG_WATCHDOG is not set
 # CONFIG_WATCHDOG_CORE is undefined
@@ -1828,6 +1794,4 @@ CONFIG_XPS=y
 # CONFIG_XZ_DEC_X86 is undefined
 # CONFIG_YELLOWFIN is not set
 # CONFIG_ZIIRAVE_WATCHDOG is undefined
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_ZLIB_INFLATE=m
 CONFIG_ZONE_DMA=y
-- 
2.39.2