From 943727b7dbdea1f56576c627d9b4540a6226a3a7 Mon Sep 17 00:00:00 2001 From: jianzhou Date: Thu, 2 Feb 2023 04:26:54 -0800 Subject: [PATCH] ANDROID: qki: Migrate consolidate.fragment Migrate consolidate.fragment changes to new branch to keep alignment. Bug: 188690367 Change-Id: Ife5aca7ce5cefa4cc1f06d6fdbf0b73c2604d8a8 Signed-off-by: jianzhou --- arch/arm64/configs/consolidate.fragment | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/configs/consolidate.fragment b/arch/arm64/configs/consolidate.fragment index 1fe330b63333..501638be4701 100644 --- a/arch/arm64/configs/consolidate.fragment +++ b/arch/arm64/configs/consolidate.fragment @@ -3,9 +3,7 @@ # CONFIG_BITFIELD_KUNIT is not set # CONFIG_BITS_TEST is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 -CONFIG_CMA_DEBUG=y -CONFIG_CMDLINE="kasan.stacktrace=off stack_depot_disable=off page_owner=on no_hash_pointers panic_on_taint=0x20" +CONFIG_CMDLINE="console=ttyMSM0,115200n8 kasan.stacktrace=off stack_depot_disable=off page_owner=on no_hash_pointers panic_on_taint=0x20" CONFIG_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y @@ -27,14 +25,14 @@ CONFIG_DEBUG_SPINLOCK=y # CONFIG_DPM_WATCHDOG is not set CONFIG_DYNAMIC_DEBUG=y # CONFIG_FIND_BIT_BENCHMARK is not set -CONFIG_GKI_HACKS_FOR_CONSOLIDATE=y +CONFIG_GKI_HACKS_FOR_DEBUG_CONFIG=y CONFIG_I2C_CHARDEV=y # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_LINEAR_RANGES_TEST is not set # CONFIG_LIST_KUNIT_TEST is not set # CONFIG_LKDTM is not set -CONFIG_LOCALVERSION="-qki-consolidate" +CONFIG_LOCALVERSION="-mainline-qki-consolidate" CONFIG_LOCKUP_DETECTOR=y # CONFIG_PERCPU_TEST is not set CONFIG_PID_IN_CONTEXTIDR=y @@ -56,7 +54,6 @@ CONFIG_TASKS_RUDE_RCU=y # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FREE_PAGES is not set -# CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_IDA is not set # CONFIG_TEST_KMOD is not set @@ -66,11 +63,9 @@ CONFIG_TASKS_RUDE_RCU=y # CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_MEMINIT is not set # CONFIG_TEST_MIN_HEAP is not set -# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SORT is not set -# CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_STRSCPY is not set @@ -80,4 +75,4 @@ CONFIG_TASKS_RUDE_RCU=y # CONFIG_TEST_UUID is not set # CONFIG_TEST_VMALLOC is not set # CONFIG_TEST_XARRAY is not set -CONFIG_TRACE_PREEMPT_TOGGLE=y +CONFIG_TRACE_PREEMPT_TOGGLE=y \ No newline at end of file