From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 21 Aug 2024 11:51:45 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sgi0H-00BsMR-1i for lore@lore.pengutronix.de; Wed, 21 Aug 2024 11:51:45 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sgi0G-0008S1-O7; Wed, 21 Aug 2024 11:51:44 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sgi06-0008Nc-LQ; Wed, 21 Aug 2024 11:51:34 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sgi06-001ywD-4N; Wed, 21 Aug 2024 11:51:34 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sgi06-006AtJ-0H; Wed, 21 Aug 2024 11:51:34 +0200 From: Oleksij Rempel To: distrokit@pengutronix.de Date: Wed, 21 Aug 2024 11:51:31 +0200 Message-Id: <20240821095133.1471779-8-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240821095133.1471779-1-o.rempel@pengutronix.de> References: <20240821095133.1471779-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v1 7/9] mips: kernel-malta: enable SQUASHFS X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleksij Rempel Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false squashfs, dm-verity and loop support is needed to mount rauc bundles. Signed-off-by: Oleksij Rempel --- configs/platform-mips/kernelconfig-malta | 64 +++++++++---------- configs/platform-mips/kernelconfig-malta.diff | 53 ++------------- 2 files changed, 36 insertions(+), 81 deletions(-) diff --git a/configs/platform-mips/kernelconfig-malta b/configs/platform-mips/kernelconfig-malta index d21db8c6..0ff86c40 100644 --- a/configs/platform-mips/kernelconfig-malta +++ b/configs/platform-mips/kernelconfig-malta @@ -563,7 +563,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y -CONFIG_BLOCK_LEGACY_AUTOLOAD=y +# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set @@ -1743,44 +1743,35 @@ CONFIG_ATA_PIIX=y # CONFIG_ATA_GENERIC is not set CONFIG_PATA_LEGACY=y CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -# CONFIG_MD_BITMAP_FILE is not set -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m +# CONFIG_BLK_DEV_MD is not set +CONFIG_MD_BITMAP_FILE=y # CONFIG_BCACHE is not set CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m +CONFIG_BLK_DEV_DM=y # CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m +CONFIG_DM_BUFIO=y # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set # CONFIG_DM_UNSTRIPED is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m +# CONFIG_DM_CRYPT is not set +# CONFIG_DM_SNAPSHOT is not set # CONFIG_DM_THIN_PROVISIONING is not set # CONFIG_DM_CACHE is not set # CONFIG_DM_WRITECACHE is not set # CONFIG_DM_EBS is not set # CONFIG_DM_ERA is not set # CONFIG_DM_CLONE is not set -CONFIG_DM_MIRROR=m -# CONFIG_DM_LOG_USERSPACE is not set +# CONFIG_DM_MIRROR is not set # CONFIG_DM_RAID is not set -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -# CONFIG_DM_MULTIPATH_QL is not set -# CONFIG_DM_MULTIPATH_ST is not set -# CONFIG_DM_MULTIPATH_HST is not set -# CONFIG_DM_MULTIPATH_IOA is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set # CONFIG_DM_DELAY is not set # CONFIG_DM_DUST is not set +# CONFIG_DM_INIT is not set # CONFIG_DM_UEVENT is not set # CONFIG_DM_FLAKEY is not set -# CONFIG_DM_VERITY is not set +CONFIG_DM_VERITY=y +# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set +# CONFIG_DM_VERITY_FEC is not set # CONFIG_DM_SWITCH is not set # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_INTEGRITY is not set @@ -3279,7 +3270,23 @@ 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_SQUASHFS=y +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y +CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y +# CONFIG_SQUASHFS_XATTR is not set +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZ4 is not set +# CONFIG_SQUASHFS_LZO is not set +# CONFIG_SQUASHFS_XZ is not set +# CONFIG_SQUASHFS_ZSTD is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set @@ -3420,12 +3427,6 @@ CONFIG_RANDSTRUCT_NONE=y # end of Kernel hardening options # end of Security options -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m CONFIG_CRYPTO=y # @@ -3623,8 +3624,6 @@ CONFIG_BINARY_PRINTF=y # # Library routines # -CONFIG_RAID6_PQ=m -CONFIG_RAID6_PQ_BENCHMARK=y # CONFIG_PACKING is not set CONFIG_BITREVERSE=y CONFIG_ARCH_HAS_STRNCPY_FROM_USER=y @@ -3989,7 +3988,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PERCPU_TEST is not set # CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_ASYNC_RAID6_TEST is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_STRING_SELFTEST is not set # CONFIG_TEST_STRING_HELPERS is not set diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff index 5fa2c0c0..c9c590c2 100644 --- a/configs/platform-mips/kernelconfig-malta.diff +++ b/configs/platform-mips/kernelconfig-malta.diff @@ -30,12 +30,6 @@ CONFIG_ASM_MODVERSIONS=y CONFIG_ASN1=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -# CONFIG_ASYNC_RAID6_TEST is not set -CONFIG_ASYNC_XOR=m # CONFIG_AT803X_PHY is undefined CONFIG_ATA=y CONFIG_ATALK=m @@ -85,16 +79,13 @@ CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSG_COMMON=y -CONFIG_BLK_DEV_DM=m # CONFIG_BLK_DEV_FD is not set CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_MD=m # CONFIG_BLK_DEV_NVME is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set CONFIG_BLK_MQ_PCI=y -CONFIG_BLOCK_LEGACY_AUTOLOAD=y # CONFIG_BNA is not set # CONFIG_BNX2 is not set # CONFIG_BNX2X is not set @@ -264,21 +255,6 @@ CONFIG_DAVICOM_PHY=m # CONFIG_DEVTMPFS_MOUNT is not set CONFIG_DEV_APPLETALK=m # CONFIG_DL2K is not set -CONFIG_DM_BUFIO=m -CONFIG_DM_CRYPT=m -# CONFIG_DM_INIT is undefined -# CONFIG_DM_LOG_USERSPACE is not set -CONFIG_DM_MIRROR=m -CONFIG_DM_MULTIPATH=m -# CONFIG_DM_MULTIPATH_HST is not set -# CONFIG_DM_MULTIPATH_IOA is not set -# CONFIG_DM_MULTIPATH_QL is not set -# CONFIG_DM_MULTIPATH_ST is not set -CONFIG_DM_SNAPSHOT=m -# CONFIG_DM_VERITY is not set -# CONFIG_DM_VERITY_FEC is undefined -# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is undefined -CONFIG_DM_ZERO=m CONFIG_DNOTIFY=y # CONFIG_DNS_RESOLVER is not set # CONFIG_DW_WATCHDOG is undefined @@ -779,13 +755,7 @@ CONFIG_MDIO_BUS=m # CONFIG_MDIO_BUS_MUX_GPIO is undefined CONFIG_MDIO_DEVICE=m CONFIG_MDIO_DEVRES=m -CONFIG_MD_FAULTY=m -CONFIG_MD_LINEAR=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID456=m +CONFIG_MD_BITMAP_FILE=y # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_SAS is not set @@ -1291,8 +1261,6 @@ CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y # CONFIG_R6040 is not set # CONFIG_R8169 is not set -CONFIG_RAID6_PQ=m -CONFIG_RAID6_PQ_BENCHMARK=y CONFIG_RAID_ATTRS=m # CONFIG_RAPIDIO is not set # CONFIG_RCU_BOOST is undefined @@ -1597,23 +1565,13 @@ CONFIG_SMSC_PHY=m CONFIG_SOCK_RX_QUEUE_MAPPING=y # CONFIG_SOFT_WATCHDOG is undefined # CONFIG_SOLARIS_X86_PARTITION is undefined -# CONFIG_SQUASHFS is not set -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is undefined -# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is undefined +CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is undefined # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is undefined # CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is undefined -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is undefined -# CONFIG_SQUASHFS_EMBEDDED is undefined -# CONFIG_SQUASHFS_FILE_CACHE is undefined -# CONFIG_SQUASHFS_FILE_DIRECT is undefined -# CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE is undefined -# CONFIG_SQUASHFS_LZ4 is undefined -# CONFIG_SQUASHFS_LZO is undefined -# CONFIG_SQUASHFS_XATTR is undefined -# CONFIG_SQUASHFS_XZ is undefined -# CONFIG_SQUASHFS_ZLIB is undefined -# CONFIG_SQUASHFS_ZSTD is undefined +CONFIG_SQUASHFS_DECOMP_MULTI=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y # CONFIG_STAGING is not set # CONFIG_STAGING_BOARD is undefined # CONFIG_STAGING_MEDIA is undefined @@ -1781,7 +1739,6 @@ CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_USER=m # CONFIG_XILINX_WATCHDOG is undefined # CONFIG_XIL_AXIS_FIFO is undefined -CONFIG_XOR_BLOCKS=m CONFIG_XPS=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_ARM is undefined -- 2.39.2