From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnSYd-0004M0-UQ for qemu-devel@nongnu.org; Mon, 02 Dec 2013 07:25:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnSYW-0003Fs-Fo for qemu-devel@nongnu.org; Mon, 02 Dec 2013 07:24:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnSYW-0003FX-7O for qemu-devel@nongnu.org; Mon, 02 Dec 2013 07:24:52 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rB2COpKm021545 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 2 Dec 2013 07:24:51 -0500 From: Gerd Hoffmann Date: Mon, 2 Dec 2013 13:24:39 +0100 Message-Id: <1385987083-19917-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1385987083-19917-1-git-send-email-kraxel@redhat.com> References: <1385987083-19917-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/8] roms: build two seabios binaries List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- 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