From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio Fantoni Subject: Re: [PATCH v2] tools: allow user to specify a system seabios binary Date: Wed, 04 Sep 2013 16:28:29 +0200 Message-ID: <5227438D.3040407@m2r.biz> References: <1377858120-4978-1-git-send-email-fabio.fantoni@m2r.biz> <1378301649.17510.120.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1378301649.17510.120.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: George.Dunlap@eu.citrix.com, xen-devel@lists.xensource.com, Ian.Jackson@eu.citrix.com, Stefano.Stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org Il 04/09/2013 15:34, Ian Campbell ha scritto: > On Fri, 2013-08-30 at 12:22 +0200, Fabio Fantoni wrote: >> If this option is given don't bother building seabios ourselves. >> Likely to be handy for distros who have an existing seabios >> package which they want to reuse. >> >> Signed-off-by: Fabio Fantoni >> --- >> config/Tools.mk.in | 2 ++ >> tools/configure | 28 ++++++++++++++++++++++++++++ >> tools/configure.ac | 16 ++++++++++++++++ >> tools/firmware/Makefile | 4 +++- >> tools/firmware/hvmloader/Makefile | 6 +++++- >> 5 files changed, 54 insertions(+), 2 deletions(-) >> >> diff --git a/config/Tools.mk.in b/config/Tools.mk.in >> index e388e42..eeca36b 100644 >> --- a/config/Tools.mk.in >> +++ b/config/Tools.mk.in >> @@ -23,6 +23,7 @@ LD86 := @LD86@ >> BCC := @BCC@ >> IASL := @IASL@ >> FETCHER := @FETCHER@ >> +SEABIOS_PATH := @seabios_path@ >> >> # Extra folder for libs/includes >> PREPEND_INCLUDES := @PREPEND_INCLUDES@ >> @@ -52,6 +53,7 @@ CONFIG_ROMBIOS := @rombios@ >> CONFIG_SEABIOS := @seabios@ >> CONFIG_QEMU_TRAD := @qemu_traditional@ >> CONFIG_QEMU_XEN := @qemu_xen@ >> +CONFIG_SEABIOS_COMP := @seabios_compile@ > I don't think you need both SEABIOS_PATH and CONFIG_SEABIOS_COMP. Simply > make the compilation of SeaBIOS conditional on SEABIOS_PATH being empty. Thanks for reply, I'll do new patch version probably tomorrow. >> CONFIG_XEND := @xend@ >> CONFIG_BLKTAP1 := @blktap1@ >> >> diff --git a/tools/configure.ac b/tools/configure.ac >> index 1f57681..67b21bb 100644 >> --- a/tools/configure.ac >> +++ b/tools/configure.ac >> @@ -97,6 +97,22 @@ AS_IF([test "x$qemu_xen" = "xn"], [ >> ]) >> AC_SUBST(qemu_xen) >> >> +AC_ARG_WITH([system-seabios], >> + AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], >> + [Use system supplied seabios PATH instead of building and installing >> + our own version]),[ >> + case $withval in >> + no) seabios_compile=y ; seabios_path= ;; >> + *) seabios_compile=n ; seabios_path=$withval ;; > please line these up > >> diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile >> index aff8e56..fe56036 100644 >> --- a/tools/firmware/Makefile >> +++ b/tools/firmware/Makefile >> @@ -7,7 +7,9 @@ INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) >> >> SUBDIRS-y := >> SUBDIRS-$(CONFIG_OVMF) += ovmf >> -SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir >> +ifeq ($(CONFIG_SEABIOS),y) >> +SUBDIRS-$(CONFIG_SEABIOS_COMP) += seabios-dir >> +endif > Perhaps: > > ifeq ($(CONFIG_SEABIOS_PATH),) > SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir > endif > > TBH I'm not sure that being able to disable SeaBIOS at build time is > even useful. > >> SUBDIRS-$(CONFIG_ROMBIOS) += rombios >> SUBDIRS-$(CONFIG_ROMBIOS) += vgabios >> SUBDIRS-$(CONFIG_ROMBIOS) += etherboot >> diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile >> index c6e7376..c81a9d2 100644 >> --- a/tools/firmware/hvmloader/Makefile >> +++ b/tools/firmware/hvmloader/Makefile >> @@ -70,7 +70,11 @@ endif >> ifeq ($(CONFIG_SEABIOS),y) >> OBJS += seabios.o >> CFLAGS += -DENABLE_SEABIOS >> -SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin >> +ifeq ($(CONFIG_SEABIOS_COMP),y) >> + SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin >> +else >> + SEABIOS_ROM := $(SEABIOS_PATH) >> +endif >> ROMS += $(SEABIOS_ROM) >> endif >> >