Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- Config.mk | 6 +++--- tools/firmware/seabios-config | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index a26c7c0..1879454 100644 --- a/Config.mk +++ b/Config.mk @@ -234,9 +234,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c -SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 -# Wed Jun 26 16:30:45 2013 +0100 -# xen: Don''t perform SMP setup. +SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 +# Fri Aug 2 14:12:09 2013 -0400 +# Fix bug in CBFS file walking with compressed files. ETHERBOOT_NICS ?= rtl8139 8086100e diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config index 3a36fd1..a497162 100644 --- a/tools/firmware/seabios-config +++ b/tools/firmware/seabios-config @@ -1,13 +1,16 @@ # # Automatically generated make config: don''t edit # SeaBIOS Configuration -# Thu Jan 3 17:25:45 2013 +# Mon Sep 23 12:59:01 2013 # # # General Features # # CONFIG_COREBOOT is not set +CONFIG_QEMU=y +# CONFIG_CSM is not set +CONFIG_QEMU_HARDWARE=y CONFIG_XEN=y CONFIG_THREADS=y # CONFIG_THREAD_OPTIONROMS is not set @@ -15,6 +18,7 @@ CONFIG_RELOCATE_INIT=y CONFIG_BOOTMENU=y # CONFIG_BOOTSPLASH is not set CONFIG_BOOTORDER=y +CONFIG_ENTRY_EXTRASTACK=y # # Hardware support @@ -27,6 +31,7 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_SCSI=y CONFIG_ESP_SCSI=y CONFIG_LSI_SCSI=y +CONFIG_MEGASAS=y CONFIG_FLOPPY=y CONFIG_PS2PORT=y CONFIG_USB=y @@ -42,6 +47,7 @@ CONFIG_SERIAL=y CONFIG_LPT=y CONFIG_USE_SMM=y CONFIG_MTRR_INIT=y +CONFIG_PMTIMER=y # # BIOS interfaces @@ -70,6 +76,7 @@ CONFIG_PIRTABLE=y CONFIG_MPTABLE=y CONFIG_SMBIOS=y CONFIG_ACPI=y +CONFIG_ACPI_DSDT=y # # VGA ROM -- 1.7.10.4
Jan Beulich
2013-Sep-25 07:02 UTC
qemu update? (was: [PATCH] tools: update to SeaBIOS 1.7.3.1)
>>> On 23.09.13 at 14:19, Ian Campbell <ian.campbell@citrix.com> wrote: > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>Speaking of which - an up-rev of our qemu-upstream tree is likely on order then too? Jan
Il 25/09/2013 09:02, Jan Beulich ha scritto:>>>> On 23.09.13 at 14:19, Ian Campbell <ian.campbell@citrix.com> wrote: >> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Speaking of which - an up-rev of our qemu-upstream tree is likely > on order then too?I think it is very important to us to keep qemu updated at latest stable version (1.6). I''m keeping tested qemu latest versions and the only critical regression was fixed with the path below: http://git.qemu.org/?p=qemu.git;a=commit;h=04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d About the other critical problem regarding vga, it was fixed on xen 4.3. No other regression found here but again I think it is always good practice to keep updated qemu on xen-unstable and testing it frequently.> > Jan > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Wed, Sep 25, 2013 at 10:16:28AM +0200, Fabio Fantoni wrote:> Il 25/09/2013 09:02, Jan Beulich ha scritto: > >Speaking of which - an up-rev of our qemu-upstream tree is likely > >on order then too? > > I think it is very important to us to keep qemu updated at latest > stable version (1.6). > I''m keeping tested qemu latest versions and the only critical > regression was fixed with the path below: > http://git.qemu.org/?p=qemu.git;a=commit;h=04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d > About the other critical problem regarding vga, it was fixed on xen 4.3. > No other regression found here but again I think it is always good > practice to keep updated qemu on xen-unstable and testing it > frequently.I''m on it, but I still miss two patchs upstream (about cpu hotplug). It should be done by next week. -- Anthony PERARD
Ping? On Mon, 2013-09-23 at 13:19 +0100, Ian Campbell wrote:> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > --- > Config.mk | 6 +++--- > tools/firmware/seabios-config | 9 ++++++++- > 2 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/Config.mk b/Config.mk > index a26c7c0..1879454 100644 > --- a/Config.mk > +++ b/Config.mk > @@ -234,9 +234,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git > endif > OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 > QEMU_UPSTREAM_REVISION ?= 1c514a7734b7f98625a0d18d5e8ee7581f26e50c > -SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 > -# Wed Jun 26 16:30:45 2013 +0100 > -# xen: Don''t perform SMP setup. > +SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 > +# Fri Aug 2 14:12:09 2013 -0400 > +# Fix bug in CBFS file walking with compressed files. > > ETHERBOOT_NICS ?= rtl8139 8086100e > > diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config > index 3a36fd1..a497162 100644 > --- a/tools/firmware/seabios-config > +++ b/tools/firmware/seabios-config > @@ -1,13 +1,16 @@ > # > # Automatically generated make config: don''t edit > # SeaBIOS Configuration > -# Thu Jan 3 17:25:45 2013 > +# Mon Sep 23 12:59:01 2013 > # > > # > # General Features > # > # CONFIG_COREBOOT is not set > +CONFIG_QEMU=y > +# CONFIG_CSM is not set > +CONFIG_QEMU_HARDWARE=y > CONFIG_XEN=y > CONFIG_THREADS=y > # CONFIG_THREAD_OPTIONROMS is not set > @@ -15,6 +18,7 @@ CONFIG_RELOCATE_INIT=y > CONFIG_BOOTMENU=y > # CONFIG_BOOTSPLASH is not set > CONFIG_BOOTORDER=y > +CONFIG_ENTRY_EXTRASTACK=y > > # > # Hardware support > @@ -27,6 +31,7 @@ CONFIG_VIRTIO_BLK=y > CONFIG_VIRTIO_SCSI=y > CONFIG_ESP_SCSI=y > CONFIG_LSI_SCSI=y > +CONFIG_MEGASAS=y > CONFIG_FLOPPY=y > CONFIG_PS2PORT=y > CONFIG_USB=y > @@ -42,6 +47,7 @@ CONFIG_SERIAL=y > CONFIG_LPT=y > CONFIG_USE_SMM=y > CONFIG_MTRR_INIT=y > +CONFIG_PMTIMER=y > > # > # BIOS interfaces > @@ -70,6 +76,7 @@ CONFIG_PIRTABLE=y > CONFIG_MPTABLE=y > CONFIG_SMBIOS=y > CONFIG_ACPI=y > +CONFIG_ACPI_DSDT=y > > # > # VGA ROM
Ian Jackson
2013-Oct-16 14:05 UTC
Re: [PATCH] tools: update to SeaBIOS 1.7.3.1 [and 1 more messages]
Ian Campbell writes ("[PATCH] tools: update to SeaBIOS
1.7.3.1"):> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
In the absence of any adverse comment, and after a quick build test.
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian.