Module Name: src
Committed By: snj
Date: Fri Aug 7 18:33:49 UTC 2009
Modified Files:
src/sys/arch/alpha/conf [netbsd-5]: Makefile.alpha
src/sys/arch/amd64/conf [netbsd-5]: Makefile.amd64
src/sys/arch/i386/conf [netbsd-5]: Makefile.i386
src/sys/arch/macppc/conf [netbsd-5]: Makefile.macppc
src/sys/arch/mips/conf [netbsd-5]: Makefile.mips
src/sys/arch/sparc64/conf [netbsd-5]: Makefile.sparc64
src/sys/arch/xen/conf [netbsd-5]: Makefile.xen
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #905):
sys/arch/alpha/conf/Makefile.alpha: revision 1.81
sys/arch/amd64/conf/Makefile.amd64: revision 1.26
sys/arch/i386/conf/Makefile.i386: revision 1.162
sys/arch/macppc/conf/Makefile.macppc: revision 1.31
sys/arch/mips/conf/Makefile.mips: revision 1.52
sys/arch/sparc64/conf/Makefile.sparc64: revision 1.68
sys/arch/xen/conf/Makefile.xen: revision 1.28
Clean-up makefile stub used to include in the build the binary HAL object
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.4.1 src/sys/arch/alpha/conf/Makefile.alpha
cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.159 -r1.159.4.1 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.29 -r1.29.14.1 src/sys/arch/macppc/conf/Makefile.macppc
cvs rdiff -u -r1.50 -r1.50.20.1 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.67 -r1.67.4.1 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/arch/xen/conf/Makefile.xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/conf/Makefile.alpha
diff -u src/sys/arch/alpha/conf/Makefile.alpha:1.80 src/sys/arch/alpha/conf/Makefile.alpha:1.80.4.1
--- src/sys/arch/alpha/conf/Makefile.alpha:1.80 Sat Oct 25 22:27:36 2008
+++ src/sys/arch/alpha/conf/Makefile.alpha Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.alpha,v 1.80 2008/10/25 22:27:36 apb Exp $
+# $NetBSD: Makefile.alpha,v 1.80.4.1 2009/08/07 18:33:48 snj Exp $
# Makefile for NetBSD
#
@@ -93,9 +93,6 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
##
## (9) port independent kernel machinery
##
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.25 src/sys/arch/amd64/conf/Makefile.amd64:1.25.2.1
--- src/sys/arch/amd64/conf/Makefile.amd64:1.25 Thu Oct 30 20:07:01 2008
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.25 2008/10/30 20:07:01 joerg Exp $
+# $NetBSD: Makefile.amd64,v 1.25.2.1 2009/08/07 18:33:48 snj Exp $
# Makefile for NetBSD
#
@@ -99,31 +99,9 @@
%LOAD
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-.include "$S/arch/x86/acpi/Makefile.wakecode.inc"
-# XXX - Ugly, but make doesn't easily handle .o.uu (assumes it's a suffix)
-# XXX - Also, config has no simple was to just add foo.o to the Makefile.
-# It needs a pathname of some sort for "object"
-.if !empty(OBJS:M\/athhal.o)
-OBJS:=${OBJS:C/\/athhal.o/athhal.o/}
-
-.PATH: $S/contrib/dev/ath/public
-ATH_UUDEC?= @${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
- ${_MKSHECHO}\
- ${UUDECODE} -p $> \> ${.TARGET}; \
- rm -f ${.TARGET}; \
- ${UUDECODE} -p $> > ${.TARGET}
-
-athhal.o: x86_64-elf.hal.o.uu
- ${ATH_UUDEC}
-.if defined(COPTS) && !empty(COPTS:M-fno-asynchronous-unwind-tables)
- ${_MKSHECHO}\
- ${OBJCOPY} -R .eh_frame $@
- ${OBJCOPY} -R .eh_frame $@
-.endif
-.endif
+## Include rules for ACPI wakecode
+.include "$S/arch/x86/acpi/Makefile.wakecode.inc"
##
## (9) port independent kernel machinery
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.159 src/sys/arch/i386/conf/Makefile.i386:1.159.4.1
--- src/sys/arch/i386/conf/Makefile.i386:1.159 Sun Oct 26 06:56:39 2008
+++ src/sys/arch/i386/conf/Makefile.i386 Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.159 2008/10/26 06:56:39 mrg Exp $
+# $NetBSD: Makefile.i386,v 1.159.4.1 2009/08/07 18:33:48 snj Exp $
# Makefile for NetBSD
#
@@ -117,8 +117,7 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
+## Include rules for ACPI wakecode
.include "$S/arch/x86/acpi/Makefile.wakecode.inc"
##
Index: src/sys/arch/macppc/conf/Makefile.macppc
diff -u src/sys/arch/macppc/conf/Makefile.macppc:1.29 src/sys/arch/macppc/conf/Makefile.macppc:1.29.14.1
--- src/sys/arch/macppc/conf/Makefile.macppc:1.29 Sat Mar 1 13:59:26 2008
+++ src/sys/arch/macppc/conf/Makefile.macppc Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.macppc,v 1.29 2008/03/01 13:59:26 joerg Exp $
+# $NetBSD: Makefile.macppc,v 1.29.14.1 2009/08/07 18:33:48 snj Exp $
#
# Makefile for NetBSD
#
@@ -118,9 +118,6 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
##
## (9) port independent kernel machinery
##
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.50 src/sys/arch/mips/conf/Makefile.mips:1.50.20.1
--- src/sys/arch/mips/conf/Makefile.mips:1.50 Mon Feb 18 15:21:04 2008
+++ src/sys/arch/mips/conf/Makefile.mips Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.50 2008/02/18 15:21:04 tsutsui Exp $
+# $NetBSD: Makefile.mips,v 1.50.20.1 2009/08/07 18:33:48 snj Exp $
# Makefile for NetBSD
#
@@ -122,9 +122,6 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
##
## (9) port independent kernel machinery
##
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.67 src/sys/arch/sparc64/conf/Makefile.sparc64:1.67.4.1
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.67 Sat Aug 30 13:23:55 2008
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.67 2008/08/30 13:23:55 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.67.4.1 2009/08/07 18:33:48 snj Exp $
#=========================================================================
#
@@ -143,9 +143,6 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
##
## (9) port independent kernel machinery
##
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.27 src/sys/arch/xen/conf/Makefile.xen:1.27.2.1
--- src/sys/arch/xen/conf/Makefile.xen:1.27 Thu Oct 30 20:07:20 2008
+++ src/sys/arch/xen/conf/Makefile.xen Fri Aug 7 18:33:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.27 2008/10/30 20:07:20 joerg Exp $
+# $NetBSD: Makefile.xen,v 1.27.2.1 2009/08/07 18:33:48 snj Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -140,9 +140,6 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
##
## (9) port independent kernel machinery
##
