diff mbox

[Xen-devel,2/4] Fix build when Xen is not enabled

Message ID 1415628601-31075-2-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell Nov. 10, 2014, 2:09 p.m. UTC 
If Xen isn't enabled then XEN_IMAGE ends up as "no.o", which obviously doesn't
exist. Handle the dependency explicitly.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Christoffer Dall Nov. 16, 2014, 9:03 p.m. UTC | #1 
On Mon, Nov 10, 2014 at 02:09:59PM +0000, Ian Campbell wrote:
> If Xen isn't enabled then XEN_IMAGE ends up as "no.o", which obviously doesn't
> exist. Handle the dependency explicitly.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
>  Makefile.am |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index ed5acbb..6c2786e 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -98,7 +98,10 @@ all: $(IMAGE) $(XIMAGE)
>  
>  CLEANFILES = $(IMAGE) boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb
>  
> -$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE)
> +if XEN
> +XEN_IMAGE_DEP = $(XEN_IMAGE)
> +endif
> +$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE_DEP)
>  	$(LD) -o $@ --script=model.lds
>  
>  %.o: %.S Makefile
> -- 
> 1.7.10.4
> 
I fixed this differently, see the 'xen-psci-support-for-upstream' branch in:
http://git.linaro.org/people/christoffer.dall/boot-wrapper-aarch64.git

Hopefully you're ok with that change.

-Christoffer
Ian Campbell Nov. 17, 2014, 9:44 a.m. UTC | #2 
On Sun, 2014-11-16 at 13:03 -0800, Christoffer Dall wrote:
> On Mon, Nov 10, 2014 at 02:09:59PM +0000, Ian Campbell wrote:
> > If Xen isn't enabled then XEN_IMAGE ends up as "no.o", which obviously doesn't
> > exist. Handle the dependency explicitly.
> > 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > ---
> >  Makefile.am |    5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Makefile.am b/Makefile.am
> > index ed5acbb..6c2786e 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -98,7 +98,10 @@ all: $(IMAGE) $(XIMAGE)
> >  
> >  CLEANFILES = $(IMAGE) boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb
> >  
> > -$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE)
> > +if XEN
> > +XEN_IMAGE_DEP = $(XEN_IMAGE)
> > +endif
> > +$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE_DEP)
> >  	$(LD) -o $@ --script=model.lds
> >  
> >  %.o: %.S Makefile
> > -- 
> > 1.7.10.4
> > 
> I fixed this differently, see the 'xen-psci-support-for-upstream' branch in:
> http://git.linaro.org/people/christoffer.dall/boot-wrapper-aarch64.git
> 
> Hopefully you're ok with that change.

Sure.

Ian,
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index ed5acbb..6c2786e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,10 @@  all: $(IMAGE) $(XIMAGE)
 
 CLEANFILES = $(IMAGE) boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb
 
-$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE)
+if XEN
+XEN_IMAGE_DEP = $(XEN_IMAGE)
+endif
+$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE_DEP)
 	$(LD) -o $@ --script=model.lds
 
 %.o: %.S Makefile