From cc47b201a87a9540407298aa9b3b1603287b49a0 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Tue, 3 Nov 2020 16:14:50 -0800 Subject: [PATCH] ANDROID: GKI: build in a kernel command line of "rw" The GKI ramdisk must be mounted rw in order to function with both dedicated recovery partition and non-dedicated recovery partition systems. Bug: 171512004 Signed-off-by: Steve Muckle Change-Id: Ib99aca13d4d78ae455ce14c7146a02f668b7e094 --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 810b0481b52b..eb1f22c7a01d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -57,6 +57,8 @@ CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y +CONFIG_CMDLINE="rw" +CONFIG_CMDLINE_EXTEND=y # 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 c5508eeae9b4..018288787d2a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -52,6 +52,8 @@ CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_NR_CPUS=32 CONFIG_EFI=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="rw" CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set