From patchwork Sat Feb 16 15:36:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 220965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E7CB42C0092 for ; Sun, 17 Feb 2013 02:37:03 +1100 (EST) Received: from localhost ([::1]:41486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6joz-00076H-IN for incoming@patchwork.ozlabs.org; Sat, 16 Feb 2013 10:37:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6jor-00075s-Rr for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:36:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6joq-0007x5-9k for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:36:53 -0500 Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:53261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6joq-0007w7-28 for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:36:52 -0500 Received: by mail-la0-f43.google.com with SMTP id ek20so4352355lab.30 for ; Sat, 16 Feb 2013 07:36:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=/ty7nSXBcQ5j+W9j54PD93gObh4HMwQ1puRBmOOEUQc=; b=lt1oDxhdzTrxuQf7jZ0s6qRlSi77yZ1t/m9bo/dRRRWiC0ZTO/vHgZ2NuOvQkm5xVy rfUyfvtLYpy4aCPED9tS5nR+avorrlYae9CHtSBQOaXM4RQjdCH4D8d5M0RYQf76H4Oh OI70LjiQCTV73SOAXpk1+l4lsKkN0hvha8UtEWvPPVs3vyjkwDMcDpCqM2L/GciMpy5V mEarW4Lhvq6r5oMJq9q2bxLRLaQD1QOqFqaGjyehz9CQK87v5B7sOvLekSalXDB5QHm9 kOSxWdSUjlIesKRqjjqBagIT1r8jfUYAHSNYAtnlPBQkxsbmJmdkDQ4pMxkDTv/ZMFvs wVUQ== X-Received: by 10.152.123.194 with SMTP id mc2mr5518332lab.7.1361029004836; Sat, 16 Feb 2013 07:36:44 -0800 (PST) Received: from localhost.localdomain ([2001:5c0:1115:ba00:adc3:760:1d77:5018]) by mx.google.com with ESMTPS id er8sm18846977lbb.9.2013.02.16.07.36.41 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 16 Feb 2013 07:36:43 -0800 (PST) From: Blue Swirl To: qemu-devel@nongnu.org Date: Sat, 16 Feb 2013 15:36:32 +0000 Message-Id: <6f0349e4b1f427d920762861abc0da8f7a7aa47b.1361028634.git.blauwirbel@gmail.com> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22b Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH v2] pc-bios: build OpenBIOS if possible X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Check if xsltproc and Sparc32, Sparc64 and PPC compilers are available. If found, rebuild OpenBIOS ROMs from submodule. Signed-off-by: Blue Swirl --- v2: fix crossgcc check print which ROMs will be built create the build directory in configure don't overwrite source versions when building out of tree I've pushed the OpenBIOS patch (r1099). --- configure | 25 +++++++++++++++++++++++++ pc-bios/openbios/Makefile | 29 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 pc-bios/openbios/Makefile diff --git a/configure b/configure index 8789324..ded5c7b 100755 --- a/configure +++ b/configure @@ -76,6 +76,20 @@ has() { type "$1" >/dev/null 2>&1 } +# check for cross compile or native tools for arch $1 +has_crossgcc() { + if test "$cpu" = "$1"; then + return 1 + fi + for ccprefix in "${1}-linux-gnu-" "${1}-linux-" \ + "${1}-elf-" "${1}-eabi-"; do + if has "${ccprefix}gcc"; then + return 1 + fi + done + return 0 +} + # search for an executable in PATH path_of() { local_command="$1" @@ -3241,6 +3255,14 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then roms="$roms spapr-rtas" fi +# OpenBIOS needs xsltproc, and Sparc32, Sparc64 and PPC cross compilers +if has xsltproc; then + if has_crossgcc "sparc" && has_crossgcc "sparc64" && \ + \( has_crossgcc "powerpc" || has_crossgcc "ppc" \); then + roms="$roms openbios" + fi +fi + # add pixman flags after all config tests are done QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" libs_softmmu="$libs_softmmu $pixman_libs" @@ -3344,6 +3366,7 @@ echo "GlusterFS support $glusterfs" echo "virtio-blk-data-plane $virtio_blk_data_plane" echo "gcov $gcov_tool" echo "gcov enabled $gcov" +echo "build ROMs $roms" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -4281,6 +4304,7 @@ fi # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" +DIRS="$DIRS pc-bios/openbios pc-bios/openbios/build" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" @@ -4288,6 +4312,7 @@ FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" +FILES="$FILES pc-bios/openbios/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" for bios_file in \ $source_path/pc-bios/*.bin \ diff --git a/pc-bios/openbios/Makefile b/pc-bios/openbios/Makefile new file mode 100644 index 0000000..0849cf8 --- /dev/null +++ b/pc-bios/openbios/Makefile @@ -0,0 +1,29 @@ +all: build-all +# Dummy command so that make thinks it has done something + @true + +include ../../config-host.mak + +.PHONY : all clean build-all + +# Avoid polluting sub-make environment, especially MAKEFLAGS causes build to fail +unexport AS AS_FLAGS CC CFLAGS CPP INCLUDES LD LDFLAGS VERSION SRCDIR ODIR +unexport HOSTCC HOSTCFLAGS HOSTARCH HOSTINCLUDES TARGET MAKE MAKEFLAGS MFLAGS + +build-all: config + make -C build build-verbose + rm -f ../openbios-* + cp build/obj-sparc32/openbios-builtin.elf ../openbios-sparc32 + cp build/obj-sparc64/openbios-builtin.elf ../openbios-sparc64 + cp build/obj-ppc/openbios-qemu.elf ../openbios-ppc + +config: config-timestamp + @cmp $< $@ >/dev/null 2>&1 || cp $< $@ + +config-timestamp: $(SRC_PATH)/roms/openbios/config/scripts/switch-arch + cd build && sh $(SRC_PATH)/roms/openbios/config/scripts/switch-arch sparc32 sparc64 ppc + touch $@ + +clean: + make -C build $@ + rm -f config config-timestamp