From c7c67b6364ab256bd148d5c58516ff84a588c0b4 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 a7ea4976d57f..f1afb0774db9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -55,7 +55,7 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=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 kvm-arm.mode=protected" +CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig" # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 8479e1ef4ff2..04ac977412b8 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -53,7 +53,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