head	1.10;
access;
symbols
	RELENG_8_4:1.10.0.2
	RELENG_8_3_0_RELEASE:1.8.10.1.8.1
	RELENG_8_3:1.8.10.1.0.8
	RELENG_8_3_BP:1.8.10.1
	RELENG_7_4_0_RELEASE:1.8.14.1
	RELENG_8_2_0_RELEASE:1.8.10.1.6.1
	RELENG_7_4:1.8.0.14
	RELENG_7_4_BP:1.8
	RELENG_8_2:1.8.10.1.0.6
	RELENG_8_2_BP:1.8.10.1
	RELENG_8_1_0_RELEASE:1.8.10.1.4.1
	RELENG_8_1:1.8.10.1.0.4
	RELENG_8_1_BP:1.8.10.1
	RELENG_7_3_0_RELEASE:1.8.12.1
	RELENG_7_3:1.8.0.12
	RELENG_7_3_BP:1.8
	RELENG_8_0_0_RELEASE:1.8.10.1.2.1
	RELENG_8_0:1.8.10.1.0.2
	RELENG_8_0_BP:1.8.10.1
	RELENG_8:1.8.0.10
	RELENG_8_BP:1.8
	RELENG_7_2_0_RELEASE:1.8.8.1
	RELENG_7_2:1.8.0.8
	RELENG_7_2_BP:1.8
	RELENG_7_1_0_RELEASE:1.8.6.1
	RELENG_6_4_0_RELEASE:1.6.8.1.6.1
	RELENG_7_1:1.8.0.6
	RELENG_7_1_BP:1.8
	RELENG_6_4:1.6.8.1.0.6
	RELENG_6_4_BP:1.6.8.1
	RELENG_7_0_0_RELEASE:1.8
	RELENG_6_3_0_RELEASE:1.6.8.1
	RELENG_7_0:1.8.0.4
	RELENG_7_0_BP:1.8
	RELENG_6_3:1.6.8.1.0.4
	RELENG_6_3_BP:1.6.8.1
	RELENG_7:1.8.0.2
	RELENG_7_BP:1.8
	RELENG_6_2_0_RELEASE:1.6.8.1
	RELENG_6_2:1.6.8.1.0.2
	RELENG_6_2_BP:1.6.8.1
	RELENG_5_5_0_RELEASE:1.6
	RELENG_5_5:1.6.0.14
	RELENG_5_5_BP:1.6
	RELENG_6_1_0_RELEASE:1.6
	RELENG_6_1:1.6.0.12
	RELENG_6_1_BP:1.6
	RELENG_6_0_0_RELEASE:1.6
	RELENG_6_0:1.6.0.10
	RELENG_6_0_BP:1.6
	RELENG_6:1.6.0.8
	RELENG_6_BP:1.6
	RELENG_5_4_0_RELEASE:1.6
	RELENG_5_4:1.6.0.6
	RELENG_5_4_BP:1.6
	RELENG_4_11_0_RELEASE:1.3.6.1
	RELENG_4_11:1.3.6.1.0.6
	RELENG_4_11_BP:1.3.6.1
	RELENG_5_3_0_RELEASE:1.6
	RELENG_5_3:1.6.0.4
	RELENG_5_3_BP:1.6
	RELENG_5:1.6.0.2
	RELENG_5_BP:1.6
	RELENG_4_10_0_RELEASE:1.3.6.1
	RELENG_4_10:1.3.6.1.0.4
	RELENG_4_10_BP:1.3.6.1
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.2
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.3.6.1
	RELENG_4_9:1.3.6.1.0.2
	RELENG_4_9_BP:1.3.6.1
	RELENG_4:1.3.0.6
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.4
	RELENG_5_1_BP:1.3
	RELENG_5_0_0_RELEASE:1.3
	RELENG_5_0:1.3.0.2
	RELENG_5_0_BP:1.3
	KSE_MILESTONE_2:1.2
	KSE_PRE_MILESTONE_2:1.2;
locks; strict;
comment	@# @;


1.10
date	2010.11.12.20.55.14;	author jkim;	state dead;
branches
	1.10.2.1;
next	1.9;

1.9
date	2010.08.17.20.39.28;	author rpaulo;	state Exp;
branches;
next	1.8;

1.8
date	2006.10.19.05.55.09;	author ru;	state Exp;
branches
	1.8.2.1
	1.8.6.1
	1.8.8.1
	1.8.10.1
	1.8.12.1
	1.8.14.1;
next	1.7;

1.7
date	2006.09.06.14.23.40;	author ru;	state Exp;
branches;
next	1.6;

1.6
date	2004.04.13.13.43.11;	author des;	state Exp;
branches
	1.6.8.1;
next	1.5;

1.5
date	2003.11.01.00.18.29;	author njl;	state Exp;
branches;
next	1.4;

1.4
date	2003.10.29.03.30.45;	author iwasaki;	state Exp;
branches;
next	1.3;

1.3
date	2002.05.01.21.54.07;	author peter;	state Exp;
branches
	1.3.6.1;
next	1.2;

1.2
date	2001.09.04.15.46.32;	author iwasaki;	state Exp;
branches;
next	1.1;

1.1
date	2001.07.20.06.07.31;	author takawata;	state Exp;
branches;
next	;

1.10.2.1
date	2010.11.12.20.55.14;	author svnexp;	state dead;
branches;
next	1.10.2.2;

1.10.2.2
date	2013.03.28.13.05.06;	author svnexp;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.08.06.22;	author svnexp;	state Exp;
branches;
next	;

1.8.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.8.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.8.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.8.10.1.2.1
	1.8.10.1.4.1
	1.8.10.1.6.1
	1.8.10.1.8.1;
next	1.8.10.2;

1.8.10.2
date	2012.11.17.10.36.50;	author svnexp;	state Exp;
branches;
next	;

1.8.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.8.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.8.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.8.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.8.10.1.8.2;

1.8.10.1.8.2
date	2012.11.17.08.25.27;	author svnexp;	state Exp;
branches;
next	;

1.8.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.8.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.8.14.2;

1.8.14.2
date	2012.11.17.08.17.22;	author svnexp;	state Exp;
branches;
next	;

1.6.8.1
date	2006.10.22.19.51.49;	author ru;	state Exp;
branches
	1.6.8.1.6.1;
next	1.6.8.2;

1.6.8.2
date	2012.11.17.07.43.50;	author svnexp;	state Exp;
branches;
next	;

1.6.8.1.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.3.6.1
date	2003.08.22.20.49.21;	author jhb;	state Exp;
branches;
next	1.3.6.2;

1.3.6.2
date	2012.11.17.07.26.05;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.10
log
@SVN rev 215200 on 2010-11-12 20:55:14Z by jkim

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.
@
text
@# $FreeBSD: src/sys/i386/acpica/Makefile,v 1.9 2010/08/17 20:39:28 rpaulo Exp $

# 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>
@


1.10.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:06 +0000
@
text
@d1 30
@


1.10.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 30
# $FreeBSD: releng/8.4/sys/i386/acpica/Makefile 199583 2009-11-20 15:27:52Z jhb $

# 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} == "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>
@


1.9
log
@SVN rev 211437 on 2010-08-17 20:39:28Z by rpaulo

For every instance of '.if ${CC} == "foo"' or '.if ${CC} != "foo"' in
Makefiles or *.mk files, use ${CC:T:Mfoo} instead, so only the basename
of the compiler command (excluding any arguments) is considered.

This allows you to use, for example, CC="/nondefault/path/clang -xxx",
and still have the various tests in bsd.*.mk identify your compiler as
clang correctly.

ICC if cases were also changed.

Submitted by:	Dimitry Andric <dimitry at andric.com>
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.8
log
@Add missing acpi_wakecode.o: assym.s dependency, so that if assym.s
is newer than acpi_wakecode.h, the latter is rebuilt.

Reported by:	bde
@
text
@d12 1
a12 1
.if ${CC} == "icc"
@


1.8.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/i386/acpica/Makefile 163498 2006-10-19 05:55:09Z ru $
@


1.8.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.8.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/i386/acpica/Makefile 163498 2006-10-19 05:55:09Z ru $
@


1.8.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.8.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.8.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/i386/acpica/Makefile 199583 2009-11-20 15:27:52Z jhb $
@


1.8.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.8.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/i386/acpica/Makefile 199583 2009-11-20 15:27:52Z jhb $
@


1.8.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.8.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.8.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.8.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.8.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7
log
@Refine previous revision to allow acpi_wakecode.h to be safely built
from both the acpi module build directory and a kernel build directory.
The latter didn't work when one attempted to build a kernel which had
"device acpi" with the "make kernel-toolchain buildkernel" command
because a cross-compiler couldn't find anything in the standard system
include path (it's empty in the kernel-toolchain case).

Fix this by passing a better root path to kernel headers (src/sys)
which works for both cases, kernel and module (-I@@ only worked for
module).

Also, while here, pass -nostdinc (and a different spelling for icc) --
it's a feature that the kernel source tree is self-contained, and this
change enforces this.

Reported by:	glebius
@
text
@d22 1
a22 1
acpi_wakecode.o: acpi_wakecode.S
@


1.6
log
@Use headers from the kernel source tree rather than installed headers.

Submitted by:	ru
@
text
@d12 7
a18 1
CFLAGS+=	-I. -I@@
@


1.6.8.1
log
@MFC: 1.7: Fix standalone build of the kernel with "device acpi".
     1.8: Add missing acpi_wakecode.o: assym.s dependency.

Approved by:	re (hrs)
@
text
@d12 1
a12 7
.if ${CC} == "icc"
CFLAGS+=	-restrict
NOSTDINC=	-X
.else
NOSTDINC=	-nostdinc
.endif
CFLAGS+=	${NOSTDINC} -I. -I${MAKESRCPATH}/../..
d16 1
a16 1
acpi_wakecode.o: acpi_wakecode.S assym.s
@


1.6.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/i386/acpica/Makefile 163612 2006-10-22 19:51:49Z ru $
@


1.6.8.1.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.5
log
@Change the reset video option to be positive (hw.acpi.reset_video).
Requested by:	jhb

Initialize the real mode stack.  This is needed at least for the return
address from the lcall.
Requested by:	takawata

Fix style bugs in acpi_wakecode.S
Requested by:	bde

Remove the kernel option now that we have the tunable.
@
text
@d12 1
a12 1
CFLAGS+=	-I.
@


1.4
log
@Add kernel option ACPI_NO_RESET_VIDEO as workaround for problems
(e.g. LCD white-out after resume) on some machine cased by
re-initialize video BIOS code in acpi_wakecode.
@
text
@a13 4
.ifdef ACPI_NO_RESET_VIDEO
CFLAGS+=	-DACPI_NO_RESET_VIDEO
.endif

a24 1

@


1.3
log
@Try using genwakecode.sh instead of the perl version.
@
text
@d14 4
@


1.3.6.1
log
@MFC: FreeBSD OSPM ACPI driver.  Note that this driver does not include
support for PCI interrupt routing or enumeration of ISA bridges or
Host to PCI bridges.  While functional on some machines, this driver
should be considered experimental and should be tested prior to being
deployed in a production environment.

Sponsored by:	The Weather Channel
@
text
@@


1.3.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/i386/acpica/Makefile 119325 2003-08-22 20:49:21Z jhb $
@


1.2
log
@Add `-I.' option to CFLAGS so that we can compile asm code together
with `-nostdinc' option.
@
text
@d1 1
a1 1
# $FreeBSD: src/sys/i386/acpica/Makefile,v 1.1 2001/07/20 06:07:31 takawata Exp $
d22 1
a22 1
	perl ${MAKESRCPATH}/genwakecode.pl > acpi_wakecode.h
@


1.1
log
@Add ACPI S2-S4BIOS Suspend/Resume code.
Some problems may remain.

Reviewed by:iwasaki
@
text
@d1 1
a1 1
# $FreeBSD$
d12 1
@

