From: Christoffer Dall <christoffer.dall@linaro.org>
To: Ian Campbell <ian.campbell@citrix.com>
Cc: xen-devel@lists.xen.org
Subject: Re: [PATCH 2/4] Fix build when Xen is not enabled
Date: Sun, 16 Nov 2014 13:03:56 -0800 [thread overview]
Message-ID: <20141116210356.GE9960@lvm> (raw)
In-Reply-To: <1415628601-31075-2-git-send-email-ian.campbell@citrix.com>
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
next prev parent reply other threads:[~2014-11-16 21:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-06 12:48 xen/arm: Bootwrapper update to support PSCI and GICv3 Julien Grall
2014-11-10 11:34 ` Ian Campbell
2014-11-10 13:35 ` Christoffer Dall
2014-11-10 14:09 ` [PATCH 1/4] xen: Correction to module@1 (dom0 kernel) DT node Ian Campbell
2014-11-16 20:26 ` Christoffer Dall
2014-11-17 9:42 ` Ian Campbell
2014-11-10 14:09 ` [PATCH 2/4] Fix build when Xen is not enabled Ian Campbell
2014-11-16 21:03 ` Christoffer Dall [this message]
2014-11-17 9:44 ` Ian Campbell
2014-11-10 14:10 ` [PATCH 3/4] Select correct dom0 console depending on whether Xen is enabled or not Ian Campbell
2014-11-10 14:10 ` [PATCH 4/4] xen: Disable boot scrub Ian Campbell
2014-11-10 14:10 ` xen/arm: Bootwrapper update to support PSCI and GICv3 Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141116210356.GE9960@lvm \
--to=christoffer.dall@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.