diff options
author | jkim <jkim@FreeBSD.org> | 2010-07-12 21:08:35 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2010-07-12 21:08:35 +0000 |
commit | b18b82b9f3c4cb4f6de6100618d5e454862ea5fc (patch) | |
tree | 7e5eea41970307d5954d4f124e550d863ca7c074 /sys/amd64 | |
parent | bb5074f0c37b5e76b0f7455a4c03892fc7902fa6 (diff) | |
download | FreeBSD-src-b18b82b9f3c4cb4f6de6100618d5e454862ea5fc.zip FreeBSD-src-b18b82b9f3c4cb4f6de6100618d5e454862ea5fc.tar.gz |
Move i386-inherited logic of building ACPI headers for acpi_wakeup.c into
better places and remove intermediate makefile and shell scripts. This
makes parallel kernel build little bit safer for amd64.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/acpica/Makefile | 33 | ||||
-rw-r--r-- | sys/amd64/acpica/acpi_wakecode.S | 2 | ||||
-rwxr-xr-x | sys/amd64/acpica/genwakecode.sh | 6 | ||||
-rwxr-xr-x | sys/amd64/acpica/genwakedata.sh | 9 |
4 files changed, 0 insertions, 50 deletions
diff --git a/sys/amd64/acpica/Makefile b/sys/amd64/acpica/Makefile deleted file mode 100644 index 7437280..0000000 --- a/sys/amd64/acpica/Makefile +++ /dev/null @@ -1,33 +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_wakedata.h acpi_wakecode.bin acpi_wakecode.o -.endif -.if ${CC} == "icc" -CFLAGS+= -restrict -NOSTDINC= -X -.else -NOSTDINC= -nostdinc -.endif -CFLAGS+= ${NOSTDINC} -include opt_global.h -I. -I${MAKESRCPATH}/../.. - -all: acpi_wakecode.h acpi_wakedata.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 - sh ${MAKESRCPATH}/genwakecode.sh > acpi_wakecode.h - -acpi_wakedata.h: acpi_wakecode.bin - sh ${MAKESRCPATH}/genwakedata.sh > acpi_wakedata.h - -.include <bsd.prog.mk> diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S index 94a34f7..c8dfc38 100644 --- a/sys/amd64/acpica/acpi_wakecode.S +++ b/sys/amd64/acpica/acpi_wakecode.S @@ -29,8 +29,6 @@ * $FreeBSD$ */ -#define LOCORE - #include <machine/asmacros.h> #include <machine/specialreg.h> diff --git a/sys/amd64/acpica/genwakecode.sh b/sys/amd64/acpica/genwakecode.sh deleted file mode 100755 index c9d0077..0000000 --- a/sys/amd64/acpica/genwakecode.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# -file2c -sx 'static char wakecode[] = {' '};' <acpi_wakecode.bin - -exit 0 diff --git a/sys/amd64/acpica/genwakedata.sh b/sys/amd64/acpica/genwakedata.sh deleted file mode 100755 index 6d4181e..0000000 --- a/sys/amd64/acpica/genwakedata.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# -nm -n --defined-only acpi_wakecode.o | while read offset dummy what -do - echo "#define ${what} 0x${offset}" -done - -exit 0 |