| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Alistair Delva <adelva@google.com> |
| Date: Wed, 4 Sep 2019 12:25:57 -0700 |
| Subject: ANDROID: Catch rockpi4_defconfig up with gki_defconfig |
| |
| Change-Id: I640112a903d0b4944a087a4408241b901f37f6b8 |
| Signed-off-by: Alistair Delva <adelva@google.com> |
| --- |
| arch/arm64/configs/rockpi4_defconfig | 31 +++++++++++++++------------- |
| 1 file changed, 17 insertions(+), 14 deletions(-) |
| |
| diff --git a/arch/arm64/configs/rockpi4_defconfig b/arch/arm64/configs/rockpi4_defconfig |
| index 6d0cf70f3757..2f97c1a8a60a 100644 |
| --- a/arch/arm64/configs/rockpi4_defconfig |
| +++ b/arch/arm64/configs/rockpi4_defconfig |
| @@ -1,3 +1,4 @@ |
| +CONFIG_LOCALVERSION="-mainline" |
| CONFIG_AUDIT=y |
| CONFIG_NO_HZ=y |
| CONFIG_HIGH_RES_TIMERS=y |
| @@ -24,7 +25,6 @@ CONFIG_BLK_DEV_INITRD=y |
| # CONFIG_RD_LZO is not set |
| # CONFIG_RD_LZ4 is not set |
| # CONFIG_SYSFS_SYSCALL is not set |
| -CONFIG_FHANDLE=y |
| CONFIG_KALLSYMS_ALL=y |
| CONFIG_BPF_SYSCALL=y |
| # CONFIG_RSEQ is not set |
| @@ -35,8 +35,10 @@ CONFIG_EMBEDDED=y |
| CONFIG_SLAB_FREELIST_RANDOM=y |
| CONFIG_SLAB_FREELIST_HARDENED=y |
| CONFIG_PROFILING=y |
| +CONFIG_ARCH_QCOM=y |
| CONFIG_ARCH_ROCKCHIP=y |
| CONFIG_SCHED_MC=y |
| +CONFIG_NR_CPUS=32 |
| CONFIG_SECCOMP=y |
| CONFIG_PARAVIRT=y |
| CONFIG_COMPAT=y |
| @@ -45,9 +47,7 @@ CONFIG_SWP_EMULATION=y |
| CONFIG_CP15_BARRIER_EMULATION=y |
| CONFIG_SETEND_EMULATION=y |
| CONFIG_RANDOMIZE_BASE=y |
| -CONFIG_CMDLINE="" |
| -# CONFIG_CMDLINE_FORCE is not set |
| -# CONFIG_EFI is not set |
| +# CONFIG_DMI is not set |
| CONFIG_PM_WAKELOCKS=y |
| CONFIG_PM_WAKELOCKS_LIMIT=0 |
| # CONFIG_PM_WAKELOCKS_GC is not set |
| @@ -65,6 +65,7 @@ CONFIG_ARM_SCMI_PROTOCOL=y |
| # CONFIG_ARM_SCMI_POWER_DOMAIN is not set |
| CONFIG_ARM_SCPI_PROTOCOL=y |
| # CONFIG_ARM_SCPI_POWER_DOMAIN is not set |
| +# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set |
| CONFIG_VIRTUALIZATION=y |
| CONFIG_KVM=y |
| CONFIG_VHOST_VSOCK=y |
| @@ -93,7 +94,6 @@ CONFIG_INET=y |
| CONFIG_IP_MULTICAST=y |
| CONFIG_IP_ADVANCED_ROUTER=y |
| CONFIG_IP_MULTIPLE_TABLES=y |
| -CONFIG_IP_PNP=y |
| CONFIG_NET_IPGRE_DEMUX=y |
| CONFIG_NET_IPVTI=y |
| CONFIG_INET_ESP=y |
| @@ -108,6 +108,7 @@ CONFIG_IPV6_MIP6=y |
| CONFIG_IPV6_VTI=y |
| CONFIG_IPV6_MULTIPLE_TABLES=y |
| CONFIG_NETFILTER=y |
| +# CONFIG_BRIDGE_NETFILTER is not set |
| CONFIG_NF_CONNTRACK=y |
| CONFIG_NF_CONNTRACK_SECMARK=y |
| CONFIG_NF_CONNTRACK_EVENTS=y |
| @@ -176,6 +177,7 @@ CONFIG_IP6_NF_FILTER=y |
| CONFIG_IP6_NF_TARGET_REJECT=y |
| CONFIG_IP6_NF_MANGLE=y |
| CONFIG_IP6_NF_RAW=y |
| +CONFIG_TIPC=y |
| CONFIG_L2TP=y |
| CONFIG_BRIDGE=y |
| CONFIG_NET_SCHED=y |
| @@ -376,7 +378,6 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV=y |
| CONFIG_DW_WATCHDOG=y |
| CONFIG_MFD_ACT8945A=y |
| CONFIG_MFD_RK808=y |
| -CONFIG_REGULATOR=y |
| CONFIG_REGULATOR_DEBUG=y |
| CONFIG_REGULATOR_FIXED_VOLTAGE=y |
| CONFIG_REGULATOR_VIRTUAL_CONSUMER=y |
| @@ -388,7 +389,6 @@ CONFIG_REGULATOR_VCTRL=y |
| CONFIG_MEDIA_SUPPORT=y |
| CONFIG_MEDIA_CAMERA_SUPPORT=y |
| CONFIG_MEDIA_CONTROLLER=y |
| -CONFIG_VIDEO_V4L2_SUBDEV_API=y |
| # CONFIG_VGA_ARB is not set |
| CONFIG_DRM=y |
| # CONFIG_DRM_FBDEV_EMULATION is not set |
| @@ -397,7 +397,6 @@ CONFIG_ROCKCHIP_DW_HDMI=y |
| CONFIG_DRM_VIRTIO_GPU=y |
| # CONFIG_LCD_CLASS_DEVICE is not set |
| CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| -# CONFIG_BACKLIGHT_GENERIC is not set |
| CONFIG_SOUND=y |
| CONFIG_SND=y |
| CONFIG_SND_HRTIMER=y |
| @@ -427,6 +426,7 @@ CONFIG_USB_OHCI_HCD=y |
| # CONFIG_USB_OHCI_HCD_PCI is not set |
| CONFIG_USB_OHCI_HCD_PLATFORM=y |
| CONFIG_USB_GADGET=y |
| +CONFIG_USB_DUMMY_HCD=m |
| CONFIG_USB_CONFIGFS=y |
| CONFIG_USB_CONFIGFS_UEVENT=y |
| CONFIG_USB_CONFIGFS_F_FS=y |
| @@ -442,10 +442,10 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y |
| CONFIG_MMC_SDHCI_OF_DWCMSHC=y |
| CONFIG_MMC_DW=y |
| CONFIG_MMC_DW_ROCKCHIP=y |
| -CONFIG_MMC_CQHCI=y |
| CONFIG_NEW_LEDS=y |
| CONFIG_LEDS_CLASS=y |
| CONFIG_LEDS_TRIGGERS=y |
| +CONFIG_EDAC=y |
| CONFIG_RTC_CLASS=y |
| # CONFIG_RTC_SYSTOHC is not set |
| CONFIG_RTC_DRV_RK808=y |
| @@ -462,16 +462,17 @@ CONFIG_STAGING=y |
| CONFIG_ASHMEM=y |
| CONFIG_ANDROID_VSOC=y |
| CONFIG_ION=y |
| +CONFIG_ION_SYSTEM_HEAP=y |
| +CONFIG_ION_SYSTEM_CONTIG_HEAP=y |
| CONFIG_COMMON_CLK_RK808=y |
| CONFIG_COMMON_CLK_SCPI=y |
| -# CONFIG_COMMON_CLK_XGENE is not set |
| CONFIG_HWSPINLOCK=y |
| -# CONFIG_FSL_ERRATUM_A008585 is not set |
| -# CONFIG_HISILICON_ERRATUM_161010101 is not set |
| CONFIG_MAILBOX=y |
| CONFIG_ROCKCHIP_MBOX=y |
| CONFIG_ROCKCHIP_IOMMU=y |
| CONFIG_ARM_SMMU=y |
| +CONFIG_QCOM_COMMAND_DB=y |
| +CONFIG_QCOM_RPMH=y |
| CONFIG_ROCKCHIP_PM_DOMAINS=y |
| CONFIG_DEVFREQ_GOV_PERFORMANCE=y |
| CONFIG_DEVFREQ_GOV_POWERSAVE=y |
| @@ -480,10 +481,12 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y |
| CONFIG_ARM_RK3399_DMC_DEVFREQ=y |
| CONFIG_PWM=y |
| CONFIG_PWM_ROCKCHIP=y |
| +CONFIG_QCOM_PDC=y |
| CONFIG_PHY_ROCKCHIP_EMMC=y |
| CONFIG_PHY_ROCKCHIP_INNO_HDMI=y |
| CONFIG_PHY_ROCKCHIP_INNO_USB2=y |
| CONFIG_PHY_ROCKCHIP_USB=y |
| +CONFIG_RAS=y |
| CONFIG_ANDROID=y |
| CONFIG_ANDROID_BINDER_IPC=y |
| CONFIG_ROCKCHIP_EFUSE=y |
| @@ -500,9 +503,9 @@ CONFIG_FUSE_FS=y |
| CONFIG_OVERLAY_FS=y |
| CONFIG_MSDOS_FS=y |
| CONFIG_VFAT_FS=y |
| -CONFIG_TMPFS=y |
| CONFIG_TMPFS_POSIX_ACL=y |
| -CONFIG_ECRYPT_FS=y |
| +# CONFIG_EFIVAR_FS is not set |
| +CONFIG_SDCARD_FS=y |
| CONFIG_PSTORE=y |
| CONFIG_PSTORE_CONSOLE=y |
| CONFIG_PSTORE_RAM=y |
