@@ -91,23 +91,23 @@ roms.inc: $(ROMS)
ifneq ($(ROMBIOS_ROM),)
echo "#ifdef ROM_INCLUDE_ROMBIOS" >> $@.new
- sh ./mkhex rombios $(ROMBIOS_ROM) >> $@.new
+ sh ../../misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new
echo "#endif" >> $@.new
endif
ifneq ($(STDVGA_ROM),)
echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new
- sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new
+ sh ../../misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new
echo "#endif" >> $@.new
endif
ifneq ($(CIRRUSVGA_ROM),)
echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new
- sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new
+ sh ../../misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new
echo "#endif" >> $@.new
endif
ifneq ($(ETHERBOOT_ROMS),)
echo "#ifdef ROM_INCLUDE_ETHERBOOT" >> $@.new
- sh ./mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new
+ sh ../../misc/mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new
echo "#endif" >> $@.new
endif
similarity index 100%
rename from tools/firmware/hvmloader/mkhex
rename to tools/misc/mkhex
It makes more sense to put a tool to be used by other subsystems to be in 'tools/misc' along 'mkrpm','mkdeb', etc. The patch titled "xen/livepatch/x86/arm32: Force .livepatch.depends section to be uint32_t aligned" uses mkhex. Suggested-by: Julien Grall <julien.grall@arm.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- CC: Ian Jackson <ian.jackson@eu.citrix.com> CC: Wei Liu <wei.liu2@citrix.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Julien Grall <julien.grall@arm.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> v4: First posting. --- tools/firmware/hvmloader/Makefile | 8 ++++---- tools/{firmware/hvmloader => misc}/mkhex | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename tools/{firmware/hvmloader => misc}/mkhex (100%)