From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm-devel <kvm@vger.kernel.org>
Subject: [PATCH] qemu-kvm: Move extboot to other optionroms
Date: Wed, 08 Jul 2009 18:07:49 +0200 [thread overview]
Message-ID: <4A54C455.4080705@siemens.com> (raw)
This unbreaks out-of-tree builds and reduces the differences to
upstream's top-level Makefile.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Makefile | 11 -
kvm/extboot/extboot.S | 695 -------------------------------------------
pc-bios/optionrom/Makefile | 2
pc-bios/optionrom/extboot.S | 695 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 697 insertions(+), 706 deletions(-)
delete mode 100644 kvm/extboot/extboot.S
create mode 100644 pc-bios/optionrom/extboot.S
diff --git a/Makefile b/Makefile
index eb64886..fc40431 100644
--- a/Makefile
+++ b/Makefile
@@ -444,18 +444,9 @@ tarbin:
# Include automatically generated dependency files
-include $(wildcard *.d audio/*.d slirp/*.d block/*.d)
-.PHONY: kvm/extboot
-
build-targets-i386 = $(build-targets-x86)
build-targets-x86_64 = $(build-targets-x86)
-build-targets-x86 = kvm/extboot
+build-targets-x86 =
build-targets-ia64 =
all: $(build-targets-$(ARCH))
-
-kvm/extboot:
- $(MAKE) -C $@
- if ! [ -f pc-bios/extboot.bin ] \
- || ! cmp -s pc-bios/extboot.bin $@/extboot.bin; then \
- cp $@/extboot.bin pc-bios/extboot.bin; \
- fi
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index c4a6f42..8a3f8a4 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -29,7 +29,7 @@ ifeq ($(call cc-option-yn,-fno-stack-protector),y)
CFLAGS += -fno-stack-protector
endif
-build-all: multiboot.bin
+build-all: multiboot.bin extboot.bin
%.o: %.S
$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/kvm/extboot/extboot.S b/pc-bios/optionrom/extboot.S
similarity index 100%
rename from kvm/extboot/extboot.S
rename to pc-bios/optionrom/extboot.S
next reply other threads:[~2009-07-08 16:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-08 16:07 Jan Kiszka [this message]
2009-07-08 16:20 ` [PATCH] qemu-kvm: Move extboot to other optionroms Avi Kivity
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=4A54C455.4080705@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.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.