[Xen-changelog] [xen-unstable] arm: move check for CONFIG_DTB_FILE to xen/arch/arm/Makefile

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User David Vrabel <david.vrabel@xxxxxxxxxx>
# Date 1329921203 0
# Node ID 7705f168dee3507aa3246808dd6735ae2016e602
# Parent  4da12071496df60c68f0f496f58cf685e307f4f2
arm: move check for CONFIG_DTB_FILE to xen/arch/arm/Makefile

CONFIG_DTB_FILE only needs to be set when building Xen itself.

Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
---


diff -r 4da12071496d -r 7705f168dee3 config/arm.mk
--- a/config/arm.mk     Wed Feb 22 14:33:22 2012 +0000
+++ b/config/arm.mk     Wed Feb 22 14:33:23 2012 +0000
@@ -16,9 +16,3 @@
 LDFLAGS_DIRECT += -marmelf$(LDFLAGS_DIRECT_$(XEN_OS))_eabi
 
 CONFIG_LOAD_ADDRESS ?= 0x80000000
-
-# XXX: When running on the model there is no bootloader to provide a
-# device tree.  It must be linked into Xen.
-ifndef CONFIG_DTB_FILE
-$(error CONFIG_DTB_FILE must be set to the absolute filename of a DTB)
-endif
diff -r 4da12071496d -r 7705f168dee3 xen/arch/arm/Makefile
--- a/xen/arch/arm/Makefile     Wed Feb 22 14:33:22 2012 +0000
+++ b/xen/arch/arm/Makefile     Wed Feb 22 14:33:23 2012 +0000
@@ -28,6 +28,10 @@
 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)

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