Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/sys/arch/xen/conf Apply patch (requested by bouyer in tic...



details:   https://anonhg.NetBSD.org/src/rev/d6a081f5a4d4
branches:  netbsd-3
changeset: 577913:d6a081f5a4d4
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 29 21:18:29 2006 +0000

description:
Apply patch (requested by bouyer in ticket #1231):
Add support for ath at pci for XEN domain0.

diffstat:

 sys/arch/xen/conf/Makefile.xen |  18 +++++++++++++++++-
 sys/arch/xen/conf/files.xen    |   7 ++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r c2553d4f5c8b -r d6a081f5a4d4 sys/arch/xen/conf/Makefile.xen
--- a/sys/arch/xen/conf/Makefile.xen    Wed Mar 29 21:13:47 2006 +0000
+++ b/sys/arch/xen/conf/Makefile.xen    Wed Mar 29 21:18:29 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xen,v 1.5 2004/06/21 18:20:09 jmc Exp $
+#      $NetBSD: Makefile.xen,v 1.5.14.1 2006/03/29 21:18:29 tron Exp $
 #      NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -111,6 +111,22 @@
 
 %RULES
 
+# XXX - Ugly, but make doesn't easily handle .o.uue (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-elf.o)
+OBJS:=${OBJS:C/\/athhal-elf.o/athhal-elf.o/}
+ 
+.PATH: $S/../contrib/sys/arch/i386/dev
+ATH_UUDEC?=    @${_MKSHMSG} "uudecode ${.CURDIR:T}/${.TARGET}"; \
+               ${_MKSHECHO}\
+               ${UUDECODE} -p $> \> ${.TARGET}; \
+               rm -f ${.TARGET}; \
+               ${UUDECODE} -p $> > ${.TARGET}
+athhal-elf.o: athhal-elf-o.uue
+       ${ATH_UUDEC}
+.endif
+
 ##
 ## (9) port independent kernel machinery
 ##
diff -r c2553d4f5c8b -r d6a081f5a4d4 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Wed Mar 29 21:13:47 2006 +0000
+++ b/sys/arch/xen/conf/files.xen       Wed Mar 29 21:18:29 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.18.2.7 2006/01/05 05:28:11 riz Exp $
+#      $NetBSD: files.xen,v 1.18.2.8 2006/03/29 21:18:29 tron Exp $
 #      NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #      NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -159,6 +159,11 @@
 include "dev/pci/files.agp"
 file   arch/i386/pci/agp_machdep.c     agp
 file   arch/xen/xen/pciide_machdep.c   pciide_common
+
+# Atheros 5210/5211/5212 Hardware Abstraction Layer (HAL)
+include        "dev/pci/files.ath"
+object /athhal-elf.o   ath
+
 #
 # Machine-independent ISA devices
 #



Home | Main Index | Thread Index | Old Index