forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils
Pull cpupower updates from Dominik Brodowski. * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils: cpupower tools: add install target to the debug tools' makefiles cpupower tools: allow to build debug tools in a separate directory too cpupower: Fix broken mask values cpupower tool: allow to build in a separate directory cpupower tool: makefile: simplify the recipe used to generate cpupower.pot target cpupower tool: remove use of undefined variables from the clean target of the top makefile cpupower: Fix linking with --as-needed cpupower: Remove unneeded code and by that fix a memleak cpupower: Fix number of idle states cpupower: Unify cpupower-frequency-* manpages cpupower: Add cpupower-idle-info manpage cpupower: AMD fam14h/Ontario monitor can also be used by fam12h cpus cpupower: Better interface for accessing AMD pci registers
- Loading branch information
Showing
13 changed files
with
259 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,36 @@ | ||
| LIBS = -L../ -lm -lcpupower | ||
| OUTPUT := ./ | ||
| ifeq ("$(origin O)", "command line") | ||
| ifneq ($(O),) | ||
| OUTPUT := $(O)/ | ||
| endif | ||
| endif | ||
|
|
||
| OBJS = main.o parse.o system.o benchmark.o | ||
| LIBS = -L../ -L$(OUTPUT) -lm -lcpupower | ||
|
|
||
| OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o | ||
| CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\" | ||
|
|
||
| %.o : %.c | ||
| $(OUTPUT)%.o : %.c | ||
| $(ECHO) " CC " $@ | ||
| $(QUIET) $(CC) -c $(CFLAGS) $< -o $@ | ||
|
|
||
| cpufreq-bench: $(OBJS) | ||
| $(OUTPUT)cpufreq-bench: $(OBJS) | ||
| $(ECHO) " CC " $@ | ||
| $(QUIET) $(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) | ||
|
|
||
| all: cpufreq-bench | ||
| all: $(OUTPUT)cpufreq-bench | ||
|
|
||
| install: | ||
| mkdir -p $(DESTDIR)/$(sbindir) | ||
| mkdir -p $(DESTDIR)/$(bindir) | ||
| mkdir -p $(DESTDIR)/$(docdir) | ||
| mkdir -p $(DESTDIR)/$(confdir) | ||
| install -m 755 cpufreq-bench $(DESTDIR)/$(sbindir)/cpufreq-bench | ||
| install -m 755 $(OUTPUT)cpufreq-bench $(DESTDIR)/$(sbindir)/cpufreq-bench | ||
| install -m 755 cpufreq-bench_plot.sh $(DESTDIR)/$(bindir)/cpufreq-bench_plot.sh | ||
| install -m 644 README-BENCH $(DESTDIR)/$(docdir)/README-BENCH | ||
| install -m 755 cpufreq-bench_script.sh $(DESTDIR)/$(docdir)/cpufreq-bench_script.sh | ||
| install -m 644 example.cfg $(DESTDIR)/$(confdir)/cpufreq-bench.conf | ||
|
|
||
| clean: | ||
| rm -f *.o | ||
| rm -f cpufreq-bench | ||
| rm -f $(OUTPUT)*.o | ||
| rm -f $(OUTPUT)cpufreq-bench |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,38 @@ | ||
| OUTPUT=./ | ||
| ifeq ("$(origin O)", "command line") | ||
| OUTPUT := $(O)/ | ||
| endif | ||
|
|
||
| DESTDIR = | ||
| bindir = /usr/bin | ||
|
|
||
| INSTALL = /usr/bin/install | ||
|
|
||
|
|
||
| default: all | ||
|
|
||
| centrino-decode: centrino-decode.c | ||
| $(CC) $(CFLAGS) -o centrino-decode centrino-decode.c | ||
| $(OUTPUT)centrino-decode: centrino-decode.c | ||
| $(CC) $(CFLAGS) -o $@ centrino-decode.c | ||
|
|
||
| dump_psb: dump_psb.c | ||
| $(CC) $(CFLAGS) -o dump_psb dump_psb.c | ||
| $(OUTPUT)dump_psb: dump_psb.c | ||
| $(CC) $(CFLAGS) -o $@ dump_psb.c | ||
|
|
||
| intel_gsic: intel_gsic.c | ||
| $(CC) $(CFLAGS) -o intel_gsic -llrmi intel_gsic.c | ||
| $(OUTPUT)intel_gsic: intel_gsic.c | ||
| $(CC) $(CFLAGS) -o $@ -llrmi intel_gsic.c | ||
|
|
||
| powernow-k8-decode: powernow-k8-decode.c | ||
| $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c | ||
| $(OUTPUT)powernow-k8-decode: powernow-k8-decode.c | ||
| $(CC) $(CFLAGS) -o $@ powernow-k8-decode.c | ||
|
|
||
| all: centrino-decode dump_psb intel_gsic powernow-k8-decode | ||
| all: $(OUTPUT)centrino-decode $(OUTPUT)dump_psb $(OUTPUT)intel_gsic $(OUTPUT)powernow-k8-decode | ||
|
|
||
| clean: | ||
| rm -rf centrino-decode dump_psb intel_gsic powernow-k8-decode | ||
| rm -rf $(OUTPUT){centrino-decode,dump_psb,intel_gsic,powernow-k8-decode} | ||
|
|
||
| install: | ||
| $(INSTALL) -d $(DESTDIR)${bindir} | ||
| $(INSTALL) $(OUTPUT)centrino-decode $(DESTDIR)${bindir} | ||
| $(INSTALL) $(OUTPUT)powernow-k8-decode $(DESTDIR)${bindir} | ||
| $(INSTALL) $(OUTPUT)dump_psb $(DESTDIR)${bindir} | ||
| $(INSTALL) $(OUTPUT)intel_gsic $(DESTDIR)${bindir} | ||
|
|
||
| .PHONY: all default clean | ||
| .PHONY: all default clean install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,30 @@ | ||
| OUTPUT=./ | ||
| ifeq ("$(origin O)", "command line") | ||
| OUTPUT := $(O)/ | ||
| endif | ||
|
|
||
| DESTDIR = | ||
| bindir = /usr/bin | ||
|
|
||
| INSTALL = /usr/bin/install | ||
|
|
||
|
|
||
| default: all | ||
|
|
||
| centrino-decode: ../i386/centrino-decode.c | ||
| $(OUTPUT)centrino-decode: ../i386/centrino-decode.c | ||
| $(CC) $(CFLAGS) -o $@ $< | ||
|
|
||
| powernow-k8-decode: ../i386/powernow-k8-decode.c | ||
| $(OUTPUT)powernow-k8-decode: ../i386/powernow-k8-decode.c | ||
| $(CC) $(CFLAGS) -o $@ $< | ||
|
|
||
| all: centrino-decode powernow-k8-decode | ||
| all: $(OUTPUT)centrino-decode $(OUTPUT)powernow-k8-decode | ||
|
|
||
| clean: | ||
| rm -rf centrino-decode powernow-k8-decode | ||
| rm -rf $(OUTPUT)centrino-decode $(OUTPUT)powernow-k8-decode | ||
|
|
||
| install: | ||
| $(INSTALL) -d $(DESTDIR)${bindir} | ||
| $(INSTALL) $(OUTPUT)centrino-decode $(DESTDIR)${bindir} | ||
| $(INSTALL) $(OUTPUT)powernow-k8-decode $(DESTDIR)${bindir} | ||
|
|
||
| .PHONY: all default clean | ||
| .PHONY: all default clean install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.