From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 01/12] arm: Enable build without CONFIG_DTB_FILE Date: Tue, 13 Nov 2012 16:23:13 +0000 Message-ID: <1352823804-28482-1-git-send-email-ian.campbell@citrix.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell --- 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