From patchwork Fri Dec 9 15:59:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 5562 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 70BC623E10 for ; Fri, 9 Dec 2011 15:59:57 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 594F2A18058 for ; Fri, 9 Dec 2011 15:59:57 +0000 (UTC) Received: by mail-bw0-f52.google.com with SMTP id 17so4230242bke.11 for ; Fri, 09 Dec 2011 07:59:57 -0800 (PST) Received: by 10.204.156.141 with SMTP id x13mr4194305bkw.54.1323446397140; Fri, 09 Dec 2011 07:59:57 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs116738bkc; Fri, 9 Dec 2011 07:59:57 -0800 (PST) Received: by 10.52.29.16 with SMTP id f16mr4815682vdh.45.1323446395091; Fri, 09 Dec 2011 07:59:55 -0800 (PST) Received: from mail-vx0-f178.google.com (mail-vx0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id gk6si1694587vcb.112.2011.12.09.07.59.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Dec 2011 07:59:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of c.dall@virtualopensystems.com) client-ip=209.85.220.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of c.dall@virtualopensystems.com) smtp.mail=c.dall@virtualopensystems.com Received: by vcbfo11 with SMTP id fo11so3031843vcb.37 for ; Fri, 09 Dec 2011 07:59:54 -0800 (PST) Received: by 10.220.231.194 with SMTP id jr2mr975078vcb.6.1323446394324; Fri, 09 Dec 2011 07:59:54 -0800 (PST) Received: from [127.0.1.1] (chazy.cs.columbia.edu. [128.59.22.176]) by mx.google.com with ESMTPS id k16sm7328546vdt.8.2011.12.09.07.59.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Dec 2011 07:59:53 -0800 (PST) Subject: [PATCH v2 2/2] boot.S: Factor out kernel cmd-line from boot-loader To: android-virt@lists.cs.columbia.edu From: Christoffer Dall Cc: Marc Zyngier , Peter Maydell , tech@virtualopensystems.com, patches@linaro.org Date: Fri, 09 Dec 2011 10:59:52 -0500 Message-ID: <20111209155952.23395.91454.stgit@ubuntu> In-Reply-To: <20111209155925.23395.35593.stgit@ubuntu> References: <20111209155925.23395.35593.stgit@ubuntu> User-Agent: StGit/0.15 MIME-Version: 1.0 From: Christoffer Dall The kernel command lines are set in the Makefile and config files now anyway and depend on the board type settings in there, so there should be no need to have yet another set of ifdefs in boot.S. Signed-off-by: Christoffer Dall --- boot.S | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/boot.S b/boot.S index e1c8d78..4629734 100644 --- a/boot.S +++ b/boot.S @@ -142,30 +142,8 @@ atags: @ ATAG_CMDLINE .long (1f - .) >> 2 .long 0x54410009 -#ifdef KCMD - /* User-specified command line always overrides */ + /* The kernel boot command line is defined in the Make system */ .asciz KCMD -#else -#ifdef MACH_MPS - .asciz "rdinit=/bin/sh console=ttyAMA3 mem=4M earlyprintk" -#elif defined(VEXPRESS) - -#ifdef USE_INITRD - .asciz "console=ttyAMA0 mem=512M mem=512M@0x880000000 earlyprintk ip=192.168.27.200::192.168.27.1:255.255.255.0:angstrom:eth0:off" -#else /* VEXPRESS && !USE_INITRD */ - .asciz "console=ttyAMA0 mem=512M mem=512M@0x880000000 earlyprintk root=/dev/nfs nfsroot=192.168.27.93:/srv/nfs_root,tcp rw ip=dhcp nfsrootdebug" -#endif - -#else /* ! VEXPRESS && ! MACH_MPS */ - -#ifdef USE_INITRD - .asciz "console=ttyAMA0 mem=256M earlyprintk" -#else - .asciz "root=/dev/nfs nfsroot=10.1.77.43:/work/debootstrap/arm ip=dhcp console=ttyAMA0 mem=256M earlyprintk" -#endif - -#endif -#endif .align 2 1: