From 69b6516332b2f6ee082802e9196d92cdd316a0a7 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 19 May 2009 13:59:54 +0200 Subject: [PATCH] ath(4) HAL: Adjust/fix a few build related things. * Fix building with MODULES_WITH_WORLD. * Add AH_SUPPORT_AR5416 option to the options file. * Remove unneeded opt_ah.h file which gets generated. --- sys/conf/options | 3 +++ sys/dev/netif/ath/hal/Makefile | 4 +++- sys/dev/netif/ath/hal/opt_ah.h | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 sys/dev/netif/ath/hal/opt_ah.h diff --git a/sys/conf/options b/sys/conf/options index 34965eb9b6..4105cb6014 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -613,6 +613,9 @@ ATH_DIAGAPI opt_ath.h ATH_RXBUF opt_ath.h ATH_TXBUF opt_ath.h +# ...and its HAL +AH_SUPPORT_AR5416 opt_ah.h + # bce driver BCE_DEBUG opt_bce.h BCE_NVRAM_WRITE_SUPPORT opt_bce.h diff --git a/sys/dev/netif/ath/hal/Makefile b/sys/dev/netif/ath/hal/Makefile index cde8fbaf21..e81564c5a9 100644 --- a/sys/dev/netif/ath/hal/Makefile +++ b/sys/dev/netif/ath/hal/Makefile @@ -109,7 +109,9 @@ SRCS+= ar2133.c CFLAGS+= -I. -I${HAL} +.if !defined(BUILDING_WITH_KERNEL) opt_ah.h: - echo '#define AH_SUPPORT_AR5416 1' > $@ + echo '#define AH_SUPPORT_AR5416 1' > opt_ah.h +.endif .include diff --git a/sys/dev/netif/ath/hal/opt_ah.h b/sys/dev/netif/ath/hal/opt_ah.h deleted file mode 100644 index 41bc951f6e..0000000000 --- a/sys/dev/netif/ath/hal/opt_ah.h +++ /dev/null @@ -1 +0,0 @@ -#define AH_SUPPORT_AR5416 1 -- 2.41.0