From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Oleksij Rempel Date: Fri, 24 Apr 2020 09:08:44 +0200 Message-Id: <20200424070853.20792-4-o.rempel@pengutronix.de> In-Reply-To: <20200424070853.20792-1-o.rempel@pengutronix.de> References: <20200424070853.20792-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH v2 04/13] MIPS: kernel: enable EXT4 and VFAT FS support List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Oleksij Rempel Sync EXT4 and VFAT support with ARM platforms Signed-off-by: Oleksij Rempel --- configs/platform-mips/kernelconfig | 18 ++- configs/platform-mips/kernelconfig-ar9331 | 120 +++++++++++++++++- .../platform-mips/kernelconfig-ar9331.diff | 91 ++----------- configs/platform-mips/kernelconfig-malta | 6 +- configs/platform-mips/kernelconfig-malta.diff | 16 +-- 5 files changed, 146 insertions(+), 105 deletions(-) diff --git a/configs/platform-mips/kernelconfig b/configs/platform-mips/kernelconfig index c2cf700..6bf2da8 100644 --- a/configs/platform-mips/kernelconfig +++ b/configs/platform-mips/kernelconfig @@ -2248,9 +2248,17 @@ CONFIG_GENERIC_PHY=y # File systems # # CONFIG_VALIDATE_FS_PARSER is not set +CONFIG_FS_IOMAP=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set -# CONFIG_EXT4_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set @@ -2294,8 +2302,12 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # # DOS/FAT/NT Filesystems # +CONFIG_FAT_FS=y # CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set # CONFIG_NTFS_FS is not set # end of DOS/FAT/NT Filesystems @@ -2369,7 +2381,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y # CONFIG_CIFS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -CONFIG_NLS=m +CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set # CONFIG_NLS_CODEPAGE_737 is not set diff --git a/configs/platform-mips/kernelconfig-ar9331 b/configs/platform-mips/kernelconfig-ar9331 index f5373b1..46327e0 100644 --- a/configs/platform-mips/kernelconfig-ar9331 +++ b/configs/platform-mips/kernelconfig-ar9331 @@ -39,6 +39,7 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME="(none)" +# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set @@ -122,6 +123,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_CGROUPS=y # CONFIG_MEMCG is not set +# CONFIG_BLK_CGROUP is not set # CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_PIDS is not set # CONFIG_CGROUP_RDMA is not set @@ -473,7 +475,35 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y -# CONFIG_BLOCK is not set +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_ZONED is not set +# CONFIG_BLK_CMDLINE_PARSER is not set +# CONFIG_BLK_WBT is not set +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_EFI_PARTITION=y +# end of Partition Types + +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=y +# CONFIG_IOSCHED_BFQ is not set +# end of IO Schedulers + CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y @@ -1003,6 +1033,14 @@ CONFIG_MTD_OF_PARTS=y # # User Modules And Translation Layers # +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set # CONFIG_MTD_PARTITIONED_MASTER is not set @@ -1056,6 +1094,7 @@ CONFIG_MTD_PHYSMAP_OF=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set # # Disk-On-Chip Device Drivers @@ -1087,10 +1126,20 @@ CONFIG_OF_MDIO=y CONFIG_OF_RESERVED_MEM=y # CONFIG_OF_OVERLAY is not set # CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_DRBD is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_RBD is not set # # NVME Support # +# CONFIG_NVME_FC is not set # end of NVME Support # @@ -1146,13 +1195,19 @@ CONFIG_OF_RESERVED_MEM=y # end of Misc devices CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set # # SCSI device support # CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set # end of SCSI device support +# CONFIG_ATA is not set +# CONFIG_MD is not set +# CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=y CONFIG_NET_CORE=y # CONFIG_BONDING is not set @@ -1372,6 +1427,7 @@ CONFIG_WLAN=y # CONFIG_NET_FAILOVER is not set CONFIG_ISDN=y # CONFIG_MISDN is not set +# CONFIG_NVM is not set # # Input device support @@ -1446,6 +1502,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y # CONFIG_TTY_PRINTK is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set +# CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set # CONFIG_XILLYBUS is not set # end of Character devices @@ -1997,6 +2054,7 @@ CONFIG_STAGING=y # CONFIG_FIELDBUS_DEV is not set # CONFIG_USB_WUSB_CBAF is not set # CONFIG_UWB is not set +# CONFIG_STAGING_EXFAT_FS is not set # CONFIG_MIPS_PLATFORM_DEVICES is not set # CONFIG_GOLDFISH is not set CONFIG_CLKDEV_LOOKUP=y @@ -2174,6 +2232,24 @@ CONFIG_GENERIC_PHY=y # File systems # # CONFIG_VALIDATE_FS_PARSER is not set +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_F2FS_FS is not set CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set CONFIG_FILE_LOCKING=y @@ -2200,6 +2276,25 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_FSCACHE is not set # end of Caches +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +# CONFIG_NTFS_FS is not set +# end of DOS/FAT/NT Filesystems + # # Pseudo filesystems # @@ -2219,11 +2314,28 @@ CONFIG_MEMFD_CREATE=y 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_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 is not set @@ -2253,7 +2365,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y # CONFIG_CIFS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -CONFIG_NLS=m +CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set # CONFIG_NLS_CODEPAGE_737 is not set @@ -2565,6 +2677,7 @@ CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_FONT_SUPPORT=y CONFIG_FONT_8x16=y CONFIG_FONT_AUTOSELECT=y +CONFIG_SBITMAP=y # CONFIG_STRING_SELFTEST is not set # end of Library routines @@ -2720,6 +2833,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21 # end of RCU Debugging # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_LATENCYTOP is not set CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y @@ -2751,6 +2865,7 @@ CONFIG_DYNAMIC_FTRACE=y # CONFIG_TRACER_SNAPSHOT is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_BLK_DEV_IO_TRACE is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_TRACE_EVENT_INJECT is not set # CONFIG_TRACEPOINT_BENCHMARK is not set @@ -2814,6 +2929,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_TEST_KMOD is not set # CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_MEMINIT is not set diff --git a/configs/platform-mips/kernelconfig-ar9331.diff b/configs/platform-mips/kernelconfig-ar9331.diff index 12699f4..c104fd1 100644 --- a/configs/platform-mips/kernelconfig-ar9331.diff +++ b/configs/platform-mips/kernelconfig-ar9331.diff @@ -1,101 +1,28 @@ -186bba2123bf4a0842542353353f1b17 +63a00cb404ed6b0459f4c1a5dc4aa384 # CONFIG_ACORN_PARTITION is undefined -# CONFIG_ADFS_FS is undefined -# CONFIG_AFFS_FS is undefined # CONFIG_AIX_PARTITION is undefined # CONFIG_AMIGA_PARTITION is undefined -# CONFIG_ATA is undefined # CONFIG_ATARI_PARTITION is undefined -# CONFIG_ATA_OVER_ETH is undefined -# CONFIG_BEFS_FS is undefined -# CONFIG_BFS_FS is undefined -# CONFIG_BLK_CGROUP is undefined -# CONFIG_BLK_CMDLINE_PARSER is undefined -# CONFIG_BLK_DEBUG_FS is undefined -# CONFIG_BLK_DEV is undefined -# CONFIG_BLK_DEV_BSG is undefined -# CONFIG_BLK_DEV_BSGLIB is undefined -# CONFIG_BLK_DEV_DRBD is undefined -# CONFIG_BLK_DEV_INTEGRITY is undefined -# CONFIG_BLK_DEV_IO_TRACE is undefined -# CONFIG_BLK_DEV_LOOP is undefined -# CONFIG_BLK_DEV_NBD is undefined -# CONFIG_BLK_DEV_NULL_BLK is undefined -# CONFIG_BLK_DEV_RAM is undefined -# CONFIG_BLK_DEV_RBD is undefined -# CONFIG_BLK_DEV_ZONED is undefined -# CONFIG_BLK_PM is undefined -# CONFIG_BLK_SED_OPAL is undefined -# CONFIG_BLK_WBT is undefined -# CONFIG_BLOCK is not set +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_SCSI_REQUEST=y # CONFIG_BSD_DISKLABEL is undefined -# CONFIG_BTRFS_FS is undefined -# CONFIG_CDROM_PKTCDVD is undefined # CONFIG_CMDLINE_PARTITION is undefined -# CONFIG_DEBUG_BLOCK_EXT_DEVT is undefined -# CONFIG_EFI_PARTITION is undefined -# CONFIG_EFS_FS is undefined -# CONFIG_EROFS_FS is undefined -# CONFIG_EXT2_FS is undefined -# CONFIG_EXT3_FS is undefined -# CONFIG_EXT4_FS is undefined -# CONFIG_F2FS_FS is undefined -# CONFIG_FTL is undefined -# CONFIG_GFS2_FS is undefined -# CONFIG_HFSPLUS_FS is undefined -# CONFIG_HFS_FS is undefined -# CONFIG_HPFS_FS is undefined -# CONFIG_IDE is undefined -# CONFIG_INFTL is undefined -# CONFIG_IOSCHED_BFQ is undefined -# CONFIG_ISO9660_FS is undefined -# CONFIG_JFS_FS is undefined # CONFIG_KARMA_PARTITION is undefined # CONFIG_LDM_PARTITION is undefined CONFIG_LOCALVERSION="-ar9331" # CONFIG_MAC_PARTITION is undefined -# CONFIG_MD is undefined -# CONFIG_MINIX_FS is undefined # CONFIG_MINIX_SUBPARTITION is undefined -# CONFIG_MQ_IOSCHED_DEADLINE is undefined -# CONFIG_MQ_IOSCHED_KYBER is undefined -# CONFIG_MSDOS_FS is undefined -# CONFIG_MSDOS_PARTITION is undefined +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=y # CONFIG_MTD_BLKDEVS is undefined -# CONFIG_MTD_BLOCK2MTD is undefined -# CONFIG_MTD_BLOCK is undefined -# CONFIG_NFTL is undefined -# CONFIG_NILFS2_FS is undefined -# CONFIG_NTFS_FS is undefined -# CONFIG_NVM is undefined -# CONFIG_NVME_FC is undefined -# CONFIG_OMFS_FS is undefined +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set # CONFIG_OSF_PARTITION is undefined -# CONFIG_PARTITION_ADVANCED is undefined -# CONFIG_QNX4FS_FS is undefined -# CONFIG_QNX6FS_FS is undefined -# CONFIG_RAID_ATTRS is undefined -# CONFIG_RAW_DRIVER is undefined -# CONFIG_REISERFS_FS is undefined -# CONFIG_RFD_FTL is undefined -# CONFIG_SBITMAP is undefined -# CONFIG_SCSI is undefined +# CONFIG_PARTITION_ADVANCED is not set # CONFIG_SGI_PARTITION is undefined -# CONFIG_SM_FTL is undefined # CONFIG_SOLARIS_X86_PARTITION is undefined -# CONFIG_SQUASHFS is undefined -# CONFIG_SSFDC is undefined -# CONFIG_STAGING_EXFAT_FS is undefined # CONFIG_SUN_PARTITION is undefined -# CONFIG_SWAP is undefined # CONFIG_SYSV68_PARTITION is undefined -# CONFIG_SYSV_FS is undefined -# CONFIG_TARGET_CORE is undefined -# CONFIG_TEST_KMOD is undefined -# CONFIG_UDF_FS is undefined -# CONFIG_UFS_FS is undefined # CONFIG_ULTRIX_PARTITION is undefined # CONFIG_UNIXWARE_DISKLABEL is undefined -# CONFIG_VFAT_FS is undefined -# CONFIG_VXFS_FS is undefined -# CONFIG_XFS_FS is undefined diff --git a/configs/platform-mips/kernelconfig-malta b/configs/platform-mips/kernelconfig-malta index 7752144..b2194e2 100644 --- a/configs/platform-mips/kernelconfig-malta +++ b/configs/platform-mips/kernelconfig-malta @@ -3075,9 +3075,9 @@ CONFIG_FUSE_FS=m # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m +CONFIG_FAT_FS=y CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_FAT_DEFAULT_UTF8 is not set @@ -3124,7 +3124,7 @@ CONFIG_SUNRPC=y # CONFIG_CIFS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -CONFIG_NLS=m +CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_737=m diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff index ea2ba25..4993e57 100644 --- a/configs/platform-mips/kernelconfig-malta.diff +++ b/configs/platform-mips/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -186bba2123bf4a0842542353353f1b17 +63a00cb404ed6b0459f4c1a5dc4aa384 # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -355,15 +355,6 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_EQUALIZER=m # CONFIG_EROFS_FS is undefined # CONFIG_ET131X is not set -# CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_FS=y -# CONFIG_EXT4_FS_POSIX_ACL is not set -# CONFIG_EXT4_FS_SECURITY is not set -CONFIG_EXT4_USE_FOR_EXT2=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_FAT_DEFAULT_UTF8 is not set -CONFIG_FAT_FS=m CONFIG_FB=y # CONFIG_FB_3DFX is not set # CONFIG_FB_ARK is not set @@ -416,8 +407,6 @@ CONFIG_FB_NOTIFY=y # CONFIG_FIRMWARE_EDID is not set CONFIG_FIXED_PHY=m # CONFIG_FORCEDETH is not set -CONFIG_FS_IOMAP=y -CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y CONFIG_FUSE_FS=m # CONFIG_FUSION is not set @@ -717,8 +706,6 @@ CONFIG_ISCSI_TCP=m # CONFIG_IWLWIFI is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set -CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set # CONFIG_JFFS2_FS is undefined # CONFIG_JME is not set # CONFIG_JZ4740_WDT is undefined @@ -1775,7 +1762,6 @@ CONFIG_USB_PCI=y CONFIG_USER_NS=y # CONFIG_UWB is undefined CONFIG_VETH=m -CONFIG_VFAT_FS=m CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_VIRTIO_FS is not set -- 2.26.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de