From patchwork Mon Feb 13 19:49:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 6770 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 EBA9F23EAE for ; Mon, 13 Feb 2012 19:49:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id AB092A1819F for ; Mon, 13 Feb 2012 19:49:13 +0000 (UTC) Received: by iabz7 with SMTP id z7so6153166iab.11 for ; Mon, 13 Feb 2012 11:49:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.80.3 with SMTP id t3mr23973826ick.49.1329162553102; Mon, 13 Feb 2012 11:49:13 -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.231.66.135 with SMTP id n7cs69676ibi; Mon, 13 Feb 2012 11:49:12 -0800 (PST) Received: by 10.180.92.71 with SMTP id ck7mr33271791wib.3.1329162551890; Mon, 13 Feb 2012 11:49:11 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id w72si10705450weq.134.2012.02.13.11.49.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 11:49:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Rx1tc-0001yw-S5; Mon, 13 Feb 2012 19:49:08 +0000 From: Peter Maydell To: android-virt@lists.cs.columbia.edu Cc: patches@linaro.org Subject: [PATCH] model.lds.S: INPUT() bootsemi.o, not boot.o, if SEMIHOSTING Date: Mon, 13 Feb 2012 19:49:08 +0000 Message-Id: <1329162548-7595-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQm/6/vW0uQuPjSsMAcRX4Ruuh9cEwAZEe6f7lNoHcKJtbCQrySi7J03oN8jjMJUHsD2neRl If SEMIHOSTING is defined then use the correct object file name in the INPUT() directive. This fixes a failure to build linux-system-semi.axf from clean. Signed-off-by: Peter Maydell --- Oops. I'll commit this to the git repo within the next day or two unless somebody wants to object... model.lds.S | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/model.lds.S b/model.lds.S index 3af4e07..10c13b1 100644 --- a/model.lds.S +++ b/model.lds.S @@ -12,12 +12,14 @@ OUTPUT_ARCH(arm) TARGET(binary) INPUT(./monitor.o) -INPUT(./boot.o) #ifndef SEMIHOSTING +INPUT(./boot.o) INPUT(./uImage) #ifdef USE_INITRD INPUT(./filesystem.cpio.gz) #endif +#else +INPUT(./bootsemi.o) #endif