* [PATCH 1/2] tools: update to seabios rel-1.7.4
2014-05-14 9:09 [PATCH 0/2] tools: update to SeaBIOS 1.7.4 Ian Campbell
@ 2014-05-14 9:10 ` Ian Campbell
2014-06-02 14:05 ` Ian Jackson
2014-05-14 9:10 ` [PATCH 2/2] tools: Use SeaBIOS's defconfig Ian Campbell
2014-05-30 8:57 ` [PATCH 0/2] tools: update to SeaBIOS 1.7.4 Don Slutz
2 siblings, 1 reply; 10+ messages in thread
From: Ian Campbell @ 2014-05-14 9:10 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Ian Campbell, roger.pau
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
Config.mk | 6 +++---
tools/firmware/seabios-config | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Config.mk b/Config.mk
index 6a93533..5e03e87 100644
--- a/Config.mk
+++ b/Config.mk
@@ -235,9 +235,9 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
endif
OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
QEMU_UPSTREAM_REVISION ?= master
-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.
+SEABIOS_UPSTREAM_TAG ?= rel-1.7.4
+# Sun Dec 22 10:42:26 2013 -0500
+# coreboot: Make sure to print the SeaBIOS version in cbmem debug output.
ETHERBOOT_NICS ?= rtl8139 8086100e
diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config
index a497162..f42d497 100644
--- a/tools/firmware/seabios-config
+++ b/tools/firmware/seabios-config
@@ -1,7 +1,6 @@
#
-# Automatically generated make config: don't edit
+# Automatically generated file; DO NOT EDIT.
# SeaBIOS Configuration
-# Mon Sep 23 12:59:01 2013
#
#
@@ -19,6 +18,8 @@ CONFIG_BOOTMENU=y
# CONFIG_BOOTSPLASH is not set
CONFIG_BOOTORDER=y
CONFIG_ENTRY_EXTRASTACK=y
+CONFIG_MALLOC_UPPERMEMORY=y
+CONFIG_ROM_SIZE=0
#
# Hardware support
@@ -29,6 +30,7 @@ CONFIG_ATA_PIO32=y
CONFIG_AHCI=y
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_SCSI=y
+CONFIG_PVSCSI=y
CONFIG_ESP_SCSI=y
CONFIG_LSI_SCSI=y
CONFIG_MEGASAS=y
@@ -38,6 +40,7 @@ CONFIG_USB=y
CONFIG_USB_UHCI=y
CONFIG_USB_OHCI=y
CONFIG_USB_EHCI=y
+CONFIG_USB_XHCI=y
CONFIG_USB_MSC=y
CONFIG_USB_UAS=y
CONFIG_USB_HUB=y
@@ -68,6 +71,7 @@ CONFIG_MOUSE=y
CONFIG_S3_RESUME=y
CONFIG_VGAHOOKS=y
# CONFIG_DISABLE_A20 is not set
+# CONFIG_WRITABLE_UPPERMEMORY is not set
#
# BIOS Tables
@@ -77,6 +81,7 @@ CONFIG_MPTABLE=y
CONFIG_SMBIOS=y
CONFIG_ACPI=y
CONFIG_ACPI_DSDT=y
+CONFIG_FW_ROMFILE_LOAD=y
#
# VGA ROM
@@ -88,6 +93,7 @@ CONFIG_NO_VGABIOS=y
# CONFIG_VGA_GEODEGX2 is not set
# CONFIG_VGA_GEODELX is not set
# CONFIG_BUILD_VGABIOS is not set
+CONFIG_VGA_EXTRA_STACK_SIZE=512
#
# Debugging
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] tools: Use SeaBIOS's defconfig
2014-05-14 9:09 [PATCH 0/2] tools: update to SeaBIOS 1.7.4 Ian Campbell
2014-05-14 9:10 ` [PATCH 1/2] tools: update to seabios rel-1.7.4 Ian Campbell
@ 2014-05-14 9:10 ` Ian Campbell
2014-05-30 8:59 ` Don Slutz
2014-06-02 14:07 ` Ian Jackson
2014-05-30 8:57 ` [PATCH 0/2] tools: update to SeaBIOS 1.7.4 Don Slutz
2 siblings, 2 replies; 10+ messages in thread
From: Ian Campbell @ 2014-05-14 9:10 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Ian Campbell, roger.pau
Compared with our local config this enables CONFIG_BOOTSPLASH and disables
CONFIG_ATA_DMA and CONFIG_ATA_PIO32.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
tools/firmware/Makefile | 2 +-
tools/firmware/seabios-config | 103 -----------------------------------------
2 files changed, 1 insertion(+), 104 deletions(-)
delete mode 100644 tools/firmware/seabios-config
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index dcb56e5..9d1fdec 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -23,7 +23,7 @@ ovmf-dir:
seabios-dir:
GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
- cp seabios-config seabios-dir/.config;
+ $(MAKE) -C seabios-dir defconfig
.PHONY: all
all: $(SUBDIRS-y)
diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config
deleted file mode 100644
index f42d497..0000000
--- a/tools/firmware/seabios-config
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# SeaBIOS Configuration
-#
-
-#
-# 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
-CONFIG_RELOCATE_INIT=y
-CONFIG_BOOTMENU=y
-# CONFIG_BOOTSPLASH is not set
-CONFIG_BOOTORDER=y
-CONFIG_ENTRY_EXTRASTACK=y
-CONFIG_MALLOC_UPPERMEMORY=y
-CONFIG_ROM_SIZE=0
-
-#
-# Hardware support
-#
-CONFIG_ATA=y
-CONFIG_ATA_DMA=y
-CONFIG_ATA_PIO32=y
-CONFIG_AHCI=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_SCSI=y
-CONFIG_PVSCSI=y
-CONFIG_ESP_SCSI=y
-CONFIG_LSI_SCSI=y
-CONFIG_MEGASAS=y
-CONFIG_FLOPPY=y
-CONFIG_PS2PORT=y
-CONFIG_USB=y
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_MSC=y
-CONFIG_USB_UAS=y
-CONFIG_USB_HUB=y
-CONFIG_USB_KEYBOARD=y
-CONFIG_USB_MOUSE=y
-CONFIG_SERIAL=y
-CONFIG_LPT=y
-CONFIG_USE_SMM=y
-CONFIG_MTRR_INIT=y
-CONFIG_PMTIMER=y
-
-#
-# BIOS interfaces
-#
-CONFIG_DRIVES=y
-CONFIG_CDROM_BOOT=y
-CONFIG_CDROM_EMU=y
-CONFIG_PCIBIOS=y
-CONFIG_APMBIOS=y
-CONFIG_PNPBIOS=y
-CONFIG_OPTIONROMS=y
-# CONFIG_OPTIONROMS_DEPLOYED is not set
-CONFIG_PMM=y
-CONFIG_BOOT=y
-CONFIG_KEYBOARD=y
-CONFIG_KBD_CALL_INT15_4F=y
-CONFIG_MOUSE=y
-CONFIG_S3_RESUME=y
-CONFIG_VGAHOOKS=y
-# CONFIG_DISABLE_A20 is not set
-# CONFIG_WRITABLE_UPPERMEMORY is not set
-
-#
-# BIOS Tables
-#
-CONFIG_PIRTABLE=y
-CONFIG_MPTABLE=y
-CONFIG_SMBIOS=y
-CONFIG_ACPI=y
-CONFIG_ACPI_DSDT=y
-CONFIG_FW_ROMFILE_LOAD=y
-
-#
-# VGA ROM
-#
-CONFIG_NO_VGABIOS=y
-# CONFIG_VGA_STANDARD_VGA is not set
-# CONFIG_VGA_CIRRUS is not set
-# CONFIG_VGA_BOCHS is not set
-# CONFIG_VGA_GEODEGX2 is not set
-# CONFIG_VGA_GEODELX is not set
-# CONFIG_BUILD_VGABIOS is not set
-CONFIG_VGA_EXTRA_STACK_SIZE=512
-
-#
-# Debugging
-#
-CONFIG_DEBUG_LEVEL=1
-# CONFIG_DEBUG_SERIAL is not set
-CONFIG_DEBUG_IO=y
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] tools: Use SeaBIOS's defconfig
2014-05-14 9:10 ` [PATCH 2/2] tools: Use SeaBIOS's defconfig Ian Campbell
@ 2014-05-30 8:59 ` Don Slutz
2014-06-02 14:07 ` Ian Jackson
1 sibling, 0 replies; 10+ messages in thread
From: Don Slutz @ 2014-05-30 8:59 UTC (permalink / raw)
To: Ian Campbell, xen-devel, ian.jackson; +Cc: roger.pau
Looks good to me.
Reviewed-by <dslutz@verizon.com>
On 5/14/2014 5:10 AM, Ian Campbell wrote:
> Compared with our local config this enables CONFIG_BOOTSPLASH and disables
> CONFIG_ATA_DMA and CONFIG_ATA_PIO32.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
> tools/firmware/Makefile | 2 +-
> tools/firmware/seabios-config | 103 -----------------------------------------
> 2 files changed, 1 insertion(+), 104 deletions(-)
> delete mode 100644 tools/firmware/seabios-config
>
> diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
> index dcb56e5..9d1fdec 100644
> --- a/tools/firmware/Makefile
> +++ b/tools/firmware/Makefile
> @@ -23,7 +23,7 @@ ovmf-dir:
>
> seabios-dir:
> GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
> - cp seabios-config seabios-dir/.config;
> + $(MAKE) -C seabios-dir defconfig
>
> .PHONY: all
> all: $(SUBDIRS-y)
> diff --git a/tools/firmware/seabios-config b/tools/firmware/seabios-config
> deleted file mode 100644
> index f42d497..0000000
> --- a/tools/firmware/seabios-config
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -#
> -# Automatically generated file; DO NOT EDIT.
> -# SeaBIOS Configuration
> -#
> -
> -#
> -# 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
> -CONFIG_RELOCATE_INIT=y
> -CONFIG_BOOTMENU=y
> -# CONFIG_BOOTSPLASH is not set
> -CONFIG_BOOTORDER=y
> -CONFIG_ENTRY_EXTRASTACK=y
> -CONFIG_MALLOC_UPPERMEMORY=y
> -CONFIG_ROM_SIZE=0
> -
> -#
> -# Hardware support
> -#
> -CONFIG_ATA=y
> -CONFIG_ATA_DMA=y
> -CONFIG_ATA_PIO32=y
> -CONFIG_AHCI=y
> -CONFIG_VIRTIO_BLK=y
> -CONFIG_VIRTIO_SCSI=y
> -CONFIG_PVSCSI=y
> -CONFIG_ESP_SCSI=y
> -CONFIG_LSI_SCSI=y
> -CONFIG_MEGASAS=y
> -CONFIG_FLOPPY=y
> -CONFIG_PS2PORT=y
> -CONFIG_USB=y
> -CONFIG_USB_UHCI=y
> -CONFIG_USB_OHCI=y
> -CONFIG_USB_EHCI=y
> -CONFIG_USB_XHCI=y
> -CONFIG_USB_MSC=y
> -CONFIG_USB_UAS=y
> -CONFIG_USB_HUB=y
> -CONFIG_USB_KEYBOARD=y
> -CONFIG_USB_MOUSE=y
> -CONFIG_SERIAL=y
> -CONFIG_LPT=y
> -CONFIG_USE_SMM=y
> -CONFIG_MTRR_INIT=y
> -CONFIG_PMTIMER=y
> -
> -#
> -# BIOS interfaces
> -#
> -CONFIG_DRIVES=y
> -CONFIG_CDROM_BOOT=y
> -CONFIG_CDROM_EMU=y
> -CONFIG_PCIBIOS=y
> -CONFIG_APMBIOS=y
> -CONFIG_PNPBIOS=y
> -CONFIG_OPTIONROMS=y
> -# CONFIG_OPTIONROMS_DEPLOYED is not set
> -CONFIG_PMM=y
> -CONFIG_BOOT=y
> -CONFIG_KEYBOARD=y
> -CONFIG_KBD_CALL_INT15_4F=y
> -CONFIG_MOUSE=y
> -CONFIG_S3_RESUME=y
> -CONFIG_VGAHOOKS=y
> -# CONFIG_DISABLE_A20 is not set
> -# CONFIG_WRITABLE_UPPERMEMORY is not set
> -
> -#
> -# BIOS Tables
> -#
> -CONFIG_PIRTABLE=y
> -CONFIG_MPTABLE=y
> -CONFIG_SMBIOS=y
> -CONFIG_ACPI=y
> -CONFIG_ACPI_DSDT=y
> -CONFIG_FW_ROMFILE_LOAD=y
> -
> -#
> -# VGA ROM
> -#
> -CONFIG_NO_VGABIOS=y
> -# CONFIG_VGA_STANDARD_VGA is not set
> -# CONFIG_VGA_CIRRUS is not set
> -# CONFIG_VGA_BOCHS is not set
> -# CONFIG_VGA_GEODEGX2 is not set
> -# CONFIG_VGA_GEODELX is not set
> -# CONFIG_BUILD_VGABIOS is not set
> -CONFIG_VGA_EXTRA_STACK_SIZE=512
> -
> -#
> -# Debugging
> -#
> -CONFIG_DEBUG_LEVEL=1
> -# CONFIG_DEBUG_SERIAL is not set
> -CONFIG_DEBUG_IO=y
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] tools: Use SeaBIOS's defconfig
2014-05-14 9:10 ` [PATCH 2/2] tools: Use SeaBIOS's defconfig Ian Campbell
2014-05-30 8:59 ` Don Slutz
@ 2014-06-02 14:07 ` Ian Jackson
1 sibling, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2014-06-02 14:07 UTC (permalink / raw)
To: Ian Campbell; +Cc: roger.pau, xen-devel
Ian Campbell writes ("[PATCH 2/2] tools: Use SeaBIOS's defconfig"):
> Compared with our local config this enables CONFIG_BOOTSPLASH and disables
> CONFIG_ATA_DMA and CONFIG_ATA_PIO32.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] tools: update to SeaBIOS 1.7.4
2014-05-14 9:09 [PATCH 0/2] tools: update to SeaBIOS 1.7.4 Ian Campbell
2014-05-14 9:10 ` [PATCH 1/2] tools: update to seabios rel-1.7.4 Ian Campbell
2014-05-14 9:10 ` [PATCH 2/2] tools: Use SeaBIOS's defconfig Ian Campbell
@ 2014-05-30 8:57 ` Don Slutz
2014-05-30 9:12 ` Ian Campbell
2 siblings, 1 reply; 10+ messages in thread
From: Don Slutz @ 2014-05-30 8:57 UTC (permalink / raw)
To: Ian Campbell, xen-devel, Ian Jackson; +Cc: Roger Pau Monne
Since 1.7.5 has been relased, I thing this should be changed to that
version.
-Don Slutz
Subject: [SeaBIOS] [ANNOUNCE] SeaBIOS 1.7.5
Date: Wed, 28 May 2014 09:06:12 -0400
From: Kevin O'Connor <kevin@koconnor.net>
To: <seabios@seabios.org>, <qemu-devel@nongnu.org>,
<coreboot@coreboot.org>
The 1.7.5 version of SeaBIOS has now been released. For more
information on the release, please see:
On 5/14/2014 5:09 AM, Ian Campbell wrote:
> First patch does the update in the obvious way, while the second makes
> future updates easier by simply using the upstream defconfig.
>
> This boots a Debian HVM guest for me, via PXE or local Grub.
>
> Ian.
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/2] tools: update to SeaBIOS 1.7.4
2014-05-30 8:57 ` [PATCH 0/2] tools: update to SeaBIOS 1.7.4 Don Slutz
@ 2014-05-30 9:12 ` Ian Campbell
2014-05-30 10:01 ` Fabio Fantoni
0 siblings, 1 reply; 10+ messages in thread
From: Ian Campbell @ 2014-05-30 9:12 UTC (permalink / raw)
To: Don Slutz; +Cc: Roger Pau Monne, Ian Jackson, xen-devel
On Fri, 2014-05-30 at 04:57 -0400, Don Slutz wrote:
> Since 1.7.5 has been relased, I thing this should be changed to that
> version.
I think what I'd like to do is get this series in ASAP and then let the
seabios branch test 1.7.5 and then import it when it passes (which it
should do with the application of patch #2 here)...
Ian.
> -Don Slutz
>
> Subject: [SeaBIOS] [ANNOUNCE] SeaBIOS 1.7.5
> Date: Wed, 28 May 2014 09:06:12 -0400
> From: Kevin O'Connor <kevin@koconnor.net>
> To: <seabios@seabios.org>, <qemu-devel@nongnu.org>,
> <coreboot@coreboot.org>
>
>
> The 1.7.5 version of SeaBIOS has now been released. For more
> information on the release, please see:
>
> On 5/14/2014 5:09 AM, Ian Campbell wrote:
> > First patch does the update in the obvious way, while the second makes
> > future updates easier by simply using the upstream defconfig.
> >
> > This boots a Debian HVM guest for me, via PXE or local Grub.
> >
> > Ian.
> >
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xen.org
> > http://lists.xen.org/xen-devel
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/2] tools: update to SeaBIOS 1.7.4
2014-05-30 9:12 ` Ian Campbell
@ 2014-05-30 10:01 ` Fabio Fantoni
0 siblings, 0 replies; 10+ messages in thread
From: Fabio Fantoni @ 2014-05-30 10:01 UTC (permalink / raw)
To: Ian Campbell, Don Slutz; +Cc: xen-devel, Ian Jackson, Roger Pau Monne
Il 30/05/2014 11:12, Ian Campbell ha scritto:
> On Fri, 2014-05-30 at 04:57 -0400, Don Slutz wrote:
>> Since 1.7.5 has been relased, I thing this should be changed to that
>> version.
> I think what I'd like to do is get this series in ASAP and then let the
> seabios branch test 1.7.5 and then import it when it passes (which it
> should do with the application of patch #2 here)...
>
> Ian.
Yesterday I did a quick test of this patch serie and I haven't
encountered problems.
Tested-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
>
>> -Don Slutz
>>
>> Subject: [SeaBIOS] [ANNOUNCE] SeaBIOS 1.7.5
>> Date: Wed, 28 May 2014 09:06:12 -0400
>> From: Kevin O'Connor <kevin@koconnor.net>
>> To: <seabios@seabios.org>, <qemu-devel@nongnu.org>,
>> <coreboot@coreboot.org>
>>
>>
>> The 1.7.5 version of SeaBIOS has now been released. For more
>> information on the release, please see:
>>
>> On 5/14/2014 5:09 AM, Ian Campbell wrote:
>>> First patch does the update in the obvious way, while the second makes
>>> future updates easier by simply using the upstream defconfig.
>>>
>>> This boots a Debian HVM guest for me, via PXE or local Grub.
>>>
>>> Ian.
>>>
>>>
>>> _______________________________________________
>>> Xen-devel mailing list
>>> Xen-devel@lists.xen.org
>>> http://lists.xen.org/xen-devel
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread