From 282266255aef7f05adb1cd41f5c8f91e11ea6b76 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Wed, 27 Apr 2016 16:01:03 +0800 Subject: [PATCH] ARM64: rockchip_cros_defconfig: cleanup and use HZ=1000 for cros At least for the cros, we have previously kept ARM and ARM64 common configs on HZ=1000, but at least on ARM64, each individual ARM64 kernel config. Also, cleanup for cros config. Change-Id: I1f4470a01b409e212bd60b6fd885a8f2b53d8850 Signed-off-by: Caesar Wang --- arch/arm64/configs/rockchip_cros_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/rockchip_cros_defconfig b/arch/arm64/configs/rockchip_cros_defconfig index c86f3d7eb3cf..4466122099bb 100644 --- a/arch/arm64/configs/rockchip_cros_defconfig +++ b/arch/arm64/configs/rockchip_cros_defconfig @@ -45,6 +45,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SCHED_MC=y CONFIG_NR_CPUS=8 CONFIG_PREEMPT=y +CONFIG_HZ_1000=y CONFIG_KSM=y CONFIG_CMA=y CONFIG_ZSMALLOC=y @@ -54,7 +55,6 @@ CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_CMDLINE="console=uart,mmio32,0xff1a0000 rootwait cros_debug cros_secure ro root=/dev/mmcblk0p3 init=/sbin/init kgdboc=ttyS2" -# CONFIG_CMDLINE_FORCE is not set # CONFIG_EFI is not set # CONFIG_COREDUMP is not set CONFIG_COMPAT=y @@ -299,12 +299,12 @@ CONFIG_TABLET_USB_GTCO=y CONFIG_TABLET_USB_HANWANG=y CONFIG_TABLET_USB_KBTAB=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=y CONFIG_TOUCHSCREEN_GT9XX=y CONFIG_INPUT_MISC=y CONFIG_INPUT_KEYCHORD=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=y # CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set -- 2.34.1