From patchwork Wed Jul 8 16:07:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 34677 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n68GDsIi016321 for ; Wed, 8 Jul 2009 16:13:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760057AbZGHQIK (ORCPT ); Wed, 8 Jul 2009 12:08:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754633AbZGHQIK (ORCPT ); Wed, 8 Jul 2009 12:08:10 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:24719 "EHLO lizzard.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760079AbZGHQII (ORCPT ); Wed, 8 Jul 2009 12:08:08 -0400 Received: from mail2.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n68G7oF3004374; Wed, 8 Jul 2009 18:07:50 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n68G7nRn021513; Wed, 8 Jul 2009 18:07:50 +0200 Message-ID: <4A54C455.4080705@siemens.com> Date: Wed, 08 Jul 2009 18:07:49 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity CC: kvm-devel Subject: [PATCH] qemu-kvm: Move extboot to other optionroms Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This unbreaks out-of-tree builds and reduces the differences to upstream's top-level Makefile. Signed-off-by: Jan Kiszka --- 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/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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 $<