From nobody Sat May 10 07:37:44 2025 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) client-ip=80.81.252.135; envelope-from=seabios-bounces@seabios.org; helo=mail.coreboot.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org Return-Path: Received: from mail.coreboot.org (mail.coreboot.org [80.81.252.135]) by mx.zohomail.com with SMTPS id 1504851551811577.3165540157073; Thu, 7 Sep 2017 23:19:11 -0700 (PDT) Received: from [127.0.0.1] (helo=ra.coreboot.org) by mail.coreboot.org with esmtp (Exim 4.86_2) (envelope-from ) id 1dqCcg-0002Va-De; Fri, 08 Sep 2017 08:18:38 +0200 Received: from mx1.redhat.com ([209.132.183.28]) by mail.coreboot.org with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_2) (envelope-from ) id 1dqCcR-0002TJ-3v for seabios@seabios.org; Fri, 08 Sep 2017 08:18:32 +0200 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1CD36883A0 for ; Fri, 8 Sep 2017 06:18:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-175.ams2.redhat.com [10.36.117.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9844F600C0; Fri, 8 Sep 2017 06:18:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 197E942302; Fri, 8 Sep 2017 08:18:28 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1CD36883A0 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: seabios@seabios.org Date: Fri, 8 Sep 2017 08:18:28 +0200 Message-Id: <20170908061828.13732-7-kraxel@redhat.com> In-Reply-To: <20170908061828.13732-1-kraxel@redhat.com> References: <20170908061828.13732-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 08 Sep 2017 06:18:38 +0000 (UTC) X-Spam-Score: -8.0 (--------) Subject: [SeaBIOS] [PATCH 6/6] [hack] ignore sgabios, enable sercon instead X-BeenThere: seabios@seabios.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SeaBIOS mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: seabios-bounces@seabios.org Sender: "SeaBIOS" X-Duff: Orig. Duff, Duff Lite, Duff Dry, Duff Dark, Raspberry Duff, Lady Duff, Red Duff, Tartar Control Duff X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Temporary, for testing convinience. --- src/optionroms.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/optionroms.c b/src/optionroms.c index 76a70ea686..7b1bc141eb 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -23,7 +23,7 @@ #include "tcgbios.h" // tpm_* =20 static int EnforceChecksum, S3ResumeVga, RunPCIroms; - +static int sgabios; =20 /**************************************************************** * Helper functions @@ -193,6 +193,12 @@ run_file_roms(const char *prefix, int isvga, u64 *sour= ces) file =3D romfile_findprefix(prefix, file); if (!file) break; + if (strcmp(file->name, "vgaroms/sgabios.bin") =3D=3D 0) { + dprintf(1, "sgabios.bin found -> ignoring, enabling sercon ins= tead.\n"); + dprintf(1, "hint: use '-machine graphics=3Dno' instead of '-de= vice sga'.\n"); + sgabios++; + continue; + } struct rom_header *rom =3D deploy_romfile(file); if (rom) { setRomSource(sources, rom, (u32)file); @@ -434,7 +440,7 @@ vgarom_setup(void) =20 if (rom_get_last() =3D=3D BUILD_ROM_START) { // No VGA rom found - if (romfile_loadint("etc/sercon-enable", 0)) { + if (romfile_loadint("etc/sercon-enable", 0) || sgabios) { sercon_setup(); enable_vga_console(); } @@ -442,7 +448,7 @@ vgarom_setup(void) } =20 VgaROM =3D (void*)BUILD_ROM_START; - if (romfile_loadint("etc/sercon-enable", 0)) + if (romfile_loadint("etc/sercon-enable", 0) || sgabios) sercon_setup(); enable_vga_console(); } --=20 2.9.3 _______________________________________________ SeaBIOS mailing list SeaBIOS@seabios.org https://mail.coreboot.org/mailman/listinfo/seabios