[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 06/13] acpi: add rules to compile ASL source
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH RFC 06/13] acpi: add rules to compile ASL source |
Date: |
Mon, 13 May 2013 23:01:00 +0300 |
Detect presence of IASL compiler and use it
to process ASL source. If not there, use pre-compiled
files in-tree. Add script to update the in-tree files.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
configure | 9 ++++++++-
hw/i386/Makefile.objs | 22 ++++++++++++++++++++++
scripts/update-acpi.sh | 4 ++++
3 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 scripts/update-acpi.sh
diff --git a/configure b/configure
index 9439f1c..6255a83 100755
--- a/configure
+++ b/configure
@@ -119,6 +119,7 @@ path_of() {
# default parameters
source_path=`dirname "$0"`
cpu=""
+iasl="iasl"
interp_prefix="/usr/gnemul/qemu-%M"
static="no"
cross_prefix=""
@@ -249,6 +250,8 @@ for opt do
;;
--cc=*) CC="$optarg"
;;
+ --iasl=*) iasl="$optarg"
+ ;;
--source-path=*) source_path="$optarg"
;;
--cpu=*) cpu="$optarg"
@@ -1062,6 +1065,7 @@ echo "Advanced options (experts only):"
echo " --source-path=PATH path of source code [$source_path]"
echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
echo " --cc=CC use C compiler CC [$cc]"
+echo " --iasl=IASL use ACPI compiler IASL [$iasl]"
echo " --host-cc=CC use C compiler CC [$host_cc] for code run at"
echo " build time"
echo " --objcc=OBJCC use Objective-C compiler OBJCC [$objcc]"
@@ -4053,6 +4057,9 @@ else
fi
echo "PYTHON=$python" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
+if $iasl -h > /dev/null 2>&1; then
+ echo "IASL=$iasl" >> $config_host_mak
+fi
echo "CC_I386=$cc_i386" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
echo "OBJCC=$objcc" >> $config_host_mak
@@ -4541,7 +4548,7 @@ for rom in seabios vgabios ; do
echo "BCC=bcc" >> $config_mak
echo "CPP=$cpp" >> $config_mak
echo "OBJCOPY=objcopy" >> $config_mak
- echo "IASL=iasl" >> $config_mak
+ echo "IASL=$iasl" >> $config_mak
echo "LD=$ld" >> $config_mak
done
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 205d22e..013d250 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -4,3 +4,25 @@ obj-y += pc.o pc_piix.o pc_q35.o
obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.o
+
+iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \
+ ; then echo "$(2)"; else echo "$(3)"; fi ;)
+
+ifdef IASL
+#IASL Present. Generate hex files from .dsl
+hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl
$(SRC_PATH)/scripts/acpi_extract_preprocess.py
$(SRC_PATH)/scripts/acpi_extract.py
+ $(call quiet-command, cpp -P $< -o $*.dsl.i.orig, " CPP
$(TARGET_DIR)$*.dsl.i.orig")
+ $(call quiet-command, $(PYTHON)
$(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, "
ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")
+ $(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l
-tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ," IASL
$(TARGET_DIR)$*.dsl.i")
+ $(call quiet-command, $(SRC_PATH)/scripts/acpi_extract.py $*.lst >
$*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
+ $(call quiet-command, cat $*.off > $@, " CAT $(TARGET_DIR)$@")
+else
+#IASL Not present. Restore pre-generated hex files.
+hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.hex.generated
+ $(call quiet-command, cp -f $< $@, " CP $(TARGET_DIR)$@")
+endif
+
+.PHONY: cleanhex
+cleanhex:
+ rm -f hw/i386/*hex
+clean: cleanhex
diff --git a/scripts/update-acpi.sh b/scripts/update-acpi.sh
new file mode 100644
index 0000000..b5f05ff
--- /dev/null
+++ b/scripts/update-acpi.sh
@@ -0,0 +1,4 @@
+cd x86_64-softmmu
+for file in hw/i386/*.hex; do
+ cp -f $file ../$file.generated
+done
--
MST
- [Qemu-devel] [PATCH RFC 00/13] qemu: generate acpi tables for the guest, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 03/13] refer to FWCfgState explicitly, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 02/13] hw/i386/pc.c: move IO_APIC_DEFAULT_ADDRESS to include/hw/i386/apic.h, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 01/13] apic: rename apic specific bitopts, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 04/13] fw_cfg: move typedef to qemu/typedefs.h, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 06/13] acpi: add rules to compile ASL source,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH RFC 05/13] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 08/13] range: add Range structure, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 13/13] pc: reuse guest info for legacy fw cfg, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 09/13] i386: add bios linker/loader, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 07/13] acpi: pre-compiled ASL files, Michael S. Tsirkin, 2013/05/13
- [Qemu-devel] [PATCH RFC 10/13] i386: generate pc guest info, Michael S. Tsirkin, 2013/05/13