From 782ed2c9f95d4e837c5657abf9b06bf58e9a5767 Mon Sep 17 00:00:00 2001 From: Shikha Panwar Date: Tue, 20 Sep 2022 10:42:21 +0000 Subject: [PATCH] ANDROID: [GKI] Include bootconfig in CONFIG_CMDLINE The bootloader anyways uses bootconfig across the ecosystem. Make it a part of built-in command line. Test: Inspect ./config generated from the kernel build Bug: 247548654 Change-Id: I356e6839e06bd6cde59801da7209f96a6e7dfc21 Signed-off-by: Shikha Panwar --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4f417c2a4194..85edbb29e23a 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -64,7 +64,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_ARM64_MPAM=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off" +CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off bootconfig" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index eeb0bf48890b..526f5458b7e2 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -60,7 +60,7 @@ CONFIG_NR_CPUS=32 # CONFIG_X86_MCE is not set CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure" +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