Merge branch 'acpi-tools'
* acpi-tools: tools/power/acpi: Enable build for EC userspace tool tools/power/acpi: Add descend support in ACPI tools Makefile
This commit is contained in:
Rafael J. Wysocki
Коммит
20a200085f
|
|
@ -8,154 +8,20 @@
|
||||||
# as published by the Free Software Foundation; version 2
|
# as published by the Free Software Foundation; version 2
|
||||||
# of the License.
|
# of the License.
|
||||||
|
|
||||||
OUTPUT=./
|
include ../../scripts/Makefile.include
|
||||||
ifeq ("$(origin O)", "command line")
|
|
||||||
OUTPUT := $(O)/
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(OUTPUT),)
|
all: acpidump ec
|
||||||
# check that the output directory actually exists
|
clean: acpidump_clean ec_clean
|
||||||
OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
|
install: acpidump_install ec_install
|
||||||
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
|
uninstall: acpidump_uninstall ec_uninstall
|
||||||
endif
|
|
||||||
|
|
||||||
SUBDIRS = tools/ec
|
acpidump ec: FORCE
|
||||||
|
$(call descend,tools/$@,all)
|
||||||
|
acpidump_clean ec_clean:
|
||||||
|
$(call descend,tools/$(@:_clean=),clean)
|
||||||
|
acpidump_install ec_install:
|
||||||
|
$(call descend,tools/$(@:_install=),install)
|
||||||
|
acpidump_uninstall ec_uninstall:
|
||||||
|
$(call descend,tools/$(@:_uninstall=),uninstall)
|
||||||
|
|
||||||
# --- CONFIGURATION BEGIN ---
|
.PHONY: FORCE
|
||||||
|
|
||||||
# Set the following to `true' to make a unstripped, unoptimized
|
|
||||||
# binary. Leave this set to `false' for production use.
|
|
||||||
DEBUG ?= true
|
|
||||||
|
|
||||||
# make the build silent. Set this to something else to make it noisy again.
|
|
||||||
V ?= false
|
|
||||||
|
|
||||||
# Prefix to the directories we're installing to
|
|
||||||
DESTDIR ?=
|
|
||||||
|
|
||||||
# --- CONFIGURATION END ---
|
|
||||||
|
|
||||||
# Directory definitions. These are default and most probably
|
|
||||||
# do not need to be changed. Please note that DESTDIR is
|
|
||||||
# added in front of any of them
|
|
||||||
|
|
||||||
bindir ?= /usr/bin
|
|
||||||
sbindir ?= /usr/sbin
|
|
||||||
mandir ?= /usr/man
|
|
||||||
|
|
||||||
# Toolchain: what tools do we use, and what options do they need:
|
|
||||||
|
|
||||||
INSTALL = /usr/bin/install -c
|
|
||||||
INSTALL_PROGRAM = ${INSTALL}
|
|
||||||
INSTALL_DATA = ${INSTALL} -m 644
|
|
||||||
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
|
||||||
|
|
||||||
# If you are running a cross compiler, you may want to set this
|
|
||||||
# to something more interesting, like "arm-linux-". If you want
|
|
||||||
# to compile vs uClibc, that can be done here as well.
|
|
||||||
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
|
|
||||||
CC = $(CROSS)gcc
|
|
||||||
LD = $(CROSS)gcc
|
|
||||||
STRIP = $(CROSS)strip
|
|
||||||
HOSTCC = gcc
|
|
||||||
|
|
||||||
# check if compiler option is supported
|
|
||||||
cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
|
|
||||||
|
|
||||||
# use '-Os' optimization if available, else use -O2
|
|
||||||
OPTIMIZATION := $(call cc-supports,-Os,-O2)
|
|
||||||
|
|
||||||
WARNINGS := -Wall
|
|
||||||
WARNINGS += $(call cc-supports,-Wstrict-prototypes)
|
|
||||||
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
|
|
||||||
|
|
||||||
KERNEL_INCLUDE := ../../../include
|
|
||||||
ACPICA_INCLUDE := ../../../drivers/acpi/acpica
|
|
||||||
CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
|
|
||||||
CFLAGS += $(WARNINGS)
|
|
||||||
|
|
||||||
ifeq ($(strip $(V)),false)
|
|
||||||
QUIET=@
|
|
||||||
ECHO=@echo
|
|
||||||
else
|
|
||||||
QUIET=
|
|
||||||
ECHO=@\#
|
|
||||||
endif
|
|
||||||
export QUIET ECHO
|
|
||||||
|
|
||||||
# if DEBUG is enabled, then we do not strip or optimize
|
|
||||||
ifeq ($(strip $(DEBUG)),true)
|
|
||||||
CFLAGS += -O1 -g -DDEBUG
|
|
||||||
STRIPCMD = /bin/true -Since_we_are_debugging
|
|
||||||
else
|
|
||||||
CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
|
|
||||||
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
|
|
||||||
endif
|
|
||||||
|
|
||||||
# --- ACPIDUMP BEGIN ---
|
|
||||||
|
|
||||||
vpath %.c \
|
|
||||||
../../../drivers/acpi/acpica\
|
|
||||||
tools/acpidump\
|
|
||||||
common\
|
|
||||||
os_specific/service_layers
|
|
||||||
|
|
||||||
CFLAGS += -DACPI_DUMP_APP -Itools/acpidump
|
|
||||||
|
|
||||||
DUMP_OBJS = \
|
|
||||||
apdump.o\
|
|
||||||
apfiles.o\
|
|
||||||
apmain.o\
|
|
||||||
osunixdir.o\
|
|
||||||
osunixmap.o\
|
|
||||||
osunixxf.o\
|
|
||||||
tbprint.o\
|
|
||||||
tbxfroot.o\
|
|
||||||
utbuffer.o\
|
|
||||||
utdebug.o\
|
|
||||||
utexcep.o\
|
|
||||||
utglobal.o\
|
|
||||||
utmath.o\
|
|
||||||
utprint.o\
|
|
||||||
utstring.o\
|
|
||||||
utxferror.o\
|
|
||||||
oslibcfs.o\
|
|
||||||
oslinuxtbl.o\
|
|
||||||
cmfsize.o\
|
|
||||||
getopt.o
|
|
||||||
|
|
||||||
DUMP_OBJS := $(addprefix $(OUTPUT)tools/acpidump/,$(DUMP_OBJS))
|
|
||||||
|
|
||||||
$(OUTPUT)acpidump: $(DUMP_OBJS)
|
|
||||||
$(ECHO) " LD " $@
|
|
||||||
$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(DUMP_OBJS) -L$(OUTPUT) -o $@
|
|
||||||
$(QUIET) $(STRIPCMD) $@
|
|
||||||
|
|
||||||
$(OUTPUT)tools/acpidump/%.o: %.c
|
|
||||||
$(ECHO) " CC " $@
|
|
||||||
$(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
|
|
||||||
|
|
||||||
# --- ACPIDUMP END ---
|
|
||||||
|
|
||||||
all: $(OUTPUT)acpidump
|
|
||||||
echo $(OUTPUT)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
-find $(OUTPUT) \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
|
|
||||||
| xargs rm -f
|
|
||||||
-rm -f $(OUTPUT)acpidump
|
|
||||||
|
|
||||||
install-tools:
|
|
||||||
$(INSTALL) -d $(DESTDIR)${sbindir}
|
|
||||||
$(INSTALL_PROGRAM) $(OUTPUT)acpidump $(DESTDIR)${sbindir}
|
|
||||||
|
|
||||||
install-man:
|
|
||||||
$(INSTALL_DATA) -D man/acpidump.8 $(DESTDIR)${mandir}/man8/acpidump.8
|
|
||||||
|
|
||||||
install: all install-tools install-man
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
- rm -f $(DESTDIR)${sbindir}/acpidump
|
|
||||||
- rm -f $(DESTDIR)${mandir}/man8/acpidump.8
|
|
||||||
|
|
||||||
.PHONY: all utils install-tools install-man install uninstall clean
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,92 @@
|
||||||
|
# tools/power/acpi/Makefile.config - ACPI tool Makefile
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015, Intel Corporation
|
||||||
|
# Author: Lv Zheng <lv.zheng@intel.com>
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; version 2
|
||||||
|
# of the License.
|
||||||
|
|
||||||
|
include ../../../../scripts/Makefile.include
|
||||||
|
|
||||||
|
OUTPUT=./
|
||||||
|
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))
|
||||||
|
endif
|
||||||
|
|
||||||
|
# --- CONFIGURATION BEGIN ---
|
||||||
|
|
||||||
|
# Set the following to `true' to make a unstripped, unoptimized
|
||||||
|
# binary. Leave this set to `false' for production use.
|
||||||
|
DEBUG ?= true
|
||||||
|
|
||||||
|
# make the build silent. Set this to something else to make it noisy again.
|
||||||
|
V ?= false
|
||||||
|
|
||||||
|
# Prefix to the directories we're installing to
|
||||||
|
DESTDIR ?=
|
||||||
|
|
||||||
|
# --- CONFIGURATION END ---
|
||||||
|
|
||||||
|
# Directory definitions. These are default and most probably
|
||||||
|
# do not need to be changed. Please note that DESTDIR is
|
||||||
|
# added in front of any of them
|
||||||
|
|
||||||
|
bindir ?= /usr/bin
|
||||||
|
sbindir ?= /usr/sbin
|
||||||
|
mandir ?= /usr/man
|
||||||
|
|
||||||
|
# Toolchain: what tools do we use, and what options do they need:
|
||||||
|
|
||||||
|
INSTALL = /usr/bin/install -c
|
||||||
|
INSTALL_PROGRAM = ${INSTALL}
|
||||||
|
INSTALL_DATA = ${INSTALL} -m 644
|
||||||
|
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||||
|
|
||||||
|
# If you are running a cross compiler, you may want to set this
|
||||||
|
# to something more interesting, like "arm-linux-". If you want
|
||||||
|
# to compile vs uClibc, that can be done here as well.
|
||||||
|
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
|
||||||
|
CC = $(CROSS)gcc
|
||||||
|
LD = $(CROSS)gcc
|
||||||
|
STRIP = $(CROSS)strip
|
||||||
|
HOSTCC = gcc
|
||||||
|
|
||||||
|
# check if compiler option is supported
|
||||||
|
cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
|
||||||
|
|
||||||
|
# use '-Os' optimization if available, else use -O2
|
||||||
|
OPTIMIZATION := $(call cc-supports,-Os,-O2)
|
||||||
|
|
||||||
|
WARNINGS := -Wall
|
||||||
|
WARNINGS += $(call cc-supports,-Wstrict-prototypes)
|
||||||
|
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
|
||||||
|
|
||||||
|
KERNEL_INCLUDE := ../../../include
|
||||||
|
ACPICA_INCLUDE := ../../../drivers/acpi/acpica
|
||||||
|
CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
|
||||||
|
CFLAGS += $(WARNINGS)
|
||||||
|
|
||||||
|
ifeq ($(strip $(V)),false)
|
||||||
|
QUIET=@
|
||||||
|
ECHO=@echo
|
||||||
|
else
|
||||||
|
QUIET=
|
||||||
|
ECHO=@\#
|
||||||
|
endif
|
||||||
|
|
||||||
|
# if DEBUG is enabled, then we do not strip or optimize
|
||||||
|
ifeq ($(strip $(DEBUG)),true)
|
||||||
|
CFLAGS += -O1 -g -DDEBUG
|
||||||
|
STRIPCMD = /bin/true -Since_we_are_debugging
|
||||||
|
else
|
||||||
|
CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
|
||||||
|
STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
|
||||||
|
endif
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
# tools/power/acpi/Makefile.rules - ACPI tool Makefile
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015, Intel Corporation
|
||||||
|
# Author: Lv Zheng <lv.zheng@intel.com>
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# 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 $@
|
||||||
|
$(QUIET) $(STRIPCMD) $@
|
||||||
|
|
||||||
|
$(OUTPUT)%.o: %.c
|
||||||
|
$(ECHO) " CC " $@
|
||||||
|
$(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)
|
||||||
|
|
||||||
|
install-tools:
|
||||||
|
$(INSTALL) -d $(DESTDIR)${sbindir}
|
||||||
|
$(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)${sbindir}
|
||||||
|
uninstall-tools:
|
||||||
|
- rm -f $(DESTDIR)${sbindir}/$(TOOL)
|
||||||
|
|
||||||
|
install: all install-tools $(EXTRA_INSTALL)
|
||||||
|
uninstall: uninstall-tools $(EXTRA_UNINSTALL)
|
||||||
|
|
||||||
|
.PHONY: FORCE
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
# tools/power/acpi/tools/acpidump/Makefile - ACPI tool Makefile
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015, Intel Corporation
|
||||||
|
# Author: Lv Zheng <lv.zheng@intel.com>
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; version 2
|
||||||
|
# of the License.
|
||||||
|
|
||||||
|
include ../../Makefile.config
|
||||||
|
|
||||||
|
TOOL = acpidump
|
||||||
|
EXTRA_INSTALL = install-man
|
||||||
|
EXTRA_UNINSTALL = uninstall-man
|
||||||
|
|
||||||
|
vpath %.c \
|
||||||
|
../../../../../drivers/acpi/acpica\
|
||||||
|
./\
|
||||||
|
../../common\
|
||||||
|
../../os_specific/service_layers
|
||||||
|
CFLAGS += -DACPI_DUMP_APP -I.\
|
||||||
|
-I../../../../../drivers/acpi/acpica\
|
||||||
|
-I../../../../../include
|
||||||
|
TOOL_OBJS = \
|
||||||
|
apdump.o\
|
||||||
|
apfiles.o\
|
||||||
|
apmain.o\
|
||||||
|
osunixdir.o\
|
||||||
|
osunixmap.o\
|
||||||
|
osunixxf.o\
|
||||||
|
tbprint.o\
|
||||||
|
tbxfroot.o\
|
||||||
|
utbuffer.o\
|
||||||
|
utdebug.o\
|
||||||
|
utexcep.o\
|
||||||
|
utglobal.o\
|
||||||
|
utmath.o\
|
||||||
|
utnonansi.o\
|
||||||
|
utprint.o\
|
||||||
|
utstring.o\
|
||||||
|
utxferror.o\
|
||||||
|
oslibcfs.o\
|
||||||
|
oslinuxtbl.o\
|
||||||
|
cmfsize.o\
|
||||||
|
getopt.o
|
||||||
|
|
||||||
|
include ../../Makefile.rules
|
||||||
|
|
||||||
|
install-man: ../../man/acpidump.8
|
||||||
|
$(INSTALL_DATA) -D $< $(DESTDIR)${mandir}/man8/acpidump.8
|
||||||
|
uninstall-man:
|
||||||
|
- rm -f $(DESTDIR)${mandir}/man8/acpidump.8
|
||||||
|
|
@ -1,22 +1,17 @@
|
||||||
ec_access: ec_access.o
|
# tools/power/acpi/tools/acpidump/Makefile - ACPI tool Makefile
|
||||||
$(ECHO) " LD " $@
|
#
|
||||||
$(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $< -o $@
|
# Copyright (c) 2015, Intel Corporation
|
||||||
$(QUIET) $(STRIPCMD) $@
|
# Author: Lv Zheng <lv.zheng@intel.com>
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; version 2
|
||||||
|
# of the License.
|
||||||
|
|
||||||
%.o: %.c
|
include ../../Makefile.config
|
||||||
$(ECHO) " CC " $@
|
|
||||||
$(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
|
|
||||||
|
|
||||||
all: ec_access
|
TOOL = ec
|
||||||
|
TOOL_OBJS = \
|
||||||
|
ec_access.o
|
||||||
|
|
||||||
install:
|
include ../../Makefile.rules
|
||||||
$(INSTALL) -d $(DESTDIR)${sbindir}
|
|
||||||
$(INSTALL_PROGRAM) ec_access $(DESTDIR)${sbindir}
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
- rm -f $(DESTDIR)${sbindir}/ec_access
|
|
||||||
|
|
||||||
clean:
|
|
||||||
-rm -f $(OUTPUT)ec_access
|
|
||||||
|
|
||||||
.PHONY: all install uninstall
|
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче