diff options
author | jkim <jkim@FreeBSD.org> | 2010-11-12 20:55:14 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2010-11-12 20:55:14 +0000 |
commit | 72feb3913ec09b0f61b90759628f79e92b2ea450 (patch) | |
tree | 4f33c44dc55bbc3996ed2121f95ae8596cc707de /sys/i386 | |
parent | 48df378ef02b15bdfd95a140fae980fd92745a0c (diff) | |
download | FreeBSD-src-72feb3913ec09b0f61b90759628f79e92b2ea450.zip FreeBSD-src-72feb3913ec09b0f61b90759628f79e92b2ea450.tar.gz |
MFamd64: (based on) r209957
Move logic of building ACPI headers for acpi_wakeup.c into better places,
remove intermediate makefile and shell script, and reduce diff between i386
and amd64.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/acpica/Makefile | 30 | ||||
-rw-r--r-- | sys/i386/acpica/acpi_wakecode.S | 2 | ||||
-rw-r--r-- | sys/i386/acpica/acpi_wakeup.c | 1 | ||||
-rw-r--r-- | sys/i386/acpica/genwakecode.sh | 11 |
4 files changed, 1 insertions, 43 deletions
diff --git a/sys/i386/acpica/Makefile b/sys/i386/acpica/Makefile deleted file mode 100644 index 87061d6..0000000 --- a/sys/i386/acpica/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -# Correct path for kernel builds -# Don't rely on the kernel's .depend file -.ifdef MAKESRCPATH -.PATH: ${MAKESRCPATH} -DEPENDFILE= -.else -MAKESRCPATH= ${.CURDIR} -CLEANFILES= acpi_wakecode.h acpi_wakecode.bin acpi_wakecode.o -.endif -.if ${CC:T:Micc} == "icc" -CFLAGS+= -restrict -NOSTDINC= -X -.else -NOSTDINC= -nostdinc -.endif -CFLAGS+= ${NOSTDINC} -I. -I${MAKESRCPATH}/../.. - -all: acpi_wakecode.h - -acpi_wakecode.o: acpi_wakecode.S assym.s - -acpi_wakecode.bin: acpi_wakecode.o - objcopy -S -O binary acpi_wakecode.o acpi_wakecode.bin - -acpi_wakecode.h: acpi_wakecode.bin acpi_wakecode.o - sh ${MAKESRCPATH}/genwakecode.sh > acpi_wakecode.h - -.include <bsd.prog.mk> diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S index 889a58a..e23b138 100644 --- a/sys/i386/acpica/acpi_wakecode.S +++ b/sys/i386/acpica/acpi_wakecode.S @@ -27,8 +27,6 @@ * $FreeBSD$ */ -#define LOCORE - #include <machine/asmacros.h> #include <machine/specialreg.h> diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 2397d80..6a46447 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <dev/acpica/acpivar.h> #include "acpi_wakecode.h" +#include "acpi_wakedata.h" /* Make sure the code is less than one page and leave room for the stack. */ CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024); diff --git a/sys/i386/acpica/genwakecode.sh b/sys/i386/acpica/genwakecode.sh deleted file mode 100644 index caffbf8..0000000 --- a/sys/i386/acpica/genwakecode.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# -file2c 'static char wakecode[] = {' '};' <acpi_wakecode.bin - -nm -n --defined-only acpi_wakecode.o | while read offset dummy what -do - echo "#define ${what} 0x${offset}" -done - -exit 0 |