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

Commit e2198dd

Browse files
author
Guodong Xu
committed
Merge branch 'working-hikey960-upstream-defconfig' into working-hikey960-upstream-rebase-v4.14-rc5-2017-10-25-18-16-12
* working-hikey960-upstream-defconfig: FIX: arm64: defconfig: set CONFIG_DRM_CMA_FBDEV_BUFFER_NUM to default hikey960_defconfig: Initial hikey960_defconfig arm64: defconfig: enable ondemand cpufreq governor and set as default arm64: defconfig: enable DRM and hikey960 display driver arm64: defconfig: add configs for power management on Hi3660 FIX: arm64: defconfig: update for USB arm64: defconfig: enable usb for hikey960 HACK: arm64: defconfig: setting localversion to linaro-hikey960 arm64: defconfig: enable f2fs and squashfs arm64: defconfig: enable configs for hi3660 ufs
2 parents 79957cb + deaca5b commit e2198dd

2 files changed

Lines changed: 538 additions & 2 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CONFIG_LOCALVERSION="-linaro-hikey960"
2+
# CONFIG_LOCALVERSION_AUTO is not set
13
CONFIG_SYSVIPC=y
24
CONFIG_POSIX_MQUEUE=y
35
CONFIG_AUDIT=y
@@ -93,6 +95,7 @@ CONFIG_HIBERNATION=y
9395
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
9496
CONFIG_ARM_CPUIDLE=y
9597
CONFIG_CPU_FREQ=y
98+
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
9699
CONFIG_CPUFREQ_DT=y
97100
CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
98101
CONFIG_ARM_SCPI_CPUFREQ=y
@@ -168,6 +171,9 @@ CONFIG_BLK_DEV_SD=y
168171
CONFIG_SCSI_SAS_ATA=y
169172
CONFIG_SCSI_HISI_SAS=y
170173
CONFIG_SCSI_HISI_SAS_PCI=y
174+
CONFIG_SCSI_UFSHCD=y
175+
CONFIG_SCSI_UFSHCD_PLATFORM=y
176+
CONFIG_SCSI_UFS_HI3660=y
171177
CONFIG_ATA=y
172178
CONFIG_SATA_AHCI=y
173179
CONFIG_SATA_AHCI_PLATFORM=y
@@ -314,6 +320,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
314320
CONFIG_CPU_THERMAL=y
315321
CONFIG_THERMAL_EMULATION=y
316322
CONFIG_BRCMSTB_THERMAL=m
323+
CONFIG_HI3660_THERMAL=y
317324
CONFIG_EXYNOS_THERMAL=y
318325
CONFIG_ROCKCHIP_THERMAL=m
319326
CONFIG_WATCHDOG=y
@@ -364,7 +371,7 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
364371
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
365372
CONFIG_VIDEO_RENESAS_FCP=m
366373
CONFIG_VIDEO_RENESAS_VSP1=m
367-
CONFIG_DRM=m
374+
CONFIG_DRM=y
368375
CONFIG_DRM_NOUVEAU=m
369376
CONFIG_DRM_EXYNOS=m
370377
CONFIG_DRM_EXYNOS5433_DECON=y
@@ -388,14 +395,17 @@ CONFIG_DRM_I2C_ADV7511=m
388395
CONFIG_DRM_VC4=m
389396
CONFIG_DRM_HISI_KIRIN=m
390397
CONFIG_DRM_MESON=m
398+
CONFIG_DRM_PANEL_HIKEY=y
399+
CONFIG_DRM_KIRIN_960=y
400+
CONFIG_DRM_PANEL_HIKEY960_NTE300NTS=y
391401
CONFIG_FB=y
392402
CONFIG_FB_ARMCLCD=y
393403
CONFIG_BACKLIGHT_GENERIC=m
394404
CONFIG_BACKLIGHT_PWM=m
395405
CONFIG_BACKLIGHT_LP855X=m
396406
CONFIG_FRAMEBUFFER_CONSOLE=y
397407
CONFIG_LOGO=y
398-
# CONFIG_LOGO_LINUX_MONO is not set
408+
CONFIG_LOGO_LINUX_MONO=y
399409
# CONFIG_LOGO_LINUX_VGA16 is not set
400410
CONFIG_SOUND=y
401411
CONFIG_SND=y
@@ -405,6 +415,7 @@ CONFIG_SND_SOC_SAMSUNG=y
405415
CONFIG_SND_SOC_RCAR=m
406416
CONFIG_SND_SOC_AK4613=m
407417
CONFIG_SND_SIMPLE_CARD=y
418+
CONFIG_HUB_USB5734=y
408419
CONFIG_USB=y
409420
CONFIG_USB_OTG=y
410421
CONFIG_USB_XHCI_HCD=y
@@ -419,17 +430,31 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
419430
CONFIG_USB_RENESAS_USBHS=m
420431
CONFIG_USB_STORAGE=y
421432
CONFIG_USB_DWC3=y
433+
CONFIG_USB_DWC3_DUAL_ROLE=y
434+
CONFIG_USB_DWC3_HISI=y
435+
CONFIG_USB_DWC3_OTG=y
422436
CONFIG_USB_DWC2=y
423437
CONFIG_USB_CHIPIDEA=y
424438
CONFIG_USB_CHIPIDEA_UDC=y
425439
CONFIG_USB_CHIPIDEA_HOST=y
426440
CONFIG_USB_ISP1760=y
441+
CONFIG_TCPC_CLASS=y
442+
CONFIG_USB_POWER_DELIVERY=y
443+
CONFIG_TCPC_RT1711H=y
444+
CONFIG_USB_PD_VBUS_STABLE_TOUT=125
445+
CONFIG_USB_PD_VBUS_PRESENT_TOUT=20
427446
CONFIG_USB_HSIC_USB3503=y
428447
CONFIG_NOP_USB_XCEIV=y
429448
CONFIG_USB_MSM_OTG=y
430449
CONFIG_USB_QCOM_8X16_PHY=y
450+
CONFIG_EXTCON=y
431451
CONFIG_USB_ULPI=y
432452
CONFIG_USB_GADGET=y
453+
CONFIG_USB_LIBCOMPOSITE=y
454+
CONFIG_USB_U_ETHER=y
455+
CONFIG_USB_F_ECM=y
456+
CONFIG_USB_CONFIGFS=y
457+
CONFIG_USB_CONFIGFS_ECM=y
433458
CONFIG_USB_RENESAS_USBHS_UDC=m
434459
CONFIG_MMC=y
435460
CONFIG_MMC_BLOCK_MINORS=32
@@ -495,6 +520,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y
495520
CONFIG_COMMON_CLK_S2MPS11=y
496521
CONFIG_CLK_QORIQ=y
497522
CONFIG_COMMON_CLK_PWM=y
523+
CONFIG_STUB_CLK_HI3660=y
498524
CONFIG_COMMON_CLK_QCOM=y
499525
CONFIG_QCOM_CLK_SMD_RPM=y
500526
CONFIG_IPQ_GCC_8074=y
@@ -507,6 +533,7 @@ CONFIG_ARM_MHU=y
507533
CONFIG_PLATFORM_MHU=y
508534
CONFIG_BCM2835_MBOX=y
509535
CONFIG_HI6220_MBOX=y
536+
CONFIG_HI3660_MBOX=y
510537
CONFIG_ROCKCHIP_IOMMU=y
511538
CONFIG_ARM_SMMU=y
512539
CONFIG_ARM_SMMU_V3=y
@@ -552,6 +579,7 @@ CONFIG_ACPI_APEI_GHES=y
552579
CONFIG_ACPI_APEI_PCIEAER=y
553580
CONFIG_EXT2_FS=y
554581
CONFIG_EXT3_FS=y
582+
CONFIG_F2FS_FS=y
555583
CONFIG_EXT4_FS_POSIX_ACL=y
556584
CONFIG_BTRFS_FS=m
557585
CONFIG_BTRFS_FS_POSIX_ACL=y
@@ -567,6 +595,13 @@ CONFIG_HUGETLBFS=y
567595
CONFIG_CONFIGFS_FS=y
568596
CONFIG_EFIVAR_FS=y
569597
CONFIG_SQUASHFS=y
598+
CONFIG_SQUASHFS_FILE_DIRECT=y
599+
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
600+
CONFIG_SQUASHFS_XATTR=y
601+
CONFIG_SQUASHFS_LZ4=y
602+
CONFIG_SQUASHFS_LZO=y
603+
CONFIG_SQUASHFS_XZ=y
604+
CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
570605
CONFIG_NFS_FS=y
571606
CONFIG_NFS_V4=y
572607
CONFIG_NFS_V4_1=y

0 commit comments

Comments
 (0)