diff options
| -rw-r--r-- | config/arm.mk | 6 | ||||
| -rw-r--r-- | xen/arch/arm/Makefile | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/config/arm.mk b/config/arm.mk index f20fd2db0b..f64f0c1c83 100644 --- a/config/arm.mk +++ b/config/arm.mk @@ -16,9 +16,3 @@ LDFLAGS_DIRECT_Linux = _linux 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 --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 49b64fe340..da5096a4be 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -28,6 +28,10 @@ obj-y += vtimer.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) |