From 542eda321a475fb841dc8c5829b801bb8727a992 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 9 Dec 2020 19:49:27 +0000 Subject: [PATCH] ANDROID: Revert "GKI: build in a kernel command line of "rw"" This reverts commit cc47b201a87a9540407298aa9b3b1603287b49a0. Bug: 173425293 Reason for revert: Android platform has adapted devices with and without a dedicated recovery partition, so the ramdisk no longer needs to be writable. Change-Id: Ib743e94197eadccbe877811e3a78aaa969960ea8 Signed-off-by: Yifan Hong --- arch/arm64/configs/gki_defconfig | 2 -- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 5dd051a51ce7..00d751aefa22 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -60,8 +60,6 @@ CONFIG_SETEND_EMULATION=y # CONFIG_ARM64_VHE is not set CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -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 a916847cef05..72a9a6e00d14 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -52,8 +52,6 @@ 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