qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: Michael Tokarev <mjt@tls.msk.ru>
Subject: Re: [PATCH] qboot: update to latest upstream
Date: Fri, 20 Nov 2020 16:51:14 +0100	[thread overview]
Message-ID: <27102428-0218-c518-2f3f-86365d05b4eb@redhat.com> (raw)
In-Reply-To: <20201120152408.164346-1-pbonzini@redhat.com>

On 11/20/20 4:24 PM, Paolo Bonzini wrote:
> This also brings in two patches that Debian had to include,
> qboot_stop_using_inttypes.patch and qboot_no_jump_tables.diff.
> 
> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  pc-bios/qboot.rom | Bin 65536 -> 65536 bytes
>  roms/Makefile     |   8 ++++++--
>  roms/qboot        |   2 +-
>  3 files changed, 7 insertions(+), 3 deletions(-)
...
> diff --git a/roms/Makefile b/roms/Makefile
> index 7045e374d3..5ffe3317ac 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -186,9 +186,13 @@ opensbi64-generic:
>  	cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
>  	cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
>  
> +MESON = meson
> +NINJA = ninja
>  qboot:
> -	$(MAKE) -C qboot
> -	cp qboot/bios.bin ../pc-bios/qboot.rom
> +	mkdir -p qboot/build
> +	$(MESON) setup $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build
> +	$(NINJA) -C qboot/build
> +	cp qboot/build/bios.bin ../pc-bios/qboot.rom
>  
>  npcm7xx_bootrom:
>  	$(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix)
> diff --git a/roms/qboot b/roms/qboot
> index cb1c49e0cf..a5300c4949 160000
> --- a/roms/qboot
> +++ b/roms/qboot
> @@ -1 +1 @@
> -Subproject commit cb1c49e0cfac99b9961d136ac0194da62c28cf64
> +Subproject commit a5300c4949b8d4de2d34bedfaed66793f48ec948
> 

Maybe include shortlog in description?

$ git shortlog cb1c49e..a5300c4
Lorenz Brun (1):
      Fix initrd base address for PVH boot

Marc-Andre Lureau (1):
      Update README

Marc-André Lureau (1):
      Add meson build

Paolo Bonzini (2):
      limit C headers to freestanding ones
      record minimum version of meson that is needed

Sven Eckelmann (1):
      qboot: Disable PIE for ELF binary build step

kaihuan.pkh (1):
      support smbios



      reply	other threads:[~2020-11-20 15:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-20 15:24 [PATCH] qboot: update to latest upstream Paolo Bonzini
2020-11-20 15:51 ` Philippe Mathieu-Daudé [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=27102428-0218-c518-2f3f-86365d05b4eb@redhat.com \
    --to=philmd@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).