mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi: add rules to compile ASL source

Browse Source 
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.

Note: distros are known to silently update iasl
so detect correct iasl flags for the installed version on each run as
opposed to at configure time.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-07-24 18:56:03 +03:00
parent 74523b8501
commit a31a864273
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -119,6 +119,7 @@ path_of() {
# default parameters # default parameters
source_path=`dirname "$0"` source_path=`dirname "$0"`
cpu="" cpu=""
iasl="iasl"
interp_prefix="/usr/gnemul/qemu-%M" interp_prefix="/usr/gnemul/qemu-%M"
static="no" static="no"
cross_prefix="" cross_prefix=""
@ -257,6 +258,8 @@ for opt do
;; ;;
--cxx=*) CXX="$optarg" --cxx=*) CXX="$optarg"
;; ;;
--iasl=*) iasl="$optarg"
;;
--source-path=*) source_path="$optarg" --source-path=*) source_path="$optarg"
;; ;;
--cpu=*) cpu="$optarg" --cpu=*) cpu="$optarg"
@ -1055,6 +1058,7 @@ echo "Advanced options (experts only):"
echo " --source-path=PATH path of source code [$source_path]" echo " --source-path=PATH path of source code [$source_path]"
echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
echo " --cc=CC use C compiler CC [$cc]" 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 " --host-cc=CC use C compiler CC [$host_cc] for code run at"
echo " build time" echo " build time"
echo " --cxx=CXX use C++ compiler CXX [$cxx]" echo " --cxx=CXX use C++ compiler CXX [$cxx]"
@ -4239,6 +4243,9 @@ else
fi fi
echo "PYTHON=$python" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak
echo "CC=$cc" >> $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 "CC_I386=$cc_i386" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak
echo "CXX=$cxx" >> $config_host_mak echo "CXX=$cxx" >> $config_host_mak
@ -4691,7 +4698,7 @@ for rom in seabios vgabios ; do
echo "BCC=bcc" >> $config_mak echo "BCC=bcc" >> $config_mak
echo "CPP=$cpp" >> $config_mak echo "CPP=$cpp" >> $config_mak
echo "OBJCOPY=objcopy" >> $config_mak echo "OBJCOPY=objcopy" >> $config_mak
echo "IASL=iasl" >> $config_mak echo "IASL=$iasl" >> $config_mak
echo "LD=$ld" >> $config_mak echo "LD=$ld" >> $config_mak
done done

22
hw/i386/Makefile.objs
View File

@ -5,3 +5,25 @@ obj-y += pc_sysfw.o
obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
obj-y += kvmvapic.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

4
scripts/update-acpi.sh Normal file
View File

@ -0,0 +1,4 @@
cd x86_64-softmmu
for file in hw/i386/*.hex; do
cp -f $file ../$file.generated
done