github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 15:02:13 +00:00
Code Issues Projects Releases Wiki Activity

DM: ACPI: Avoiding hard code the ASL_COMPILER macro

Browse Source 
The ASL_COMPILER macro is hard coded as /usr/sbin/iasl, it is
complained by some developers. This patch changes it to a
flexible way, by which the following make command lines are
supported:

make
make devicemodel
make ASL_COMPILER=/path/to/iasl
make ASL_COMPILER=/path/to/iasl devicemodel

Tracked-On: #2298
Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com>
Reviewed-by: Binbin Wu <binbin.wu@intel.com>
This commit is contained in:
Xiaoguang Wu 2019-01-14 06:42:02 +00:00 committed by wenlingz
parent 342d29eea8
commit 80dc0bce3e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -62,7 +62,7 @@ sbl-hypervisor:
devicemodel: tools devicemodel: tools
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG) $(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG) DM_ASL_COMPILER=$(ASL_COMPILER)
tools: tools:
mkdir -p $(TOOLS_OUT) mkdir -p $(TOOLS_OUT)

4
devicemodel/Makefile
View File

@ -25,6 +25,10 @@ CFLAGS += -I$(BASEDIR)/include/public
CFLAGS += -I$(DM_OBJDIR)/include CFLAGS += -I$(DM_OBJDIR)/include
CFLAGS += -I$(TOOLS_OUT) CFLAGS += -I$(TOOLS_OUT)
ifneq (, $(DM_ASL_COMPILER))
CFLAGS += -DASL_COMPILER=\"$(DM_ASL_COMPILER)\"
endif
GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1) GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)
GCC_MINOR=$(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1) GCC_MINOR=$(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1)

2
devicemodel/hw/platform/acpi/acpi.c
View File

@ -89,7 +89,9 @@
#define ASL_TEMPLATE "dm.XXXXXXX" #define ASL_TEMPLATE "dm.XXXXXXX"
#define ASL_SUFFIX ".aml" #define ASL_SUFFIX ".aml"
#ifndef ASL_COMPILER
#define ASL_COMPILER "/usr/sbin/iasl" #define ASL_COMPILER "/usr/sbin/iasl"
#endif
uint64_t audio_nhlt_len = 0; uint64_t audio_nhlt_len = 0;
uint32_t csme_sec_cap = 0; uint32_t csme_sec_cap = 0;