Skip to contentSkip to conversation

roms: Add 'clean' make rule and EDK2 documentation fix

PATCH Applied Philippe Mathieu-Daudé 3 participants 7 messages May 6, 2019 – May 22, 2019

lore
Share & tools
lore
#0 lore raw

v3 cover roms: Add 'clean' make rule and EDK2 documentation fix

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(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/2 roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description

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.

---
v3: Squeezed 2 spaces (Laszlo)

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +2 -2
index 0ce84a45ad5..ea6aec56abd 100644
@@ -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:
Signature · 1 line
2.20.1
#2 lore raw

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

Quoted 21 lines · 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.

---
v3: Squeezed 2 spaces (Laszlo)

---
  roms/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +0 -0
index 0ce84a45ad5..ea6aec56abd 100644

roms/Makefile build-efi-roms: build-pxe-roms · line 128

Quoted 10 lines
roms/Makefile +2 -2
@@ -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

#3 lore raw

PATCH v3 2/2 roms: List and describe the Makefile 'clean' rule

In reply to Philippe Mathieu-Daudé
---
 roms/Makefile | 2 ++
 1 file changed, 2 insertions(+)
roms/Makefile +2 -0
index ea6aec56abd..078d3fb7056 100644
@@ -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
Signature · 1 line
2.20.1
#4 lore raw

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

Quoted 12 lines · Philippe Mathieu-Daudé
---
  roms/Makefile | 2 ++
  1 file changed, 2 insertions(+)
roms/Makefile +0 -0
index ea6aec56abd..078d3fb7056 100644

roms/Makefile default: · line 69

Quoted 8 lines
roms/Makefile +2 -0
@@ -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

#5 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 3 lines · Philippe Mathieu-Daudé

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

Quoted 20 lines

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(-)
#6 lore raw
Quoted 11 lines · Laszlo Ersek
Quoted 3 lines · Philippe Mathieu-Daudé

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 [email protected], 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 [email protected] again, hoping they can queue this, since there is no rush.

Thanks!

Phil.