Message ID | 20190410053629.28829-1-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | roms: List and describe the Makefile 'clean' rule | expand |
On 04/10/19 07:36, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > roms/Makefile | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/roms/Makefile b/roms/Makefile > index 1ff78b63bb3..f55c4a2d3bb 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -61,6 +61,8 @@ default: > @echo " skiboot -- update skiboot.lid" > @echo " u-boot.e500 -- update u-boot.e500" > @echo " u-boot.sam460 -- update u-boot.sam460" > + @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 This hunk makes sense in general, but it will conflict with my [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates Please let's delay this hunk until after my pull... > @@ -102,7 +104,7 @@ pxe-rom-%: build-pxe-roms > > efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) > > -efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) > +efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools > $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ > -b ipxe/src/bin/$(VID)$(DID).rom \ > -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ This hunk doesn't belong in this patch at all -- it's from my patch [Qemu-devel] [PATCH for-4.1 v4 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools" (The hunk also conflicts with the purpose stated in $SUBJECT.) > @@ -131,7 +133,7 @@ build-efi-roms: build-pxe-roms > # EDK2_BASETOOLS_LDFLAGS='...' \ > # efirom > # > -$(EDK2_EFIROM): > +edk2-basetools: > $(MAKE) -C edk2/BaseTools \ > EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ > EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' Ditto. > @@ -156,6 +158,9 @@ skiboot: > $(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix) > cp skiboot/skiboot.lid ../pc-bios/skiboot.lid > > +efi: edk2-basetools > + $(MAKE) -f Makefile.edk2 > + > clean: > rm -rf seabios/.config seabios/out seabios/builds > $(MAKE) -C sgabios clean And this seems to belong to: [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates > @@ -166,3 +171,4 @@ clean: > rm -rf u-boot/build.e500 > $(MAKE) -C u-boot-sam460ex distclean > $(MAKE) -C skiboot clean > + $(MAKE) -f Makefile.edk2 clean > Ditto. So, for qemu-trivial's sake: Nacked-by: Laszlo Ersek <lersek@redhat.com> Thanks Laszlo
diff --git a/roms/Makefile b/roms/Makefile index 1ff78b63bb3..f55c4a2d3bb 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -61,6 +61,8 @@ default: @echo " skiboot -- update skiboot.lid" @echo " u-boot.e500 -- update u-boot.e500" @echo " u-boot.sam460 -- update u-boot.sam460" + @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 @@ -102,7 +104,7 @@ pxe-rom-%: build-pxe-roms efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) -efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) +efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ -b ipxe/src/bin/$(VID)$(DID).rom \ -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ @@ -131,7 +133,7 @@ build-efi-roms: build-pxe-roms # EDK2_BASETOOLS_LDFLAGS='...' \ # efirom # -$(EDK2_EFIROM): +edk2-basetools: $(MAKE) -C edk2/BaseTools \ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' @@ -156,6 +158,9 @@ skiboot: $(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix) cp skiboot/skiboot.lid ../pc-bios/skiboot.lid +efi: edk2-basetools + $(MAKE) -f Makefile.edk2 + clean: rm -rf seabios/.config seabios/out seabios/builds $(MAKE) -C sgabios clean @@ -166,3 +171,4 @@ clean: rm -rf u-boot/build.e500 $(MAKE) -C u-boot-sam460ex distclean $(MAKE) -C skiboot clean + $(MAKE) -f Makefile.edk2 clean
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- roms/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)