From d2cd3f0068a649a5d80e5cb6b7ea683f61ee6141 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 1 Aug 2017 13:03:25 -0700 Subject: [PATCH] hikey960_defconfig: Resync defconfig to add missing Android specific config options While creating the 4.9 patches for hikey960, I started with the andorid-hikey-linaro-4.4 hikey960_defconfig, but generated the first series of patches against v4.9 vanilla, causing the android specific changes to be lost. This re-syncs the configs dropped from the andorid-hikey-linaro-4.4 tree back to the andorid-hikey-linaro-4.9 hikey960_defconfig Signed-off-by: John Stultz --- arch/arm64/configs/hikey960_defconfig | 38 ++++++++++++++++++--------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/arch/arm64/configs/hikey960_defconfig b/arch/arm64/configs/hikey960_defconfig index f514ae2910a1..cf06ba2bfceb 100644 --- a/arch/arm64/configs/hikey960_defconfig +++ b/arch/arm64/configs/hikey960_defconfig @@ -1,8 +1,8 @@ CONFIG_POSIX_MQUEUE=y -CONFIG_USELIB=y CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_SCHED_WALT=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y @@ -17,6 +17,7 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_SCHEDTUNE=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y @@ -66,9 +67,11 @@ CONFIG_ARM_CPUIDLE=y CONFIG_ARM_HISI_CPUIDLE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y CONFIG_NET=y CONFIG_PACKET=y @@ -135,7 +138,9 @@ CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_POLICY=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +CONFIG_NETFILTER_XT_MATCH_QTAGUID=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2=y CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NETFILTER_XT_MATCH_STATE=y CONFIG_NETFILTER_XT_MATCH_STATISTIC=y @@ -203,7 +208,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CONNECTOR=y -CONFIG_OF_OVERLAY=y +CONFIG_OF_OVERLAY_MGR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -253,6 +258,7 @@ CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_HISI_POWERKEY=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y CONFIG_VT_HW_CONSOLE_BINDING=y @@ -376,7 +382,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y -CONFIG_HISI_USB_DWC3_MASK_IRQ_WORKAROUND=y CONFIG_USB_DWC2=y CONFIG_USB_ISP1760=y CONFIG_TCPC_CLASS=y @@ -389,7 +394,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_SERIAL_QUALCOMM=y CONFIG_USB_SERIAL_OPTION=y -CONFIG_EXTCON=y +CONFIG_USB_OTG_WAKELOCK=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_USB_CONFIGFS=y @@ -397,6 +402,11 @@ CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_MTP=y +CONFIG_USB_CONFIGFS_F_PTP=y +CONFIG_USB_CONFIGFS_F_ACC=y +CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y +CONFIG_USB_CONFIGFS_UEVENT=y CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_GADGETFS=y CONFIG_MMC=y @@ -427,6 +437,13 @@ CONFIG_ASHMEM=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ION=y CONFIG_ION_HISI=y +CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +CONFIG_FIQ_DEBUGGER_CONSOLE=y +CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +CONFIG_FIQ_DEBUGGER_UART_OVERLAY=y +CONFIG_NANOHUB=y +CONFIG_NANOHUB_SPI=y +CONFIG_HISI_FIQ_DEBUGGER=y CONFIG_STUB_CLK_HI6220=y CONFIG_STUB_CLK_HI3660=y CONFIG_MAILBOX=y @@ -434,6 +451,7 @@ CONFIG_HI6220_MBOX=y CONFIG_HI3660_MBOX=y CONFIG_HISI_IOMMU_LPAE=y CONFIG_DEVFREQ_GOV_USERSPACE=y +CONFIG_EXTCON=y CONFIG_MALI_MIDGARD=y CONFIG_MALI_EXPERT=y CONFIG_MALI_PLATFORM_FAKE=y @@ -443,6 +461,8 @@ CONFIG_PHY_XGENE=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder" +CONFIG_TEE=y +CONFIG_OPTEE=y CONFIG_EFI_VARS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_ACPI=y @@ -465,23 +485,15 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_LZ4=y -CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y -CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=y -CONFIG_NFS_FS=y -# CONFIG_NFS_V2 is not set -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y CONFIG_9P_FS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y