From 94b7bd9337cbff611a35bbb2d5834180974657b8 Mon Sep 17 00:00:00 2001 From: Yu-Li Lin Date: Tue, 24 Jan 2023 13:54:47 -0800 Subject: [PATCH] ANDROID: gki_defconfig: disable various x86 and hw flags merge in various disabled flags from arcvm defconfig: CONFIG_MTRR_SANITIZER, CONFIG_MICROCODE, CONFIG_UID16, CONFIG_PCSPKR_PLATFORM, CONFIG_ACPI_AC, CONFIG_ACPI_BATTERY, CONFIG_ACPI_FAN, CONFIG_ACPI_THERMAL, CONFIG_X86_PM_TIMER, CONFIG_X86_5LEVEL, CONFIG_HW_RANDOM_VIA, CONFIG_RTC_HCTOSYS Bug: 266251235 Change-Id: Id818e385a8c5a6d58854bf16a8444b1fd959c24e Signed-off-by: Yu-Li Lin --- arch/x86/configs/gki_defconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 109d0ec44fce..e4e4b9367968 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -39,8 +39,10 @@ CONFIG_RT_SOFTIRQ_AWARE_SCHED=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set CONFIG_BOOT_CONFIG=y +# CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_FHANDLE is not set +# CONFIG_PCSPKR_PLATFORM is not set CONFIG_KALLSYMS_ALL=y # CONFIG_RSEQ is not set CONFIG_EMBEDDED=y @@ -52,12 +54,20 @@ CONFIG_PARAVIRT=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_NR_CPUS=32 # CONFIG_X86_MCE is not set +# CONFIG_MICROCODE is not set +# CONFIG_X86_5LEVEL is not set +# CONFIG_MTRR_SANITIZER is not set CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure bootconfig" CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set +# CONFIG_ACPI_AC is not set +# CONFIG_ACPI_BATTERY is not set +# CONFIG_ACPI_FAN is not set +# CONFIG_ACPI_THERMAL is not set +# CONFIG_X86_PM_TIMER is not set CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_TIMES=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -350,6 +360,7 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_NULL_TTY=y CONFIG_SERIAL_DEV_BUS=y CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_VIA is not set # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set CONFIG_HPET=y @@ -474,6 +485,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_EDAC=y CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set CONFIG_DMABUF_HEAPS=y CONFIG_UIO=y CONFIG_VHOST_VSOCK=y