| Message ID | 20220721132647.552298-2-nrb@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: dump support for PV tests | expand |
On Thu, 21 Jul 2022 15:26:46 +0200 Nico Boehr <nrb@linux.ibm.com> wrote: > Upcoming changes will add more arguments to genprotimg. To avoid > duplicating this logic, move the arguments to genprotimg to a variable. > > Signed-off-by: Nico Boehr <nrb@linux.ibm.com> Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > --- > s390x/Makefile | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/s390x/Makefile b/s390x/Makefile > index efd5e0c13102..34de233d09b8 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -165,11 +165,12 @@ $(SNIPPET_DIR)/c/%.hdr: $(SNIPPET_DIR)/c/%.gbin $(HOST_KEY_DOCUMENT) > %.bin: %.elf > $(OBJCOPY) -O binary $< $@ > > +genprotimg_args = --host-key-document $(HOST_KEY_DOCUMENT) --no-verify > %selftest.pv.bin: %selftest.bin $(HOST_KEY_DOCUMENT) $(patsubst %.pv.bin,%.parmfile,$@) > - $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --no-verify --image $< -o $@ > + $(GENPROTIMG) $(genprotimg_args) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --image $< -o $@ > > %.pv.bin: %.bin $(HOST_KEY_DOCUMENT) > - $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify --image $< -o $@ > + $(GENPROTIMG) $(genprotimg_args) --image $< -o $@ > > $(snippet_asmlib): $$(patsubst %.o,%.S,$$@) $(asm-offsets) > $(CC) $(CFLAGS) -c -nostdlib -o $@ $<
diff --git a/s390x/Makefile b/s390x/Makefile index efd5e0c13102..34de233d09b8 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -165,11 +165,12 @@ $(SNIPPET_DIR)/c/%.hdr: $(SNIPPET_DIR)/c/%.gbin $(HOST_KEY_DOCUMENT) %.bin: %.elf $(OBJCOPY) -O binary $< $@ +genprotimg_args = --host-key-document $(HOST_KEY_DOCUMENT) --no-verify %selftest.pv.bin: %selftest.bin $(HOST_KEY_DOCUMENT) $(patsubst %.pv.bin,%.parmfile,$@) - $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --no-verify --image $< -o $@ + $(GENPROTIMG) $(genprotimg_args) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --image $< -o $@ %.pv.bin: %.bin $(HOST_KEY_DOCUMENT) - $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify --image $< -o $@ + $(GENPROTIMG) $(genprotimg_args) --image $< -o $@ $(snippet_asmlib): $$(patsubst %.o,%.S,$$@) $(asm-offsets) $(CC) $(CFLAGS) -c -nostdlib -o $@ $<
Upcoming changes will add more arguments to genprotimg. To avoid duplicating this logic, move the arguments to genprotimg to a variable. Signed-off-by: Nico Boehr <nrb@linux.ibm.com> --- s390x/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)