| From 14e57c4ff32b05ff4d87628e34789a022d7805b4 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 10 Oct 2013 15:12:17 +0900 |
| Subject: 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> |
| (cherry picked from commit 7a14b78831d34b63032de1bb4d05221ed20cb0cf) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/configs/marzen_defconfig | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig |
| index 5cc6360340b1..103b8755d1a6 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 |
| -- |
| 1.8.5.rc3 |
| |
