Skip to contentSkip to conversation

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

PATCH Superseded Philippe Mathieu-Daudé 2 participants 6 messages May 4, 2019 – May 6, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

Hi,

Two trivial patches waiting Laszlo's series to land.

Since v1:
- rebased

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 v2 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.

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +2 -2
index 0ce84a45ad5..f020102c866 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
Reviewed-by on v2 1/2
#2 lore raw

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

Quoted 17 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.

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

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

Quoted 7 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

please 'tr -s " "' in the above.

With that:

Thanks
Laszlo

Quoted 4 lines
roms/Makefile +0 -0
 # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
 #
 # Example:
#3 lore raw

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

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

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +0 -0
index 0ce84a45ad5..f020102c866 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))
 
Quoted 6 lines

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

Quoted 4 lines
roms/Makefile +2 -2
-# 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

please 'tr -s " "' in the above.

Sharp eagle eye!

Quoted 4 lines

With that:

Thanks :)

Quoted 9 lines

Thanks
Laszlo

Quoted 4 lines
roms/Makefile +0 -0
 # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
 #
 # Example:
#4 lore raw

PATCH v2 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 f020102c866..1a6c2fa76f9 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
Reviewed-by on v2 2/2
#5 lore raw

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

Quoted 11 lines · Philippe Mathieu-Daudé
---
 roms/Makefile | 2 ++
 1 file changed, 2 insertions(+)
roms/Makefile +0 -0
index f020102c866..1a6c2fa76f9 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

Thanks!
Laszlo