From: Cody Xie <Cody.Xie@rock-chips.com>
Date: Fri, 21 Mar 2014 10:02:43 +0000 (+0800)
Subject: Revert "ARM: rockchip: rk3288 set default cmdline"
X-Git-Tag: firefly_0821_release~5921
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8365a8d8ed443322dbfa06c07e4881d5fbf84430;p=firefly-linux-kernel-4.4.55.git

Revert "ARM: rockchip: rk3288 set default cmdline"

This reverts commit 0d3e934d4b443bdf25555c59a3c753dcb4a08a09.
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index f4e007c002e3..ead5dc04d49d 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -59,8 +59,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
-CONFIG_CMDLINE="console=ttyFIQ0 androidboot.hardware=rk30board androidboot.console=ttyFIQ0 board.ap_has_alsa=0 init=/init mtdparts=rk29xxnand:0x00002000@0x00002000(uboot),0x00002000@0x00004000(misc),0x00008000@0x00006000(resource),0x00008000@0x0000e000(kernel),0x00010000@0x00016000(boot),0x00010000@0x00026000(recovery),0x0001a000@0x00036000(backup),0x00040000@0x00050000(cache),0x00002000@0x00090000(kpanic),0x00100000@0x00092000(system),0x00002000@0x00192000(metadata),0x00100000@0x00194000(userdata),-@0x00294000(user)"
-CONFIG_CMDLINE_FORCE=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y