Skip to contentSkip to conversation

Update seabios to 1.7.4

GIT PULL New Gerd Hoffmann 3 participants 15 messages Feb 3, 2014 – Feb 18, 2014

lore
Share & tools
lore
#0 lore raw

Hi,

Sorry for the delay folks, totally forgot that one. Here is the seabios update to 1.7.4 final.

please pull,
Gerd

The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:

Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)

are available in the git repository at:

git://git.kraxel.org/qemu tags/pull-roms-1

for you to fetch changes up to 41419b0f11d125ad792660638eb452c767eddc28:

Update seabios binaries to 1.7.4 (2014-02-03 15:40:01 +0100)

----------------------------------------------------------------
Update seabios to 1.7.4

----------------------------------------------------------------
Bruce Rogers (1):
roms: remove explicit MAKEFLAGS from recursive make invocations

Gerd Hoffmann (2):
Update seabios submodule to 1.7.4
Update seabios binaries to 1.7.4

 pc-bios/bios-256k.bin      | Bin 262144 -> 262144 bytes
 pc-bios/bios.bin           | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-cirrus.bin | Bin 36864 -> 36864 bytes
 pc-bios/vgabios-qxl.bin    | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-stdvga.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-vmware.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios.bin        | Bin 36864 -> 36864 bytes
 roms/Makefile              |  22 +++++++++++-----------
 roms/seabios               |   2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
#1 lore raw

PATCH 1/3 roms: remove explicit MAKEFLAGS from recursive make invocations

From: Bruce Rogers <[email protected]>

When using $(MAKE) within a makefile, we shouldn't be explicitly including $(MAKEFLAGS) on the command-line. It causes problems when that makefile is recursively invoked. When the roms/Makefile is invoked as in make -C roms bios a spurious 'w' appears on the sub-make invocation, due to the erroneous $(MAKEFLAGS) inclusion.

---
 roms/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
roms/Makefile +11 -11
index 1e04669..2721b02 100644
@@ -72,11 +72,11 @@ seavgabios-%: build-seabios-config-vga-%
 build-seabios-config-%: config.%
 	mkdir -p seabios/builds/$*
 	cp $< seabios/builds/$*/.config
-	$(MAKE) $(MAKEFLAGS) -C seabios \
+	$(MAKE) -C seabios \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
 		OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
-	$(MAKE) $(MAKEFLAGS) -C seabios \
+	$(MAKE) -C seabios \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
 		OUT=$(CURDIR)/seabios/builds/$*/ all
@@ -90,12 +90,12 @@ lgplvgabios-%: build-lgplvgabios
 	cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin
 
 build-lgplvgabios:
-	$(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets)
+	$(MAKE) -C vgabios $(vgabios_targets)
 
 
 .PHONY: sgabios
 sgabios:
-	$(MAKE) $(MAKEFLAGS) -C sgabios
+	$(MAKE) -C sgabios
 	cp sgabios/sgabios.bin ../pc-bios
 
 
@@ -114,12 +114,12 @@ efi-rom-%: build-pxe-roms build-efi-roms
 		-o ../pc-bios/efi-$*.rom
 
 build-pxe-roms: ipxe/src/config/local/general.h
-	$(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \
+	$(MAKE) -C ipxe/src GITVERSION="" \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		$(patsubst %,bin/%.rom,$(pxerom_targets))
 
 build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
-	$(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \
+	$(MAKE) -C ipxe/src GITVERSION="" \
 		CROSS_COMPILE=$(x86_64_cross_prefix) \
 		$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
 		$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
@@ -129,15 +129,15 @@ ipxe/src/config/local/%: config.ipxe.%
 
 
 slof:
-	$(MAKE) $(MAKEFLAGS) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
+	$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
 	cp SLOF/boot_rom.bin ../pc-bios/slof.bin
 
 
 clean:
 	rm -rf seabios/.config seabios/out seabios/builds
-	$(MAKE) $(MAKEFLAGS) -C vgabios clean
+	$(MAKE) -C vgabios clean
 	rm -f vgabios/VGABIOS-lgpl-latest*
-	$(MAKE) $(MAKEFLAGS) -C sgabios clean
+	$(MAKE) -C sgabios clean
 	rm -f sgabios/.depend
-	$(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean
-	$(MAKE) $(MAKEFLAGS) -C SLOF clean
+	$(MAKE) -C ipxe/src veryclean
+	$(MAKE) -C SLOF clean
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/3 Update seabios submodule to 1.7.4

In reply to Gerd Hoffmann

Not that many changes as we already have a git snapshot pretty close to final 1.7.4 in the tree. Most notably change is the vgabios change which fixes the windows guest regression.

Full git shortlog:

Gerd Hoffmann (2):
run qemu_cfg_e820 only for CONFIG_QEMU=y
change boot order load log level

Kevin O'Connor (10):
Minor - move sgdt/lgdt macros from stacks.c to x86.h. Separate out sec32init sections even when not doing code relocation.
floppy: Fix incorrect LBA to CHS translation.
floppy: Fix accesses to DOR register.
vgabios: Avoid memory references via %esp register in vgabios. Small improvements to irqentry_extrastack assembler.
floppy: Encode command and flags into single value in floppy pio code. On disk format request, verify cylinders and pass to driver.
floppy: Implement cylinder seeking when accessing a different cylinder.
coreboot: Make sure to print the SeaBIOS version in cbmem debug output.

Kyösti Mälkki (1):
Fix CBMEM console overflow

---
 roms/seabios | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
roms/seabios +1 -1
index 31b8b4e..96917a8 160000
@@ -1 +1 @@
-Subproject commit 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26d
+Subproject commit 96917a8ed761f017fc8c72ba3b9181fbac03ac59
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 3/3 Update seabios binaries to 1.7.4

In reply to Gerd Hoffmann
---
 pc-bios/bios-256k.bin      | Bin 262144 -> 262144 bytes
 pc-bios/bios.bin           | Bin 131072 -> 131072 bytes
 pc-bios/vgabios-cirrus.bin | Bin 36864 -> 36864 bytes
 pc-bios/vgabios-qxl.bin    | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-stdvga.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios-vmware.bin | Bin 37376 -> 37376 bytes
 pc-bios/vgabios.bin        | Bin 36864 -> 36864 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)
pc-bios/bios-256k.bin +0 -0

[ ... huge binary patches snipped ... ]

#4 lore raw
In reply to Gerd Hoffmann
Quoted 4 lines · Gerd Hoffmann

Hi,

Sorry for the delay folks, totally forgot that one. Here is the seabios update to 1.7.4 final.

FWIW, we updated seabios in Debian testing (with qemu 1.7), and now there are several bugs filed in Debian BTS, at least:

http://bugs.debian.org/737142
http://bugs.debian.org/736902

(this last one is a bit messy, all branches/combinations produce different results, and it isn't exactly stable).

I had not much time to dig into this.

Thanks,

/mjt

#5 lore raw
Quoted 6 lines · Michael Tokarev
Quoted 4 lines · Gerd Hoffmann

Hi,

Sorry for the delay folks, totally forgot that one. Here is the seabios update to 1.7.4 final.

Quoted 8 lines

FWIW, we updated seabios in Debian testing (with qemu 1.7), and now there are several bugs filed in Debian BTS, at least:

http://bugs.debian.org/737142
http://bugs.debian.org/736902

(this last one is a bit messy, all branches/combinations produce different results, and it isn't exactly stable).

Dunno what 737142 is. 736902 looks like something with ram detection.

Would be interesting to know whenever the blobs from this pull request are failing too. If so a seabios log would be helpful.

cheers,
Gerd

#6 lore raw
Quoted 11 lines · Gerd Hoffmann
Quoted 5 lines · Michael Tokarev

FWIW, we updated seabios in Debian testing (with qemu 1.7), and now there are several bugs filed in Debian BTS, at least:

http://bugs.debian.org/737142
http://bugs.debian.org/736902

Dunno what 737142 is. 736902 looks like something with ram detection.

Would be interesting to know whenever the blobs from this pull request are failing too. If so a seabios log would be helpful.

It looks like this mess is entirely due to my brown-paper-bag error. I updated multiboot.S (which we have to carry in seabios source for debian, a long story) from a wrong qemu branch (but at the same time stating in the README that it is from the right commit). Hence it broke.

I'm now trying to verify 737142 (PC-BSD is unable to boot), but since it also uses multiboot, it is highly likely that it is the same issue.

I'm sorry for the noize.

Thanks,

/mjt

#7 lore raw
In reply to Gerd Hoffmann
Quoted 3 lines · Gerd Hoffmann

are available in the git repository at:

git://git.kraxel.org/qemu tags/pull-roms-1

Hmm. Did you forgot to push the tag?

Quoted 1 line

for you to fetch changes up to 41419b0f11d125ad792660638eb452c767eddc28:

or the commits?

Thanks,

/mjt

#8 lore raw
Quoted 6 lines · Michael Tokarev
Quoted 3 lines · Gerd Hoffmann

are available in the git repository at:

git://git.kraxel.org/qemu tags/pull-roms-1

Hmm. Did you forgot to push the tag?

It's there: http://www.kraxel.org/cgit/qemu/tag/?id=pull-roms-1

It is a signed tag not a branch though. "git fetch --tags" ?

cheers,
Gerd

#9 lore raw
Quoted 6 lines · Gerd Hoffmann
Quoted 1 line · Michael Tokarev

Hmm. Did you forgot to push the tag?

It's there: http://www.kraxel.org/cgit/qemu/tag/?id=pull-roms-1

It is a signed tag not a branch though. "git fetch --tags" ?

Interesting. I always used git remote update', and it usually fetches all tags too, and it fetched quite a few of your tags and branches, but not the tag in question. I had to explicitly run git fetch <remote> --tags' to get this one tag (together with the branch which leads to it). Wonder what's going on...

But ok.

Thanks,

/mjt

#10 lore raw
In reply to Gerd Hoffmann
Quoted 8 lines · Gerd Hoffmann

Hi,

Sorry for the delay folks, totally forgot that one. Here is the seabios update to 1.7.4 final.

please pull,
Gerd

Quoted 8 lines

The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:

Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)

are available in the git repository at:

git://git.kraxel.org/qemu tags/pull-roms-1

Applied, thanks.

-- PMM

#11 lore raw
Quoted 11 lines · Peter Maydell
Quoted 10 lines · Gerd Hoffmann

Hi,

Sorry for the delay folks, totally forgot that one. Here is the seabios update to 1.7.4 final.

please pull,
Gerd

The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:

Quoted 8 lines
Quoted 6 lines

Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)

are available in the git repository at:

git://git.kraxel.org/qemu tags/pull-roms-1

Applied, thanks.

It looks like this pull request updates our seabios module to a revision that isn't actually present in
git://git.qemu-project.org/seabios.git/. Gerd, do you have a fix for that or should I just revert this?

thanks
-- PMM

#12 lore raw
Quoted 17 lines · Peter Maydell
Quoted 16 lines · Peter Maydell
Quoted 15 lines · Gerd Hoffmann

Hi,

Sorry for the delay folks, totally forgot that one. Here is the seabios update to 1.7.4 final.

please pull,
Gerd

The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:

Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)

are available in the git repository at:

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

git://git.kraxel.org/qemu tags/pull-roms-1

Applied, thanks.

It looks like this pull request updates our seabios module to a revision that isn't actually present in
git://git.qemu-project.org/seabios.git/. Gerd, do you have a fix for that or should I just revert this?

The seabios mirroring doesn't seem to be automatic (or the automatic mirroring is broken). Usually Anthony updates the seabios.git tree manually.

Upstream git repo is git://git.seabios.org/seabios.git

If you have write access to the seabios repo you can just pull latest master from seabios.org and push it to qemu-project.org. If not bug anthony about it.

Or we can update the git submodule url to point the upstream repo directly. Not fully sure this is a good idea from the gpl point of view (we ship blobs, so we should ship the source for them too, even if all we provide is just a mirror of upstream ...).

cheers,
Gerd

#13 lore raw
Quoted 10 lines · Gerd Hoffmann
Quoted 4 lines · Peter Maydell

It looks like this pull request updates our seabios module to a revision that isn't actually present in
git://git.qemu-project.org/seabios.git/. Gerd, do you have a fix for that or should I just revert this?

The seabios mirroring doesn't seem to be automatic (or the automatic mirroring is broken). Usually Anthony updates the seabios.git tree manually.

Quoted 5 lines

Upstream git repo is git://git.seabios.org/seabios.git

If you have write access to the seabios repo you can just pull latest master from seabios.org and push it to qemu-project.org. If not bug anthony about it.

I do have write access, but I'm not completely confident what the right command line rune to do this is. (It looks like our mirror of seabios has all its branches and maybe also tags, so a simple 'push one branch' is probably wrong). Anthony?

Quoted 4 lines

Or we can update the git submodule url to point the upstream repo directly. Not fully sure this is a good idea from the gpl point of view (we ship blobs, so we should ship the source for them too, even if all we provide is just a mirror of upstream ...).

Yep, not pointing straight at the upstream repo is deliberate and for this reason AIUI.

thanks
-- PMM

#14 lore raw
Quoted 11 lines · Peter Maydell
Quoted 9 lines · Gerd Hoffmann

The seabios mirroring doesn't seem to be automatic (or the automatic mirroring is broken). Usually Anthony updates the seabios.git tree manually.

Upstream git repo is git://git.seabios.org/seabios.git

If you have write access to the seabios repo you can just pull latest master from seabios.org and push it to qemu-project.org. If not bug anthony about it.

Quoted 5 lines

I do have write access, but I'm not completely confident what the right command line rune to do this is. (It looks like our mirror of seabios has all its branches and maybe also tags, so a simple 'push one branch' is probably wrong). Anthony?

With some assistance from Stefan I found the correct runes to do this:
git clone --mirror git://git.seabios.org/seabios.git
cd seabios
git push --mirror [git+ssh url for mirror]

so I've updated our mirror.

thanks
-- PMM