Commit edbe47c1 authored Apr 04, 2014 by Lv Zheng Committed by Rafael J. Wysocki Apr 20, 2014

ACPICA: acpidump: Update Makefile to build acpidump from ACPICA.



This patch updates tools Makefile to use new acpidump.

ACPICA's acpidump relies on various ACPICA components/common/os_specific
source code.  They are located in various kernel folders, being searched
and compiled using vpath technique in Makefile.  These files include:
1. drivers/acpi/acpica/acapps.h
2. tools/power/acpi/common/getopt.c
3. tools/power/acpi/common/cmfsize.c
4. tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
5. tools/power/acpi/os_specific/service_layers/osunixdir.c
6. tools/power/acpi/os_specific/service_layers/osunixmap.c

This patch has been tested on DELL Inspiron Mini, acpidump output can be
successfully generated by typing the following commands:
# cd tools/power/acpi
# make DEBUG=false
# sudo make install DESTDIR=/opt
# sudo make uninstall DESTDIR=/opt
# make clean
Or
# cd tools
# make acpi
# sudo make acpi_install
# sudo make acpi_uninstall
# make acpi_clean
A kernel build test is also performed on DELL Inspiron Mini to verify that
the changes done to actypes.h and aclinux.h won't affect the kernel
build process.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[rjw: Subject]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent e2b9035f

tools/power/acpi/Makefile

+23 −3

Original line number	Diff line number	Diff line
		@@ -68,7 +68,8 @@ WARNINGS += $(call cc-supports,-Wstrict-prototypes)
		WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)

		KERNEL_INCLUDE := ../../../include
		CFLAGS += -D_LINUX -DDEFINE_ALTERNATE_TYPES -I$(KERNEL_INCLUDE)
		ACPICA_INCLUDE := ../../../drivers/acpi/acpica
		CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
		CFLAGS += $(WARNINGS)

		ifeq ($(strip $(V)),false)
		@@ -101,10 +102,29 @@ endif
		# --- ACPIDUMP BEGIN ---

		vpath %.c \
		tools/acpidump
		../../../drivers/acpi/acpica\
		tools/acpidump\
		common\
		os_specific/service_layers

		CFLAGS += -DACPI_DUMP_APP -Itools/acpidump

		DUMP_OBJS = \
		acpidump.o
		apdump.o\
		apfiles.o\
		apmain.o\
		osunixdir.o\
		osunixmap.o\
		tbprint.o\
		tbxfroot.o\
		utbuffer.o\
		utexcep.o\
		utmath.o\
		utstring.o\
		utxferror.o\
		oslinuxtbl.o\
		cmfsize.o\
		getopt.o

		DUMP_OBJS := $(addprefix $(OUTPUT)tools/acpidump/,$(DUMP_OBJS))