Skip to content
This repository was archived by the owner on Oct 5, 2018. It is now read-only.

Commit 6bf2136

Browse files
author
Guodong Xu
committed
Merge branch 'working-hikey960-upstream-defconfig' into working-hikey960-upstream-rebase
* working-hikey960-upstream-defconfig: arm64: defconfig: enable f2fs and squashfs arm64: defconfig: enable configs for hi3660 ufs arm64: defconfig: enable configs for hi6421 regulator chip
2 parents 4d1b957 + 5030bcc commit 6bf2136

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ CONFIG_SRAM=y
154154
CONFIG_BLK_DEV_SD=y
155155
CONFIG_SCSI_SAS_ATA=y
156156
CONFIG_SCSI_HISI_SAS=y
157+
CONFIG_SCSI_UFSHCD=y
158+
CONFIG_SCSI_UFSHCD_PLATFORM=y
159+
CONFIG_SCSI_UFS_HI3660=y
157160
CONFIG_ATA=y
158161
CONFIG_SATA_AHCI=y
159162
CONFIG_SATA_AHCI_PLATFORM=y
@@ -297,12 +300,14 @@ CONFIG_MFD_MAX77620=y
297300
CONFIG_MFD_RK808=y
298301
CONFIG_MFD_SPMI_PMIC=y
299302
CONFIG_MFD_SEC_CORE=y
303+
CONFIG_MFD_HI6421_PMIC=y
300304
CONFIG_MFD_HI655X_PMIC=y
301305
CONFIG_REGULATOR=y
302306
CONFIG_MFD_CROS_EC=y
303307
CONFIG_MFD_CROS_EC_I2C=y
304308
CONFIG_REGULATOR_FIXED_VOLTAGE=y
305309
CONFIG_REGULATOR_GPIO=y
310+
CONFIG_REGULATOR_HI6421V530=y
306311
CONFIG_REGULATOR_HI655X=y
307312
CONFIG_REGULATOR_MAX77620=y
308313
CONFIG_REGULATOR_PWM=y
@@ -470,6 +475,7 @@ CONFIG_PWM_SAMSUNG=y
470475
CONFIG_RASPBERRYPI_FIRMWARE=y
471476
CONFIG_EXT2_FS=y
472477
CONFIG_EXT3_FS=y
478+
CONFIG_F2FS_FS=y
473479
CONFIG_EXT4_FS_POSIX_ACL=y
474480
CONFIG_BTRFS_FS=m
475481
CONFIG_BTRFS_FS_POSIX_ACL=y
@@ -486,6 +492,13 @@ CONFIG_HUGETLBFS=y
486492
CONFIG_CONFIGFS_FS=y
487493
CONFIG_EFIVAR_FS=y
488494
CONFIG_SQUASHFS=y
495+
CONFIG_SQUASHFS_FILE_DIRECT=y
496+
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
497+
CONFIG_SQUASHFS_XATTR=y
498+
CONFIG_SQUASHFS_LZ4=y
499+
CONFIG_SQUASHFS_LZO=y
500+
CONFIG_SQUASHFS_XZ=y
501+
CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
489502
CONFIG_NFS_FS=y
490503
CONFIG_NFS_V4=y
491504
CONFIG_NFS_V4_1=y

0 commit comments

Comments
 (0)