From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQbOW-0001d8-Q3 for qemu-devel@nongnu.org; Mon, 30 Sep 2013 07:12:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQbOO-0007px-Cx for qemu-devel@nongnu.org; Mon, 30 Sep 2013 07:12:04 -0400 Received: from mail-qe0-x22c.google.com ([2607:f8b0:400d:c02::22c]:32795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQbOO-0007pt-7H for qemu-devel@nongnu.org; Mon, 30 Sep 2013 07:11:56 -0400 Received: by mail-qe0-f44.google.com with SMTP id 3so3663128qeb.3 for ; Mon, 30 Sep 2013 04:11:55 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <52495C8C.3060704@redhat.com> Date: Mon, 30 Sep 2013 13:12:12 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1380538019-9091-1-git-send-email-kraxel@redhat.com> <1380538019-9091-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1380538019-9091-2-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] roms: build two seabios binaries List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Il 30/09/2013 12:46, Gerd Hoffmann ha scritto: > Signed-off-by: Gerd Hoffmann > --- > roms/Makefile | 7 ++++--- > roms/config.seabios | 1 - > roms/config.seabios-128k | 5 +++++ > roms/config.seabios-256k | 3 +++ > 4 files changed, 12 insertions(+), 4 deletions(-) > delete mode 100644 roms/config.seabios > create mode 100644 roms/config.seabios-128k > create mode 100644 roms/config.seabios-256k > > diff --git a/roms/Makefile b/roms/Makefile > index 10d5a65..1d84230 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -56,9 +56,10 @@ default: > @echo " the EfiRom utility from edk2 / tianocore)" > @echo " slof -- update slof.bin" > > -bios: build-seabios-config-seabios > - cp seabios/builds/seabios/bios.bin ../pc-bios/bios.bin > - cp seabios/builds/seabios/*dsdt.aml ../pc-bios/ > +bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k > + cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios-128k.bin > + cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin > + cp seabios/builds/seabios-256k/src/fw/*dsdt.aml ../pc-bios/ > > seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants)) > > diff --git a/roms/config.seabios b/roms/config.seabios > deleted file mode 100644 > index c373b87..0000000 > --- a/roms/config.seabios > +++ /dev/null > @@ -1 +0,0 @@ > -# empty, default config works for us > diff --git a/roms/config.seabios-128k b/roms/config.seabios-128k > new file mode 100644 > index 0000000..23ca812 > --- /dev/null > +++ b/roms/config.seabios-128k > @@ -0,0 +1,5 @@ > +# for qemu machine types 1.6 + older > +# need to turn off features (xhci) to make it fit into 128k > +CONFIG_QEMU=y > +CONFIG_ROM_SIZE=128 > +CONFIG_USB_XHCI=n Is it enough to disable Xen or perhaps OHCI? > diff --git a/roms/config.seabios-256k b/roms/config.seabios-256k > new file mode 100644 > index 0000000..cc37a78 > --- /dev/null > +++ b/roms/config.seabios-256k > @@ -0,0 +1,3 @@ > +# for qemu machine types 1.7 + newer > +CONFIG_QEMU=y > +CONFIG_ROM_SIZE=256 Is there already an option to remove ACPI tables generation? Should it be enabled for 1.7, irrespective of the 128k->256k switch? Paolo