[Xen-changelog] [xen-unstable] arm: Enable build without CONFIG_DTB_FILE

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1354278021 0
# Node ID d11ef8a27f5e2625f94fa9658b602043f46f4f75
# Parent  a7b0a7cf62e109db00b91f8ae7134da52956df9b
arm: Enable build without CONFIG_DTB_FILE

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r a7b0a7cf62e1 -r d11ef8a27f5e xen/arch/arm/Makefile
--- a/xen/arch/arm/Makefile     Fri Nov 30 11:42:55 2012 +0100
+++ b/xen/arch/arm/Makefile     Fri Nov 30 12:20:21 2012 +0000
@@ -34,10 +34,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 -r a7b0a7cf62e1 -r d11ef8a27f5e xen/arch/arm/xen.lds.S
--- a/xen/arch/arm/xen.lds.S    Fri Nov 30 11:42:55 2012 +0100
+++ b/xen/arch/arm/xen.lds.S    Fri Nov 30 12:20:21 2012 +0000
@@ -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/ : {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog