From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com,
ian.jackson@eu.citrix.com, julien.grall@arm.com,
jbeulich@suse.com, zhaoshenglong@huawei.com,
boris.ostrovsky@oracle.com, roger.pau@citrix.com
Subject: [PATCH v1 12/20] acpi/hvmloader: Link ACPI object files directly
Date: Tue, 5 Jul 2016 15:05:11 -0400 [thread overview]
Message-ID: <1467745519-9868-13-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1467745519-9868-1-git-send-email-boris.ostrovsky@oracle.com>
ACPI sources will be available to various component which will build
them according to their own rules. ACPI's Makefile will only generate
necessary source files.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
Changes in v1:
* Build ASL and C files in target's (hvmloader) directory
.gitignore | 8 +++---
tools/firmware/hvmloader/Makefile | 11 ++++++++-
tools/firmware/hvmloader/acpi/Makefile | 37 +++++++++++++++----------------
3 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/.gitignore b/.gitignore
index e019f2e..9dd2086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,10 +126,10 @@ tools/firmware/*bios/*bios*.txt
tools/firmware/etherboot/gpxe/*
tools/firmware/extboot/extboot.img
tools/firmware/extboot/signrom
-tools/firmware/hvmloader/acpi/mk_dsdt
-tools/firmware/hvmloader/acpi/dsdt*.c
-tools/firmware/hvmloader/acpi/dsdt_*.asl
-tools/firmware/hvmloader/acpi/ssdt_*.h
+tools/firmware/hvmloader/mk_dsdt
+tools/firmware/hvmloader/dsdt*.c
+tools/firmware/hvmloader/dsdt_*.asl
+tools/firmware/hvmloader/ssdt_*.h
tools/firmware/hvmloader/hvmloader
tools/firmware/hvmloader/roms.h
tools/firmware/hvmloader/roms.inc
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index f2f4791..043da50 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -20,6 +20,7 @@
XEN_ROOT = $(CURDIR)/../../..
include $(XEN_ROOT)/tools/firmware/Rules.mk
+export ACPI_BUILD_DIR=$(shell pwd)
SUBDIRS := acpi
# The HVM loader is started in 32-bit mode at the address below:
@@ -95,7 +96,15 @@ all: subdirs-all
ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
-hvmloader: $(OBJS) acpi/acpi.a
+ACPI_PATH = $(XEN_ROOT)/tools/firmware/hvmloader/acpi
+ACPI_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c build.c static_tables.c
+ACPI_OBJS = $(patsubst %.c,%.o,$(ACPI_FILES))
+$(ACPI_OBJS): CFLAGS += -I$(ACPI_PATH) -I.
+vpath build.c $(ACPI_PATH)/
+vpath static_tables.c $(ACPI_PATH)/
+OBJS += $(ACPI_OBJS)
+
+hvmloader: $(OBJS)
$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $^
$(OBJCOPY) hvmloader.tmp hvmloader
rm -f hvmloader.tmp
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index d3e882a..4866912 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -17,36 +17,41 @@
XEN_ROOT = $(CURDIR)/../../../..
include $(XEN_ROOT)/tools/firmware/Rules.mk
-C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c
-OBJS = $(patsubst %.c,%.o,$(C_SRC))
+MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
-CFLAGS += $(CFLAGS_xeninclude)
+# Sources to be generated
+C_SRC = $(ACPI_BUILD_DIR)/dsdt_anycpu.c $(ACPI_BUILD_DIR)/dsdt_15cpu.c $(ACPI_BUILD_DIR)/dsdt_anycpu_qemu_xen.c
+H_SRC = $(ACPI_BUILD_DIR)/ssdt_s3.h $(ACPI_BUILD_DIR)/ssdt_s4.h $(ACPI_BUILD_DIR)/ssdt_pm.h $(ACPI_BUILD_DIR)/ssdt_tpm.h
vpath iasl $(PATH)
-all: acpi.a
+all: $(C_SRC) $(H_SRC)
-ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
+$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
+ cd $(ACPI_BUILD_DIR)
iasl -vs -p $* -tc $<
sed -e 's/AmlCode/$*/g' $*.hex >$@
rm -f $*.hex $*.aml
+ cd $(CURDIR)
-mk_dsdt: mk_dsdt.c
+$(MK_DSDT): mk_dsdt.c
$(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
-dsdt_anycpu_qemu_xen.asl: dsdt.asl mk_dsdt
+$(ACPI_BUILD_DIR)/dsdt_anycpu_qemu_xen.asl: dsdt.asl $(MK_DSDT)
awk 'NR > 1 {print s} {s=$$0}' $< > $@
- ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@
+ $(MK_DSDT) --debug=$(debug) --dm-version qemu-xen >> $@
# NB. awk invocation is a portable alternative to 'head -n -1'
-dsdt_%cpu.asl: dsdt.asl mk_dsdt
+$(ACPI_BUILD_DIR)/dsdt_%cpu.asl: dsdt.asl $(MK_DSDT)
awk 'NR > 1 {print s} {s=$$0}' $< > $@
- ./mk_dsdt --debug=$(debug) --maxcpu $* >> $@
+ $(MK_DSDT) --debug=$(debug) --maxcpu $* >> $@
-$(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
- iasl -vs -p $* -tc $*.asl
+$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
+ cd $(ACPI_BUILD_DIR)
+ iasl -vs -p $* -tc $(ACPI_BUILD_DIR)/$*.asl
sed -e 's/AmlCode/$*/g' $*.hex >$@
echo "int $*_len=sizeof($*);" >>$@
rm -f $*.aml $*.hex
+ cd $(CURDIR)
iasl:
@echo
@@ -56,14 +61,8 @@ iasl:
@echo
@exit 1
-build.o: ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h
-
-acpi.a: $(OBJS)
- $(AR) rc $@ $(OBJS)
-
clean:
- rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
- rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl
+ rm -fr $(C_SRC) $(H_SRC) $(MK_DSDT) $(patsubst %.c,%.asl,$(C_SRC))
distclean: clean
--
1.7.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-05 19:05 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 19:04 [PATCH v1 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 01/20] hvmloader: Provide hvmloader_acpi_build_tables() Boris Ostrovsky
2016-07-06 14:47 ` Konrad Rzeszutek Wilk
2016-07-08 9:52 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 02/20] acpi/hvmloader: Move acpi_info initialization out of ACPI code Boris Ostrovsky
2016-07-07 16:58 ` Ian Jackson
2016-07-07 17:09 ` Boris Ostrovsky
2016-07-07 17:15 ` Wei Liu
2016-07-07 17:45 ` Boris Ostrovsky
2016-07-08 15:06 ` Konrad Rzeszutek Wilk
2016-07-08 15:50 ` Ian Jackson
2016-07-08 15:57 ` Boris Ostrovsky
2016-07-08 16:21 ` Ian Jackson
2016-07-11 12:10 ` Wei Liu
2016-07-11 14:47 ` Lars Kurth
2016-07-11 14:54 ` Konrad Rzeszutek Wilk
2016-07-11 15:06 ` Boris Ostrovsky
2016-07-11 15:38 ` Ian Jackson
2016-07-11 15:47 ` Ian Jackson
2016-07-11 16:07 ` Boris Ostrovsky
2016-07-08 10:10 ` Jan Beulich
2016-07-08 14:39 ` Boris Ostrovsky
2016-07-08 15:11 ` Jan Beulich
2016-07-08 16:14 ` Boris Ostrovsky
2016-08-01 10:09 ` Jan Beulich
2016-08-01 14:06 ` Boris Ostrovsky
2016-08-01 14:18 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 03/20] acpi/hvmloader: Initialize vm_gid data outside " Boris Ostrovsky
2016-07-08 10:18 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 04/20] acpi/hvmloader: Decide which SSDTs to install in hvmloader Boris Ostrovsky
2016-07-08 10:27 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 05/20] acpi/hvmloader: Move passthrough initialization from ACPI code Boris Ostrovsky
2016-07-08 10:46 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 06/20] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-07-08 13:36 ` Jan Beulich
2016-07-08 15:08 ` Boris Ostrovsky
2016-07-08 15:14 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 07/20] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-07-08 13:38 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 08/20] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-07-08 13:41 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 09/20] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-07-08 13:42 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 10/20] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-07-08 13:58 ` Jan Beulich
2016-07-08 15:23 ` Boris Ostrovsky
2016-07-08 15:35 ` Jan Beulich
2016-07-08 16:19 ` Boris Ostrovsky
2016-07-19 9:11 ` Jan Beulich
2016-07-19 14:08 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 11/20] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-07-08 14:31 ` Jan Beulich
2016-07-05 19:05 ` Boris Ostrovsky [this message]
2016-07-08 14:51 ` [PATCH v1 12/20] acpi/hvmloader: Link ACPI object files directly Jan Beulich
2016-07-08 15:41 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 13/20] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
2016-07-08 15:51 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 14/20] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
2016-08-03 16:00 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 15/20] x86: Add more checks verifying that PIT/PIC/IOAPIC are emulated Boris Ostrovsky
2016-08-03 16:04 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 16/20] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-08-03 16:11 ` Jan Beulich
2016-08-03 16:15 ` Andrew Cooper
2016-07-05 19:05 ` [PATCH v1 17/20] libacpi: Build DSDT for PVH guests Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 18/20] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
2016-07-06 10:00 ` Julien Grall
2016-07-06 15:43 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 19/20] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
2016-07-07 16:47 ` Wei Liu
2016-07-07 17:02 ` Boris Ostrovsky
2016-07-07 17:16 ` Wei Liu
2016-07-05 19:05 ` [PATCH v1 20/20] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-07-06 11:05 ` Julien Grall
2016-07-06 15:50 ` Boris Ostrovsky
2016-07-06 16:04 ` Julien Grall
2016-07-06 16:30 ` Boris Ostrovsky
2016-07-06 17:03 ` Julien Grall
2016-07-06 17:33 ` Boris Ostrovsky
2016-07-07 8:38 ` Jan Beulich
2016-07-07 15:08 ` Boris Ostrovsky
2016-07-07 15:12 ` Julien Grall
2016-07-07 15:24 ` Jan Beulich
2016-07-08 10:55 ` Wei Liu
2016-07-08 14:48 ` Boris Ostrovsky
2016-07-08 16:07 ` Wei Liu
2016-07-08 17:20 ` Boris Ostrovsky
2016-07-11 10:47 ` Wei Liu
2016-07-11 13:33 ` Boris Ostrovsky
2016-07-11 13:39 ` Julien Grall
2016-07-11 13:42 ` Wei Liu
2016-07-11 13:58 ` Julien Grall
2016-07-11 13:41 ` Wei Liu
2016-07-11 14:40 ` Boris Ostrovsky
2016-07-12 14:30 ` Wei Liu
2016-07-11 14:00 ` Anthony PERARD
2016-07-06 16:04 ` [PATCH v1 00/20] Make ACPI builder available to components other than hvmloader Roger Pau Monné
2016-07-06 16:32 ` Boris Ostrovsky
2016-07-07 8:35 ` Jan Beulich
2016-07-07 9:14 ` Julien Grall
2016-07-07 9:20 ` Jan Beulich
2016-07-07 9:29 ` Julien Grall
2016-07-07 15:04 ` Boris Ostrovsky
2016-07-07 15:10 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467745519-9868-13-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@arm.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).