diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-10-10 06:12:17 (GMT) |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-11-24 06:13:41 (GMT) |
| commit | 7a14b78831d34b63032de1bb4d05221ed20cb0cf (patch) | |
| tree | 151c4c45546398108d5e9f40454b2ddf87a80dc0 /arch/arm/configs/marzen_defconfig | |
| parent | 851f0cda469fdba6371ab2e268462aeb8393f08e (diff) | |
| download | linux-7a14b78831d34b63032de1bb4d05221ed20cb0cf.tar.xz | |
ARM: shmobile: marzen: 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.
marzen already has the command line present in its DTS file
but it was being overrirden by the kernel config.
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm/configs/marzen_defconfig')
| -rw-r--r-- | arch/arm/configs/marzen_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 5cc6360..103b875 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -30,8 +30,6 @@ CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y -CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on" -CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y |