diff options
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/mic/Makefile | 1 | ||||
| -rw-r--r-- | Documentation/mic/mpssd/Makefile | 21 | ||||
| -rw-r--r-- | samples/mic/mpssd/.gitignore (renamed from Documentation/mic/mpssd/.gitignore) | 0 | ||||
| -rw-r--r-- | samples/mic/mpssd/Makefile | 27 | ||||
| -rwxr-xr-x | samples/mic/mpssd/micctrl (renamed from Documentation/mic/mpssd/micctrl) | 0 | ||||
| -rwxr-xr-x | samples/mic/mpssd/mpss (renamed from Documentation/mic/mpssd/mpss) | 0 | ||||
| -rw-r--r-- | samples/mic/mpssd/mpssd.c (renamed from Documentation/mic/mpssd/mpssd.c) | 0 | ||||
| -rw-r--r-- | samples/mic/mpssd/mpssd.h (renamed from Documentation/mic/mpssd/mpssd.h) | 0 | ||||
| -rw-r--r-- | samples/mic/mpssd/sysfs.c (renamed from Documentation/mic/mpssd/sysfs.c) | 0 |
10 files changed, 28 insertions, 23 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index f530c29..80b5bdc 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,2 +1,2 @@ subdir-y := accounting auxdisplay blackfin \ - laptops mic misc-devices pcmcia timers watchdog + laptops misc-devices pcmcia timers watchdog diff --git a/Documentation/mic/Makefile b/Documentation/mic/Makefile deleted file mode 100644 index a191d45..0000000 --- a/Documentation/mic/Makefile +++ /dev/null @@ -1 +0,0 @@ -subdir-y := mpssd diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile deleted file mode 100644 index 06871b0..0000000 --- a/Documentation/mic/mpssd/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -ifndef CROSS_COMPILE -# List of programs to build -hostprogs-$(CONFIG_X86_64) := mpssd - -mpssd-objs := mpssd.o sysfs.o - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS += -I$(objtree)/usr/include -I$(srctree)/tools/include - -ifdef DEBUG -HOSTCFLAGS += -DDEBUG=$(DEBUG) -endif - -HOSTLOADLIBES_mpssd := -lpthread - -install: - install mpssd /usr/sbin/mpssd - install micctrl /usr/sbin/micctrl -endif diff --git a/Documentation/mic/mpssd/.gitignore b/samples/mic/mpssd/.gitignore index 8b7c72f..8b7c72f 100644 --- a/Documentation/mic/mpssd/.gitignore +++ b/samples/mic/mpssd/.gitignore diff --git a/samples/mic/mpssd/Makefile b/samples/mic/mpssd/Makefile new file mode 100644 index 0000000..3e3ef91 --- /dev/null +++ b/samples/mic/mpssd/Makefile @@ -0,0 +1,27 @@ +ifndef CROSS_COMPILE +uname_M := $(shell uname -m 2>/dev/null || echo not) +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) + +ifeq ($(ARCH),x86) + +PROGS := mpssd +CC = $(CROSS_COMPILE)gcc +CFLAGS := -I../../../usr/include -I../../../tools/include + +ifdef DEBUG +CFLAGS += -DDEBUG=$(DEBUG) +endif + +all: $(PROGS) +mpssd: mpssd.c sysfs.c + $(CC) $(CFLAGS) mpssd.c sysfs.c -o mpssd -lpthread + +install: + install mpssd /usr/sbin/mpssd + install micctrl /usr/sbin/micctrl + +clean: + rm -fr $(PROGS) + +endif +endif diff --git a/Documentation/mic/mpssd/micctrl b/samples/mic/mpssd/micctrl index 8f2629b..8f2629b 100755 --- a/Documentation/mic/mpssd/micctrl +++ b/samples/mic/mpssd/micctrl diff --git a/Documentation/mic/mpssd/mpss b/samples/mic/mpssd/mpss index 5fcf9fa..5fcf9fa 100755 --- a/Documentation/mic/mpssd/mpss +++ b/samples/mic/mpssd/mpss diff --git a/Documentation/mic/mpssd/mpssd.c b/samples/mic/mpssd/mpssd.c index 49db1de..49db1de 100644 --- a/Documentation/mic/mpssd/mpssd.c +++ b/samples/mic/mpssd/mpssd.c diff --git a/Documentation/mic/mpssd/mpssd.h b/samples/mic/mpssd/mpssd.h index 8bd6494..8bd6494 100644 --- a/Documentation/mic/mpssd/mpssd.h +++ b/samples/mic/mpssd/mpssd.h diff --git a/Documentation/mic/mpssd/sysfs.c b/samples/mic/mpssd/sysfs.c index 8dd3269..8dd3269 100644 --- a/Documentation/mic/mpssd/sysfs.c +++ b/samples/mic/mpssd/sysfs.c |
