From patchwork Sat Dec 15 09:16:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1882581 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C0B23DF2EF for ; Sat, 15 Dec 2012 09:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751038Ab2LOJQg (ORCPT ); Sat, 15 Dec 2012 04:16:36 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:51999 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750943Ab2LOJQe (ORCPT ); Sat, 15 Dec 2012 04:16:34 -0500 Received: from joe.kanocho.kobe.vergenet.net (101-140-169-19f1.hyg1.eonet.ne.jp [101.140.169.19]) by kirsty.vergenet.net (Postfix) with ESMTP id 04FEB25BFCA; Sat, 15 Dec 2012 20:16:33 +1100 (EST) Received: by joe.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 03CF528A04C; Sat, 15 Dec 2012 18:16:31 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Simon Horman Subject: [PATCH v2] ARM: mach-shmobile: mackerel: update defconfig Date: Sat, 15 Dec 2012 18:16:25 +0900 Message-Id: <1355562985-1991-1-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.10.4 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Simon Horman * Enable ARM_APPENDED_DTB Typically the bootloader of a mackerel board does not support DT so this option is useful * Add "rw" to command line This appears to be necessary for a successful NFS-root boot Signed-off-by: Simon Horman --- arch/arm/configs/mackerel_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) v2 * Fix up comment to remove mention of adding INOTIFY_USER, it is already present. diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 2098ce1..8519721 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig @@ -23,7 +23,8 @@ CONFIG_AEABI=y CONFIG_FORCE_MAX_ZONEORDER=15 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" +CONFIG_ARM_APPENDED_DTB=y +CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m rw" CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM=y