From: Douglas Anderson Date: Tue, 26 Apr 2016 17:53:17 +0000 (-0700) Subject: ARM64: rockchip_cros_defconfig: Don't force the command line X-Git-Tag: firefly_0821_release~2715 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2fdf2cd47a0fe6de9dee941c3d4599587f9ecba;p=firefly-linux-kernel-4.4.55.git ARM64: rockchip_cros_defconfig: Don't force the command line There's no reason to force the command line at this point. Forcing the command like makes it pretty hard to switch between eMMC and SD card boots because the old command line forced the root filesystem to /dev/mmcblk0p3 vs. depthcharge automatically inserting the right UUID based on where it found the kernel. BUG=None TEST=I see my command line now. Change-Id: I5f76b60b9726aee2152c09fbd6460b2b973b0b20 Signed-off-by: Douglas Anderson Signed-off-by: Caesar Wang --- diff --git a/arch/arm64/configs/rockchip_cros_defconfig b/arch/arm64/configs/rockchip_cros_defconfig index dbd211e13350..c86f3d7eb3cf 100644 --- a/arch/arm64/configs/rockchip_cros_defconfig +++ b/arch/arm64/configs/rockchip_cros_defconfig @@ -54,7 +54,7 @@ CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_CMDLINE="console=uart,mmio32,0xff1a0000 rootwait cros_debug cros_secure ro root=/dev/mmcblk0p3 init=/sbin/init kgdboc=ttyS2" -CONFIG_CMDLINE_FORCE=y +# CONFIG_CMDLINE_FORCE is not set # CONFIG_EFI is not set # CONFIG_COREDUMP is not set CONFIG_COMPAT=y