tools/power/acpi: Remove direct kernel source include reference
Avoid breaking cross-compiled ACPI tools builds by rearranging the
handling of kernel header files.
This patch also contains OUTPUT/srctree cleanups in order to make above fix
working for various build environments.
Fixes: e323c02dee (ACPICA: MSVC9: Fix <sys/stat.h> inclusion order issue)
Reported-and-tested-by: Yisheng Xie <xieyisheng1@huawei.com>
Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[ rjw: Changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng
Rafael J. Wysocki
parent
a25f0944ba
commit
d5a4b1a540
|
|
@ -191,6 +191,9 @@
|
|||
#ifndef __init
|
||||
#define __init
|
||||
#endif
|
||||
#ifndef __iomem
|
||||
#define __iomem
|
||||
#endif
|
||||
|
||||
/* Host-dependent types and defines for user-space ACPICA */
|
||||
|
||||
|
|
|
|||
|
|
@ -8,18 +8,19 @@
|
|||
# as published by the Free Software Foundation; version 2
|
||||
# of the License.
|
||||
|
||||
include ../../../../scripts/Makefile.include
|
||||
ifeq ($(srctree),)
|
||||
srctree := $(patsubst %/,%,$(dir $(shell pwd)))
|
||||
srctree := $(patsubst %/,%,$(dir $(srctree)))
|
||||
#$(info Determined 'srctree' to be $(srctree))
|
||||
endif
|
||||
|
||||
OUTPUT=./
|
||||
include $(srctree)/../../scripts/Makefile.include
|
||||
|
||||
OUTPUT=$(srctree)/
|
||||
ifeq ("$(origin O)", "command line")
|
||||
OUTPUT := $(O)/
|
||||
endif
|
||||
|
||||
ifneq ($(OUTPUT),)
|
||||
# check that the output directory actually exists
|
||||
OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
|
||||
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
|
||||
OUTPUT := $(O)/power/acpi/
|
||||
endif
|
||||
#$(info Determined 'OUTPUT' to be $(OUTPUT))
|
||||
|
||||
# --- CONFIGURATION BEGIN ---
|
||||
|
||||
|
|
@ -70,8 +71,8 @@ WARNINGS := -Wall
|
|||
WARNINGS += $(call cc-supports,-Wstrict-prototypes)
|
||||
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
|
||||
|
||||
KERNEL_INCLUDE := ../../../include
|
||||
ACPICA_INCLUDE := ../../../drivers/acpi/acpica
|
||||
KERNEL_INCLUDE := $(OUTPUT)include
|
||||
ACPICA_INCLUDE := $(srctree)/../../../drivers/acpi/acpica
|
||||
CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
|
||||
CFLAGS += $(WARNINGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,28 +8,42 @@
|
|||
# as published by the Free Software Foundation; version 2
|
||||
# of the License.
|
||||
|
||||
$(OUTPUT)$(TOOL): $(TOOL_OBJS) FORCE
|
||||
$(ECHO) " LD " $@
|
||||
$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(TOOL_OBJS) -L$(OUTPUT) -o $@
|
||||
objdir := $(OUTPUT)tools/$(TOOL)/
|
||||
toolobjs := $(addprefix $(objdir),$(TOOL_OBJS))
|
||||
$(OUTPUT)$(TOOL): $(toolobjs) FORCE
|
||||
$(ECHO) " LD " $(subst $(OUTPUT),,$@)
|
||||
$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(toolobjs) -L$(OUTPUT) -o $@
|
||||
$(ECHO) " STRIP " $(subst $(OUTPUT),,$@)
|
||||
$(QUIET) $(STRIPCMD) $@
|
||||
|
||||
$(OUTPUT)%.o: %.c
|
||||
$(ECHO) " CC " $@
|
||||
$(KERNEL_INCLUDE):
|
||||
$(ECHO) " MKDIR " $(subst $(OUTPUT),,$@)
|
||||
$(QUIET) mkdir -p $(KERNEL_INCLUDE)
|
||||
$(ECHO) " CP " $(subst $(OUTPUT),,$@)
|
||||
$(QUIET) cp -rf $(srctree)/../../../include/acpi $(KERNEL_INCLUDE)/
|
||||
|
||||
$(objdir)%.o: %.c $(KERNEL_INCLUDE)
|
||||
$(ECHO) " CC " $(subst $(OUTPUT),,$@)
|
||||
$(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
|
||||
|
||||
all: $(OUTPUT)$(TOOL)
|
||||
clean:
|
||||
-find $(OUTPUT) \( -not -type d \) \
|
||||
-and \( -name '*~' -o -name '*.[oas]' \) \
|
||||
-type f -print \
|
||||
| xargs rm -f
|
||||
-rm -f $(OUTPUT)$(TOOL)
|
||||
$(ECHO) " RMOBJ " $(subst $(OUTPUT),,$(objdir))
|
||||
$(QUIET) find $(objdir) \( -not -type d \)\
|
||||
-and \( -name '*~' -o -name '*.[oas]' \)\
|
||||
-type f -print | xargs rm -f
|
||||
$(ECHO) " RM " $(TOOL)
|
||||
$(QUIET) rm -f $(OUTPUT)$(TOOL)
|
||||
$(ECHO) " RMINC " $(subst $(OUTPUT),,$(KERNEL_INCLUDE))
|
||||
$(QUIET) rm -rf $(KERNEL_INCLUDE)
|
||||
|
||||
install-tools:
|
||||
$(INSTALL) -d $(DESTDIR)${sbindir}
|
||||
$(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)${sbindir}
|
||||
$(ECHO) " INST " $(TOOL)
|
||||
$(QUIET) $(INSTALL) -d $(DESTDIR)$(sbindir)
|
||||
$(QUIET) $(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)$(sbindir)
|
||||
uninstall-tools:
|
||||
- rm -f $(DESTDIR)${sbindir}/$(TOOL)
|
||||
$(ECHO) " UNINST " $(TOOL)
|
||||
$(QUIET) rm -f $(DESTDIR)$(sbindir)/$(TOOL)
|
||||
|
||||
install: all install-tools $(EXTRA_INSTALL)
|
||||
uninstall: uninstall-tools $(EXTRA_UNINSTALL)
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@ vpath %.c \
|
|||
../../os_specific/service_layers\
|
||||
.
|
||||
CFLAGS += -DACPI_APPLICATION -DACPI_SINGLE_THREAD -DACPI_DEBUGGER\
|
||||
-I.\
|
||||
-I../../../../../drivers/acpi/acpica\
|
||||
-I../../../../../include
|
||||
-I.
|
||||
LDFLAGS += -lpthread
|
||||
TOOL_OBJS = \
|
||||
acpidbg.o
|
||||
|
|
|
|||
|
|
@ -12,10 +12,16 @@
|
|||
#include <acpi/acpi.h>
|
||||
|
||||
/* Headers not included by include/acpi/platform/aclinux.h */
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <error.h>
|
||||
#include <stdbool.h>
|
||||
#include <fcntl.h>
|
||||
#include <assert.h>
|
||||
#include <linux/circ_buf.h>
|
||||
#include <sys/select.h>
|
||||
#include "../../../../../include/linux/circ_buf.h"
|
||||
|
||||
#define ACPI_AML_FILE "/sys/kernel/debug/acpi/acpidbg"
|
||||
#define ACPI_AML_SEC_TICK 1
|
||||
|
|
|
|||
|
|
@ -19,9 +19,7 @@ vpath %.c \
|
|||
./\
|
||||
../../common\
|
||||
../../os_specific/service_layers
|
||||
CFLAGS += -DACPI_DUMP_APP -I.\
|
||||
-I../../../../../drivers/acpi/acpica\
|
||||
-I../../../../../include
|
||||
CFLAGS += -DACPI_DUMP_APP -I.
|
||||
TOOL_OBJS = \
|
||||
apdump.o\
|
||||
apfiles.o\
|
||||
|
|
@ -49,7 +47,9 @@ TOOL_OBJS = \
|
|||
|
||||
include ../../Makefile.rules
|
||||
|
||||
install-man: ../../man/acpidump.8
|
||||
$(INSTALL_DATA) -D $< $(DESTDIR)${mandir}/man8/acpidump.8
|
||||
install-man: $(srctree)/man/acpidump.8
|
||||
$(ECHO) " INST " acpidump.8
|
||||
$(QUIET) $(INSTALL_DATA) -D $< $(DESTDIR)$(mandir)/man8/acpidump.8
|
||||
uninstall-man:
|
||||
- rm -f $(DESTDIR)${mandir}/man8/acpidump.8
|
||||
$(ECHO) " UNINST " acpidump.8
|
||||
$(QUIET) rm -f $(DESTDIR)$(mandir)/man8/acpidump.8
|
||||
|
|
|
|||
Loading…
Reference in New Issue