PERFORCE change 153711 for review

Sam Leffler sam at FreeBSD.org
Fri Nov 28 12:10:59 PST 2008


http://perforce.freebsd.org/chv.cgi?CH=153711

Change 153711 by sam at sam_ebb on 2008/11/28 20:10:57

	Shift build to use ath hal source code; still needs work as
	we plan to move the hal code directory and we may want to
	move some explicit paths out of files.
	
	Note this requires you overlay contrib/dev/ath with code from
	projects/ath_hal.

Affected files ...

.. //depot/projects/vap/sys/conf/files#54 edit
.. //depot/projects/vap/sys/conf/files.amd64#14 edit
.. //depot/projects/vap/sys/conf/files.arm#9 edit
.. //depot/projects/vap/sys/conf/files.i386#21 edit
.. //depot/projects/vap/sys/conf/files.mips#5 edit
.. //depot/projects/vap/sys/conf/files.pc98#15 edit
.. //depot/projects/vap/sys/conf/files.powerpc#18 edit
.. //depot/projects/vap/sys/conf/files.sparc64#13 edit
.. //depot/projects/vap/sys/conf/kern.pre.mk#11 edit
.. //depot/projects/vap/sys/conf/options#31 edit

Differences ...

==== //depot/projects/vap/sys/conf/files#54 (text+ko) ====

@@ -501,6 +501,186 @@
 dev/ata/atapi-fd.c		optional atapifd
 dev/ata/atapi-tape.c		optional atapist
 dev/ata/atapi-cam.c		optional atapicam
+#
+contrib/dev/ath/ah.c				optional ath_hal \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ah_eeprom_v1.c \
+	optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ah_eeprom_v3.c \
+	optional ath_hal_ar5211 | ath_hal_ar5212 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ah_eeprom_v14.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ah_regdomain.c			optional ath_hal \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_attach.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_beacon.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_interrupts.c	optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_keycache.c	optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_misc.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_phy.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_power.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_recv.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_reset.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5210/ar5210_xmit.c		optional ath_hal_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_attach.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_beacon.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_interrupts.c	optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_keycache.c	optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_misc.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_phy.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_power.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_recv.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_reset.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5211/ar5211_xmit.c		optional ath_hal_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_ani.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_attach.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_beacon.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_eeprom.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_gpio.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_interrupts.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_keycache.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_misc.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_phy.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_power.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_recv.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_reset.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_rfgain.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5212_xmit.c \
+	optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar2316.c \
+	optional ath_hal_rf2316 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar2317.c	 \
+	optional ath_hal_rf2317 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar2413.c	 \
+	optional ath_hal_rf2413 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar2425.c \
+	optional ath_hal_rf2425 | ath_hal_rf2417 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5111.c	 \
+	optional ath_hal_rf5111 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5112.c \
+	optional ath_hal_rf5112 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5212/ar5413.c \
+	optional ath_hal_rf5413 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar2133.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_ani.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_attach.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_beacon.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_cal.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_cal_iq.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_eeprom.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_gpio.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_interrupts.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_keycache.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_misc.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_phy.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_power.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_recv.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_reset.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar5416_xmit.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar9160_attach.c \
+	optional ath_hal_ar5416 | ath_hal_ar9160 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar9280.c \
+	optional ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
+contrib/dev/ath/ar5416/ar9280_attach.c \
+	optional ath_hal_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath"
 dev/ath/ah_osdep.c optional ath_hal \
 	compile-with "${NORMAL_C} -I$S/dev/ath"
 dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \

==== //depot/projects/vap/sys/conf/files.amd64#14 (text+ko) ====

@@ -47,16 +47,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-hal.o				optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/x86_64-elf.hal.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h"	\
-	compile-with	"rm -f opt_ah.h; cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"opt_ah.h"
-#
 nvenetlib.o			optional	nve pci			\
 	dependency	"$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu"	\
 	compile-with	"uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \

==== //depot/projects/vap/sys/conf/files.arm#9 (text+ko) ====

@@ -51,13 +51,6 @@
 geom/geom_bsd_enc.c		optional	geom_bsd
 geom/geom_mbr.c			optional	geom_mbr
 geom/geom_mbr_enc.c		optional	geom_mbr
-hal.o				optional	ath_hal		\
-	compile-with		"ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal		\
-	compile-with		"ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; rm -f opt_ah.h; cp $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend			\
-	clean		"opt_ah.h"
 libkern/arm/divsi3.S		standard
 libkern/arm/ffs.S		standard
 libkern/arm/muldi3.c		standard

==== //depot/projects/vap/sys/conf/files.i386#21 (text+ko) ====

@@ -46,16 +46,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-hal.o				optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/i386-elf.hal.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/i386-elf.opt_ah.h"	\
-	compile-with	"rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"opt_ah.h"
-#
 nvenetlib.o			optional	nve pci			\
 	dependency	"$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu"	\
 	compile-with	"uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \

==== //depot/projects/vap/sys/conf/files.mips#5 (text+ko) ====

@@ -75,13 +75,6 @@
 geom/geom_bsd_enc.c		optional	geom_bsd
 geom/geom_mbr.c			optional	geom_mbr
 geom/geom_mbr_enc.c		optional	geom_mbr
-hal.o				optional	ath_hal		\
-	compile-with		"ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal		\
-	compile-with		"ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; rm -f opt_ah.h; cp $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend			\
-	clean		"opt_ah.h"
 libkern/ashldi3.c		standard
 libkern/ashrdi3.c		standard
 libkern/divdi3.c		standard

==== //depot/projects/vap/sys/conf/files.pc98#15 (text+ko) ====

@@ -38,16 +38,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-hal.o				optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/i386-elf.hal.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/i386-elf.opt_ah.h"	\
-	compile-with	"rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"opt_ah.h"
-#
 compat/linprocfs/linprocfs.c	optional linprocfs
 compat/linsysfs/linsysfs.c	optional linsysfs
 compat/linux/linux_emul.c	optional compat_linux

==== //depot/projects/vap/sys/conf/files.powerpc#18 (text+ko) ====

@@ -14,16 +14,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean	"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 #
-hal.o				optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h"	\
-	compile-with	"rm -f opt_ah.h; cp $S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"opt_ah.h"
-#
 
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb

==== //depot/projects/vap/sys/conf/files.sparc64#13 (text+ko) ====

@@ -22,16 +22,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-hal.o				optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \
-	no-implicit-rule
-opt_ah.h			optional	ath_hal			\
-	dependency	"$S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h"	\
-	compile-with	"rm -f opt_ah.h; cp $S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h opt_ah.h" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"opt_ah.h"
-#
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/atkbdc/atkbd.c		optional	atkbd atkbdc

==== //depot/projects/vap/sys/conf/kern.pre.mk#11 (text+ko) ====

@@ -67,7 +67,7 @@
 INCLUDES+= -I$S/contrib/pf
 
 # ... and the same for Atheros HAL
-INCLUDES+= -I$S/dev/ath
+INCLUDES+= -I$S/dev/ath -I$S/contrib/dev/ath
 
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm

==== //depot/projects/vap/sys/conf/options#31 (text+ko) ====

@@ -740,6 +740,26 @@
 ATH_DIAGAPI		opt_ath.h
 ATH_TX99_DIAG		opt_ath.h
 
+# options for the Atheros hal
+AH_SUPPORT_AR5416	opt_ah.h
+AH_SUPPORT_AR9280	opt_ah.h
+AH_SUPPORT_AR9285	opt_ah.h
+AH_SUPPORT_2316		opt_ah.h
+AH_SUPPORT_2317		opt_ah.h
+
+AH_DEBUG		opt_ah.h
+AH_ASSERT		opt_ah.h
+AH_DEBUG_ALQ		opt_ah.h
+AH_REGOPS_FUNC		opt_ah.h
+AH_WRITE_REGDOMAIN	opt_ah.h
+AH_DEBUG_COUNTRY	opt_ah.h
+AH_DISABLE_WME		opt_ah.h
+AH_WRITE_EEPROM		opt_ah.h
+AH_PRIVATE_DIAG		opt_ah.h
+AH_NEED_DESC_SWAP	opt_ah.h
+AH_USE_INIPDGAIN	opt_ah.h
+AH_SUPPORT_11D		opt_ah.h
+
 # options for the Broadcom wireless driver
 BWI_DEBUG		opt_bwi.h
 BWI_DEBUG_VERBOSE	opt_bwi.h


More information about the p4-projects mailing list