From patchwork Fri Dec 9 20:24:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 5566 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 017B823E0E for ; Fri, 9 Dec 2011 20:24:15 +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 E1FA7A180E3 for ; Fri, 9 Dec 2011 20:24:14 +0000 (UTC) Received: by mail-bw0-f52.google.com with SMTP id 17so4635768bke.11 for ; Fri, 09 Dec 2011 12:24:14 -0800 (PST) Received: by 10.204.156.141 with SMTP id x13mr4793305bkw.54.1323462254706; Fri, 09 Dec 2011 12:24:14 -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 hg2cs121119bkc; Fri, 9 Dec 2011 12:24:14 -0800 (PST) Received: by 10.224.212.10 with SMTP id gq10mr8493065qab.75.1323462252821; Fri, 09 Dec 2011 12:24:12 -0800 (PST) Received: from mail-qw0-f43.google.com (mail-qw0-f43.google.com [209.85.216.43]) by mx.google.com with ESMTPS id c10si3306409qcx.137.2011.12.09.12.24.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Dec 2011 12:24:12 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.43 is neither permitted nor denied by best guess record for domain of c.dall@virtualopensystems.com) client-ip=209.85.216.43; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.216.43 is neither permitted nor denied by best guess record for domain of c.dall@virtualopensystems.com) smtp.mail=c.dall@virtualopensystems.com Received: by mail-qw0-f43.google.com with SMTP id g27so2216355qab.16 for ; Fri, 09 Dec 2011 12:24:12 -0800 (PST) Received: by 10.224.210.130 with SMTP id gk2mr8586310qab.23.1323462252313; Fri, 09 Dec 2011 12:24:12 -0800 (PST) Received: from [127.0.1.1] (chazy.cs.columbia.edu. [128.59.22.176]) by mx.google.com with ESMTPS id ed2sm18526042qab.15.2011.12.09.12.24.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Dec 2011 12:24:11 -0800 (PST) Subject: [PATCH v3 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 15:24:10 -0500 Message-ID: <20111209202410.21381.9723.stgit@ubuntu> In-Reply-To: <20111209202327.21381.56564.stgit@ubuntu> References: <20111209202327.21381.56564.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: