qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 4/8] roms: build two seabios binaries
Date: Fri,  6 Dec 2013 10:35:23 +0100	[thread overview]
Message-ID: <1386322527-23148-5-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1386322527-23148-1-git-send-email-kraxel@redhat.com>

Adding xhci support to seabios made it jump over the 128k line.
Changing the bios size breaks migration, so we have to keep a
128k seabios binary for old machine types.  New machine types can
use a large 256k bios which should be big enougth for a while.

This patch updates the seabios build process to build seabios twice,
once full featured and once with xen and xhci turned off so the
resulting binary is small enougth to fit into 128k.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/Makefile            | 7 ++++---
 roms/config.seabios      | 1 -
 roms/config.seabios-128k | 6 ++++++
 roms/config.seabios-256k | 3 +++
 4 files changed, 13 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..fc716c1 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.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..41f8381
--- /dev/null
+++ b/roms/config.seabios-128k
@@ -0,0 +1,6 @@
+# for qemu machine types 1.7 + older
+# need to turn off features (xhci) to make it fit into 128k
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=128
+CONFIG_XEN=n
+CONFIG_USB_XHCI=n
diff --git a/roms/config.seabios-256k b/roms/config.seabios-256k
new file mode 100644
index 0000000..65e5015
--- /dev/null
+++ b/roms/config.seabios-256k
@@ -0,0 +1,3 @@
+# for qemu machine types 2.0 + newer
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=256
-- 
1.8.3.1

  parent reply	other threads:[~2013-12-06  9:36 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-06  9:35 [Qemu-devel] [PULL 0/8] seabios update Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 1/8] add pc-{i440fx,q35}-2.0 machine types Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 2/8] add firmware to machine options Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 3/8] roms: update seabios submodule to 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26d Gerd Hoffmann
2013-12-06  9:35 ` Gerd Hoffmann [this message]
2013-12-06  9:35 ` [Qemu-devel] [PATCH 5/8] roms: enable seabios cross builds Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 6/8] roms: update seabios binaries Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 7/8] roms: update vgabios binaries Gerd Hoffmann
2014-01-05  9:35   ` Jan Kiszka
2014-01-05 11:26     ` Paolo Bonzini
2014-01-05 11:45       ` Jan Kiszka
2014-02-03 14:28         ` Paolo Bonzini
2014-02-03 14:41           ` Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 8/8] pc: switch 2.0 machine types to large seabios binary Gerd Hoffmann
2013-12-09 23:33   ` [Qemu-devel] [PATCH] Add bios-256k.bin to BLOBS on Makefile Eduardo Habkost
2013-12-10  8:52     ` Gerd Hoffmann
2013-12-10 13:56     ` Peter Maydell
2013-12-11 17:30     ` William Dauchy
2014-01-06 13:13     ` Peter Maydell
2014-01-14 13:45       ` William Dauchy
2014-01-14 14:03         ` Michael Tokarev
  -- strict thread matches above, loose matches on Subject: below --
2013-12-02 12:24 [Qemu-devel] [PATCH 0/8] seabios update Gerd Hoffmann
2013-12-02 12:24 ` [Qemu-devel] [PATCH 4/8] roms: build two seabios binaries Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386322527-23148-5-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).