From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWEAL-0005is-2o for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWEAE-0005cA-R0 for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:14 -0400 Received: from [199.232.76.173] (port=34451 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWEAD-0005bk-N1 for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:09 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:53709) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWEAC-0003kv-GA for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:08 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e9.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id n6TIjrfp017388 for ; Wed, 29 Jul 2009 14:45:53 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n6TIk7wq253316 for ; Wed, 29 Jul 2009 14:46:07 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n6TIk6R4012052 for ; Wed, 29 Jul 2009 14:46:06 -0400 From: Anthony Liguori Date: Wed, 29 Jul 2009 13:45:58 -0500 Message-Id: <1248893159-18785-6-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> References: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 6/7] Add pc-bios as a git submodule List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Avi Kivity , Alex Graf This will allow us to build pc-bios on demand Signed-off-by: Anthony Liguori --- .gitmodules | 3 +++ Makefile | 5 +++-- configure | 43 +++++++++++++++++++++++++++++++++++++++++-- roms/pc-bios | 1 + 4 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 160000 roms/pc-bios diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7ff5bb4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "roms/pc-bios"] + path = roms/pc-bios + url = git://git.qemu.org/pcbios.git diff --git a/Makefile b/Makefile index 4f06ec1..7fa5253 100644 --- a/Makefile +++ b/Makefile @@ -239,7 +239,7 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr ifdef INSTALL_BLOBS -BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ +BLOBS=vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ video.x openbios-sparc32 openbios-sparc64 openbios-ppc \ pxe-ne2k_pci.bin pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin \ bamboo.dtb petalogix-s3adsp1800.dtb @@ -274,9 +274,10 @@ ifneq ($(BLOBS),) done endif # FIXME: this is terrible - for rom in multiboot; do \ + for rom in $(ROMS); do \ case $$rom in \ multiboot) srcbin=multiboot.bin ;; \ + pc-bios) srcbin=BIOS-bochs-latest; dstbin=bios.bin ;; \ esac; \ if test -z "$$dstbin" ; then \ dstbin=$$srcbin ; \ diff --git a/configure b/configure index 75e5657..71075fd 100755 --- a/configure +++ b/configure @@ -17,8 +17,10 @@ TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}" TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S" TMPI="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.i" TMPSDLLOG="${TMPDIR1}/qemu-conf-sdl-$$-${RANDOM}.log" +TMPDSL="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.dsl" +TMPAML="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.aml" -trap "rm -f $TMPC $TMPO $TMPE $TMPS $TMPI $TMPSDLLOG; exit" 0 2 3 15 +trap "rm -f $TMPC $TMPO $TMPE $TMPS $TMPI $TMPSDLLOG $TMPDSL $TMPAML; exit" 0 2 3 15 # default parameters prefix="" @@ -207,6 +209,8 @@ fdt="yes" sdl="yes" xen="yes" pkgversion="" +bcc="yes" +iasl="yes" # OS specific if check_define __linux__ ; then @@ -526,6 +530,10 @@ for opt do ;; --disable-docs) build_docs="no" ;; + --disable-bcc) bcc="no" + ;; + --disable-isal) iasl="no" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -860,6 +868,32 @@ else fi ########################################## +# bcc check +cat > $TMPC < /dev/null 2> /dev/null ; then + : + else + bcc="no" + fi +fi + +######################################### +# iasl check +cat > $TMPDSL < /dev/null 2> /dev/null ; then + : + else + iasl="no" + fi +fi + +########################################## # zlib check cat > $TMPC << EOF @@ -1751,6 +1785,9 @@ if test \( \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ "$targetos" != "Darwin" \) -o \ "$i386_cross_prefix" ; then roms="$roms multiboot" + if test "$bcc" = "yes" -a "$iasl" = "yes" ; then + roms="$roms pc-bios" + fi fi echo "ROMS=$roms" >> $config_host_mak @@ -2123,7 +2160,7 @@ for rom in $roms; do ln -s $source_path/roms/$rom/Makefile pc-bios/$rom/Makefile config_mak="pc-bios/$rom/config.mak" case "$rom" in - multiboot) + multiboot|pc-bios) prefix=${i386_cross_prefix} ;; esac @@ -2136,6 +2173,8 @@ for rom in $roms; do echo "CPP=${prefix}cpp" >> $config_mak echo "LD=${prefix}${ld}" >> $config_mak echo "OBJCOPY=${prefix}${objcopy}" >> $config_mak + echo "BCC=bcc" >> $config_mak + echo "IASL=iasl" >> $config_mak done # build tree in object directory if source path is different from current one diff --git a/roms/pc-bios b/roms/pc-bios new file mode 160000 index 0000000..c658541 --- /dev/null +++ b/roms/pc-bios @@ -0,0 +1 @@ +Subproject commit c658541caaec566c58a8afccc1ed8b56e0e0fbd9 -- 1.6.2.5