From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWHM9-000299-NC for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:10:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWHM5-00026d-0Y for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:10:41 -0400 Received: from [199.232.76.173] (port=46432 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWHM4-00026a-SS for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:10:36 -0400 Received: from mail-yx0-f188.google.com ([209.85.210.188]:57874) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWHM4-0004ku-IW for qemu-devel@nongnu.org; Wed, 29 Jul 2009 18:10:36 -0400 Received: by yxe26 with SMTP id 26so1879190yxe.4 for ; Wed, 29 Jul 2009 15:10:35 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1248893159-18785-6-git-send-email-aliguori@us.ibm.com> References: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> <1248893159-18785-6-git-send-email-aliguori@us.ibm.com> Date: Wed, 29 Jul 2009 15:10:34 -0700 Message-ID: <2a50f7880907291510i44d111cfi97cc4313eeeae34e@mail.gmail.com> Subject: Re: [Qemu-devel] [PATCH 6/7] Add pc-bios as a git submodule From: Jordan Justen Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Alex Graf , qemu-devel@nongnu.org, Avi Kivity On Wed, Jul 29, 2009 at 11:45 AM, Anthony Liguori wrot= e: > This will allow us to build pc-bios on demand > > Signed-off-by: Anthony Liguori > --- > =A0.gitmodules =A0| =A0 =A03 +++ > =A0Makefile =A0 =A0 | =A0 =A05 +++-- > =A0configure =A0 =A0| =A0 43 +++++++++++++++++++++++++++++++++++++++++-- > =A0roms/pc-bios | =A0 =A01 + > =A04 files changed, 48 insertions(+), 4 deletions(-) > =A0create mode 100644 .gitmodules > =A0create 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"] > + =A0 =A0 =A0 path =3D roms/pc-bios > + =A0 =A0 =A0 url =3D git://git.qemu.org/pcbios.git Will this cause hassles for those without git protocol access? For example, at work I pull qemu via the http url to go through the proxy server. > diff --git a/Makefile b/Makefile > index 4f06ec1..7fa5253 100644 > --- a/Makefile > +++ b/Makefile > @@ -239,7 +239,7 @@ ar =A0 =A0 =A0de =A0 =A0 en-us =A0fi =A0fr-be =A0hr = =A0 =A0 it =A0lv =A0nl =A0 =A0 =A0 =A0 pl =A0ru =A0 =A0 th \ > =A0common =A0de-ch =A0es =A0 =A0 fo =A0fr-ca =A0hu =A0 =A0 ja =A0mk =A0nl= -be =A0 =A0 =A0pt =A0sl =A0 =A0 tr > > =A0ifdef INSTALL_BLOBS > -BLOBS=3Dbios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ > +BLOBS=3Dvgabios.bin vgabios-cirrus.bin ppc_rom.bin \ > =A0video.x openbios-sparc32 openbios-sparc64 openbios-ppc \ > =A0pxe-ne2k_pci.bin pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin \ > =A0bamboo.dtb petalogix-s3adsp1800.dtb > @@ -274,9 +274,10 @@ ifneq ($(BLOBS),) > =A0 =A0 =A0 =A0done > =A0endif > =A0 =A0 =A0 =A0 # FIXME: this is terrible > - =A0 =A0 =A0 for rom in multiboot; do \ > + =A0 =A0 =A0 for rom in $(ROMS); do \ > =A0 =A0 =A0 =A0 =A0case $$rom in \ > =A0 =A0 =A0 =A0 =A0 =A0multiboot) srcbin=3Dmultiboot.bin ;; \ > + =A0 =A0 =A0 =A0 =A0 pc-bios) srcbin=3DBIOS-bochs-latest; dstbin=3Dbios.= bin ;; \ > =A0 =A0 =A0 =A0 =A0esac; \ > =A0 =A0 =A0 =A0 =A0if test -z "$$dstbin" ; then \ > =A0 =A0 =A0 =A0 =A0 =A0dstbin=3D$$srcbin ; \ > diff --git a/configure b/configure > index 75e5657..71075fd 100755 > --- a/configure > +++ b/configure > @@ -17,8 +17,10 @@ TMPE=3D"${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}" > =A0TMPS=3D"${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S" > =A0TMPI=3D"${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.i" > =A0TMPSDLLOG=3D"${TMPDIR1}/qemu-conf-sdl-$$-${RANDOM}.log" > +TMPDSL=3D"${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.dsl" > +TMPAML=3D"${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; ex= it" 0 2 3 15 > > =A0# default parameters > =A0prefix=3D"" > @@ -207,6 +209,8 @@ fdt=3D"yes" > =A0sdl=3D"yes" > =A0xen=3D"yes" > =A0pkgversion=3D"" > +bcc=3D"yes" > +iasl=3D"yes" > > =A0# OS specific > =A0if check_define __linux__ ; then > @@ -526,6 +530,10 @@ for opt do > =A0 ;; > =A0 --disable-docs) build_docs=3D"no" > =A0 ;; > + =A0--disable-bcc) bcc=3D"no" > + =A0;; > + =A0--disable-isal) iasl=3D"no" > + =A0;; > =A0 *) echo "ERROR: unknown option $opt"; show_help=3D"yes" > =A0 ;; > =A0 esac > @@ -860,6 +868,32 @@ else > =A0fi > > =A0########################################## > +# bcc check > +cat > $TMPC < +int main() { return 0; } > +EOF > +if test "$bcc" =3D "yes" ; then > + =A0 =A0if bcc -o $TMPE $TMPC > /dev/null 2> /dev/null ; then > + =A0 =A0 =A0 : > + =A0 =A0else > + =A0 =A0 =A0 bcc=3D"no" > + =A0 =A0fi > +fi > + > +######################################### > +# iasl check > +cat > $TMPDSL < +DefinitionBlock("$TMPAML", "DSDT", 0x01, "BXPC", "BXDSDT", 0x1) { } > +EOF > +if test "$iasl" =3D "yes" ; then > + =A0 =A0if iasl $TMPDSL > /dev/null 2> /dev/null ; then > + =A0 =A0 =A0 : > + =A0 =A0else > + =A0 =A0 =A0 iasl=3D"no" > + =A0 =A0fi > +fi > + > +########################################## > =A0# zlib check > > =A0cat > $TMPC << EOF > @@ -1751,6 +1785,9 @@ if test \( \( "$cpu" =3D "i386" -o "$cpu" =3D "x86_= 64" \) -a \ > =A0 =A0 =A0 =A0 "$targetos" !=3D "Darwin" \) -o \ > =A0 =A0 =A0 =A0 "$i386_cross_prefix" ; then > =A0 roms=3D"$roms multiboot" > + =A0if test "$bcc" =3D "yes" -a "$iasl" =3D "yes" ; then > + =A0 =A0roms=3D"$roms pc-bios" > + =A0fi > =A0fi > =A0echo "ROMS=3D$roms" >> $config_host_mak > > @@ -2123,7 +2160,7 @@ for rom in $roms; do > =A0 =A0 ln -s $source_path/roms/$rom/Makefile pc-bios/$rom/Makefile > =A0 =A0 config_mak=3D"pc-bios/$rom/config.mak" > =A0 =A0 case "$rom" in > - =A0 =A0 =A0multiboot) > + =A0 =A0 =A0multiboot|pc-bios) > =A0 =A0 =A0 =A0prefix=3D${i386_cross_prefix} > =A0 =A0 =A0 =A0;; > =A0 =A0 esac > @@ -2136,6 +2173,8 @@ for rom in $roms; do > =A0 =A0 echo "CPP=3D${prefix}cpp" >> $config_mak > =A0 =A0 echo "LD=3D${prefix}${ld}" >> $config_mak > =A0 =A0 echo "OBJCOPY=3D${prefix}${objcopy}" >> $config_mak > + =A0 =A0echo "BCC=3Dbcc" >> $config_mak > + =A0 =A0echo "IASL=3Diasl" >> $config_mak > =A0done > > =A0# build tree in object directory if source path is different from curr= ent 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 > > > >