summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-10-10 10:12:17 +0400
committerSimon Horman <horms+renesas@verge.net.au>2013-11-24 10:13:40 +0400
commit851f0cda469fdba6371ab2e268462aeb8393f08e (patch)
tree46012b280762443db9d49da06fddf3bcff206d03 /arch
parent03248fde88e37b1b043b640b1bae4fb14d4d3f23 (diff)
downloadlinux-851f0cda469fdba6371ab2e268462aeb8393f08e.tar.xz
ARM: shmobile: bockw: Do not set command line in defconfig
As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config. bockw already has the command line present in its DTS file but it was being overrirden by the kernel config. A side effect of this change is that "rw" is now present on the command line which allows a boot using nfs root to succeed in the case where userspace expects to be able to write to the root filesystem. Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/bockw_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index 6583683492bd..b35301fa9685 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -27,8 +27,6 @@ CONFIG_HIGHMEM=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
-CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp"
-CONFIG_CMDLINE_FORCE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_SUSPEND is not set
CONFIG_PM_RUNTIME=y