[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [XEN PATCH v3 04/25] tools/firmware/hvmloader: rework Makefile
- To: Anthony PERARD <anthony.perard@xxxxxxxxxx>
- From: Luca Fancellu <Luca.Fancellu@xxxxxxx>
- Date: Fri, 8 Jul 2022 15:39:00 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com])
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oG4PfVFd5kpukvJPYaICv9heKExCAk04Gug1qemmM24=; b=AJFEzSfowf5NCRiZpmdood4zii22h8F3Wm/iHMvxebRKgqUIL/V6KY4ds/vWyvH3QJ/Psrvrbo51sS6y0hiujWD7gda7i+RWjSUzi/eaJvvncjCvrxEn7C0OUdIf3MlnFDxGoOezIVsbnL6oMdhYX1de3jh6oIR5KypXouOHy3fIr621fRIp3PuMUGCyuMq4GdeIWxdQwe4mOeD9gw9OlG5FiCAY3Ii8iryLrY62sReWwhoP6F8FyG5gCvfaZrhGSKBqAl/ez7Hjab8Y+lHLm+sJ36nfJfXPghJ0w1mWFmGOvh414Dzv+Q2ylkcCcRGy0VVe0uK8XKIv7BDmh4cX+A==
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oG4PfVFd5kpukvJPYaICv9heKExCAk04Gug1qemmM24=; b=i4tUtiQtcwTS1wiYe0F3NGjmixN79R6kzevb8M2Iqevi7+dZqln4CizMuXb2+5Et+F+LLEx6NziR0M0R8lRfzO0ODv+MTAnc83JA1Z+XoU3r26G0PxX3oxHD+mE0s4rsb2qmur1+HXIP92Wy0CgJw6GegZAb/BwgR7WzEapBSKdTKvJlJBvLjPWt8eoqDy5xK+ZByPH9fnO04AXFXbXeT3kwuQWH//DlLvqea+oPv5X98aiF97ScmRprTJUdPvGfWR5Kd8z/bGjK85QY17DWYF3wLkj+Tb+wCjkD+CxekWxy35ZgNf5TN1CBMh1DvizE0tKqUTlUm4gCcL497x1+7A==
- Arc-seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=k+ivsmD+6Jjv+xJLizYR0BYTYgR7A7VrfUkWL3FWqJl4kNsfAG00bjgWjMfOWHFoqOEScLlOEXVsbYtvRvDBKkFlD6KfjOmX09YIPlIMQDHfadwvhXMn491yUafkiMuQW3LZxoT43/jci67l4YAolejpCJrVh5MzIPdluvFxtE7+UXSFlp56xWTVKpQd8EiKK3SAQYV92TmAftEZmsnEG5UcI82xEdM8ArvYDNxUuSQjJ7cj4gLY+VvMlRyOR5JQAVVHDl0eduRIwB7/ALPdIGNEtxq+HubStoXlNSuiTCzNigjVvgU5L1OXtV1RzuPI8o0pxtumRdMbSsALbnOhig==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UiVeqKB+QvhGTq8cHrWDIfsVlzBjL0U1Nhjce4QzOh96uYV9eMGcqmD+IWUsH3xOFkEZsaftCNu5+tp+dFW1YGXlHodSExONS4SoPBtVWQmQxcv0cDmL+f4xK9g8c9sRVIahWSeU9BiZ23jXMwA6KIezoX7A9UuIUQ7V80MY2FmvfD0gUjhI1sXo5heLT093aPmh07YDH3STsN9Cdn5Zqp60Lnurus3qx/7ymo2PItpz3E6FyfaK4hMbD4SU9VbTYExIYtcOjTUQ7gzsE+qVfhWV1SvZnV4RMHTuQEu7GxEYJEyY+d48+Xx5rrUlLo7VIVMGYXodidtZbs4byO1PLQ==
- Authentication-results-original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Fri, 08 Jul 2022 15:39:33 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Original-authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Thread-index: AQHYh+Qt/49JLdoEv0uAADgNQkPLF610seaA
- Thread-topic: [XEN PATCH v3 04/25] tools/firmware/hvmloader: rework Makefile
> On 24 Jun 2022, at 17:04, Anthony PERARD <anthony.perard@xxxxxxxxxx> wrote:
>
> Setup proper dependencies with libacpi so we don't need to run "make
> hvmloader" in the "all" target. ("build.o" new prerequisite isn't
> exactly proper but a side effect of building the $(DSDT_FILES) is to
> generate the "ssdt_*.h" needed by "build.o".)
>
> Make use if "-iquote" instead of a plain "-I".
>
> For "roms.inc" target, use "$(SHELL)" instead of plain "sh". And use
> full path to "mkhex" instead of a relative one. Lastly, add "-f" flag
> to "mv", in case the target already exist.
>
> Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> ---
> tools/firmware/hvmloader/Makefile | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/tools/firmware/hvmloader/Makefile
> b/tools/firmware/hvmloader/Makefile
> index b754220839..fc20932110 100644
> --- a/tools/firmware/hvmloader/Makefile
> +++ b/tools/firmware/hvmloader/Makefile
> @@ -60,8 +60,7 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM)
> endif
>
> .PHONY: all
> -all: acpi
> - $(MAKE) hvmloader
> +all: hvmloader
>
> .PHONY: acpi
> acpi:
> @@ -73,12 +72,15 @@ smbios.o: CFLAGS +=
> -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
> ACPI_PATH = ../../libacpi
> DSDT_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
> ACPI_OBJS = $(patsubst %.c,%.o,$(DSDT_FILES)) build.o static_tables.o
> -$(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\"
> +$(ACPI_OBJS): CFLAGS += -iquote . -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\"
> CFLAGS += -I$(ACPI_PATH)
> vpath build.c $(ACPI_PATH)
> vpath static_tables.c $(ACPI_PATH)
> OBJS += $(ACPI_OBJS)
>
> +$(DSDT_FILES): acpi
> +build.o: $(DSDT_FILES)
> +
> hvmloader: $(OBJS) hvmloader.lds
> $(LD) $(LDFLAGS_DIRECT) -N -T hvmloader.lds -o $@ $(OBJS)
>
> @@ -87,21 +89,21 @@ roms.inc: $(ROMS)
>
> ifneq ($(ROMBIOS_ROM),)
> echo "#ifdef ROM_INCLUDE_ROMBIOS" >> $@.new
> - sh ../../misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new
> + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new
> echo "#endif" >> $@.new
> endif
>
> ifneq ($(STDVGA_ROM),)
> echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new
> - sh ../../misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new
> + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex vgabios_stdvga $(STDVGA_ROM) >>
> $@.new
> echo "#endif" >> $@.new
> endif
> ifneq ($(CIRRUSVGA_ROM),)
> echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new
> - sh ../../misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new
> + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex vgabios_cirrusvga
> $(CIRRUSVGA_ROM) >> $@.new
> echo "#endif" >> $@.new
> endif
> - mv $@.new $@
> + mv -f $@.new $@
Here, instead of -f, is it safer -u? What’s your opinion on that? The patch
looks good to me.
>
> .PHONY: clean
> clean:
> --
> Anthony PERARD
>
>
|
