From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQb0T-0001GB-1g for qemu-devel@nongnu.org; Mon, 30 Sep 2013 06:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQb0J-0000Wc-EO for qemu-devel@nongnu.org; Mon, 30 Sep 2013 06:47:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQb0J-0000WS-60 for qemu-devel@nongnu.org; Mon, 30 Sep 2013 06:47:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8UAl2gx017799 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 30 Sep 2013 06:47:02 -0400 From: Gerd Hoffmann Date: Mon, 30 Sep 2013 12:46:58 +0200 Message-Id: <1380538019-9091-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1380538019-9091-1-git-send-email-kraxel@redhat.com> References: <1380538019-9091-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] 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 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 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 -- 1.8.3.1