xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 01/12] arm: Enable build without CONFIG_DTB_FILE
Date: Tue, 13 Nov 2012 16:23:13 +0000	[thread overview]
Message-ID: <1352823804-28482-1-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com>

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/arch/arm/Makefile  |    4 ----
 xen/arch/arm/xen.lds.S |    2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 634b620..bfac017 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -33,10 +33,6 @@ obj-y += hvm.o
 ifdef CONFIG_DTB_FILE
 obj-y += dtb.o
 AFLAGS += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\"
-else
-# XXX: When running on the model there is no bootloader to provide a
-# device tree.  It must be linked into Xen.
-$(error CONFIG_DTB_FILE must be set to the absolute filename of a DTB)
 endif
 
 ALL_OBJS := head.o $(ALL_OBJS)
diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
index f0f4cd3..410d7db 100644
--- a/xen/arch/arm/xen.lds.S
+++ b/xen/arch/arm/xen.lds.S
@@ -123,9 +123,11 @@ SECTIONS
   } :text
   _end = . ;
 
+#ifdef CONFIG_DTB_FILE
   /* Section for the device tree blob (if any). */
   _sdtb = .;
   .dtb : { *(.dtb) } :text
+#endif
 
   /* Sections to be discarded */
   /DISCARD/ : {
-- 
1.7.9.1

  reply	other threads:[~2012-11-13 16:23 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-13 16:22 [PATCH V2 00/12] arm: support for initial modules (e.g. dom0) and DTB supplied in RAM Ian Campbell
2012-11-13 16:23 ` Ian Campbell [this message]
2012-11-13 16:23 ` [PATCH 02/12] arm: create a raw binary target Ian Campbell
2012-11-13 16:23 ` [PATCH 03/12] arm: handle xenheap which isn't at the start of RAM Ian Campbell
2012-11-13 16:23 ` [PATCH 04/12] arm: parse modules from DT during early boot Ian Campbell
2012-11-29 17:05   ` Tim Deegan
2012-11-29 17:13     ` Ian Campbell
2012-11-30 15:14       ` Stefano Stabellini
2012-11-30 15:11   ` Stefano Stabellini
2012-12-03 16:19     ` Ian Campbell
2012-12-04 12:42       ` Stefano Stabellini
2012-12-04 13:44         ` Ian Campbell
2012-11-13 16:23 ` [PATCH 05/12] arm: avoid placing Xen over any modules Ian Campbell
2012-11-13 16:23 ` [PATCH 06/12] arm: avoid allocating the heaps over modules or xen itself Ian Campbell
2012-11-29 17:06   ` Tim Deegan
2012-11-29 17:19     ` Ian Campbell
2012-11-29 17:45       ` Tim Deegan
2012-11-13 16:23 ` [PATCH 07/12] arm: const-correctness in virt_to_maddr Ian Campbell
2012-11-13 16:23 ` [PATCH 08/12] device-tree: get_val cannot cope with cells > 2, add a BUG Ian Campbell
2012-11-29 17:09   ` Tim Deegan
2012-11-29 17:14     ` Ian Campbell
2012-11-13 16:23 ` [PATCH 09/12] arm: load dom0 kernel from first boot module Ian Campbell
2012-11-29 17:15   ` Tim Deegan
2012-11-29 17:24     ` Ian Campbell
2012-11-29 17:55       ` Tim Deegan
2012-11-13 16:23 ` [PATCH 10/12] arm: discard boot modules after building domain 0 Ian Campbell
2012-11-13 16:23 ` [PATCH 11/12] arm: use /chosen/module@1/bootargs for domain 0 command line Ian Campbell
2012-11-13 16:23 ` [PATCH 12/12] xen: strip /chosen/module@<N>/* from dom0 device tree Ian Campbell
2012-11-13 16:38 ` [PATCH V2 00/12] arm: support for initial modules (e.g. dom0) and DTB supplied in RAM Ian Campbell
2012-11-29 17:59   ` Tim Deegan
2012-11-29 18:05     ` Ian Campbell
2012-11-30 12:20       ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352823804-28482-1-git-send-email-ian.campbell@citrix.com \
    --to=ian.campbell@citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).