[Qemu-devel] [PATCH v3 0/2] roms: Add 'clean' make rule and EDK2 documentation fix

[Qemu-devel] [PATCH v3 0/2] roms: Add 'clean' make rule and EDK2 documentation fix

[Philippe Mathieu-Daudé]

Hi,

Two trivial patches waiting Laszlo's series to land.

Since v2:
- removed duplicated space chars (Laszlo)
- added Laszlo's R-b tag

Since v1:
- rebased

v2:
https://lists.gnu.org/archive/html/qemu-devel/2019-05/msg00853.html
v1:
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg01589.html
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg01598.html

Philippe Mathieu-Daudé (2):
  roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description
  roms: List and describe the Makefile 'clean' rule

 roms/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.20.1

[Qemu-devel] [PATCH v3 1/2] roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description

[Philippe Mathieu-Daudé]

In commit 1cab464136b4 we incorrectly described the
EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS
options to the EDK2 build tools, but it only expands
the CFLAGS (not to the CPPFLAGS).
Update the description to be more accurate.

Reported-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v3: Squeezed 2 spaces (Laszlo)
---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roms/Makefile b/roms/Makefile
index 0ce84a45ad5..ea6aec56abd 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -121,8 +121,8 @@ build-efi-roms: build-pxe-roms
 		$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
 		$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
 
-# Build scripts can pass compiler/linker flags to the EDK2 build tools
-# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and
+# Build scripts can pass compiler/linker flags to the EDK2
+# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and
 # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
 #
 # Example:
-- 
2.20.1

[Qemu-devel] [PATCH v3 2/2] roms: List and describe the Makefile 'clean' rule

[Philippe Mathieu-Daudé]

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 roms/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roms/Makefile b/roms/Makefile
index ea6aec56abd..078d3fb7056 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -62,6 +62,8 @@ default:
 	@echo "  u-boot.e500    -- update u-boot.e500"
 	@echo "  u-boot.sam460  -- update u-boot.sam460"
 	@echo "  efi            -- update UEFI (edk2) platform firmware"
+	@echo "  clean          -- delete the files generated by the previous" \
+	                          "build targets"
 
 bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
 	cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
-- 
2.20.1

Re: [Qemu-devel] [PATCH v3 0/2] roms: Add 'clean' make rule and EDK2 documentation fix

[Laszlo Ersek]

On 05/06/19 16:19, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> Two trivial patches waiting Laszlo's series to land.

... I think you can submit a pullreq with these two patches now --
because I believe that you refer to

  [Qemu-devel] [PULL 00/12] bundle edk2 platform firmware with QEMU

above, and that's been merged for a while now.

Thanks!
Laszlo

> Since v2:
> - removed duplicated space chars (Laszlo)
> - added Laszlo's R-b tag
> 
> Since v1:
> - rebased
> 
> v2:
> https://lists.gnu.org/archive/html/qemu-devel/2019-05/msg00853.html
> v1:
> https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg01589.html
> https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg01598.html
> 
> Philippe Mathieu-Daudé (2):
>   roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description
>   roms: List and describe the Makefile 'clean' rule
> 
>  roms/Makefile | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 

Re: [Qemu-devel] [PATCH v3 0/2] roms: Add 'clean' make rule and EDK2 documentation fix

[Philippe Mathieu-Daudé]

On 5/7/19 12:56 PM, Laszlo Ersek wrote:
> On 05/06/19 16:19, Philippe Mathieu-Daudé wrote:
>> Hi,
>>
>> Two trivial patches waiting Laszlo's series to land.
> 
> ... I think you can submit a pullreq with these two patches now --
> because I believe that you refer to
> 
>   [Qemu-devel] [PULL 00/12] bundle edk2 platform firmware with QEMU
> 
> above, and that's been merged for a while now.

Hmm I sent the previous series Cc'ing qemu-trivial@nongnu.org, but not
this one. That's odd (because I use git-publish which takes care of
keeping the same destinataries since the previous version), I probably
messed something.

I won't submit a PR that keeps Peter's test setup busy a while for 2
lines of documentation changes =)

Cc'ing qemu-trivial@nongnu.org again, hoping they can queue this, since
there is no rush.

Thanks!

Phil.

Re: [Qemu-devel] [PATCH v3 1/2] roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description

[Laurent Vivier]

On 06/05/2019 16:19, Philippe Mathieu-Daudé wrote:
> In commit 1cab464136b4 we incorrectly described the
> EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS
> options to the EDK2 build tools, but it only expands
> the CFLAGS (not to the CPPFLAGS).
> Update the description to be more accurate.
> 
> Reported-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v3: Squeezed 2 spaces (Laszlo)
> ---
>   roms/Makefile | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/roms/Makefile b/roms/Makefile
> index 0ce84a45ad5..ea6aec56abd 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -121,8 +121,8 @@ build-efi-roms: build-pxe-roms
>   		$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
>   		$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
>   
> -# Build scripts can pass compiler/linker flags to the EDK2 build tools
> -# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and
> +# Build scripts can pass compiler/linker flags to the EDK2
> +# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and
>   # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
>   #
>   # Example:
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Re: [Qemu-devel] [PATCH v3 2/2] roms: List and describe the Makefile 'clean' rule

[Laurent Vivier]

On 06/05/2019 16:19, Philippe Mathieu-Daudé wrote:
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   roms/Makefile | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/roms/Makefile b/roms/Makefile
> index ea6aec56abd..078d3fb7056 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -62,6 +62,8 @@ default:
>   	@echo "  u-boot.e500    -- update u-boot.e500"
>   	@echo "  u-boot.sam460  -- update u-boot.sam460"
>   	@echo "  efi            -- update UEFI (edk2) platform firmware"
> +	@echo "  clean          -- delete the files generated by the previous" \
> +	                          "build targets"
>   
>   bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
>   	cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
> 

Applied to my trivial-patches branch.

Thanks,
Laurent