diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-12 22:28:58 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-12 22:28:58 +0000 |
| commit | 76916314773594767275c8141049bed385aa6787 (patch) | |
| tree | 36275d28a4cc7ebb0321e148f8b07c7f87a5e2d2 | |
| parent | c7c483497958f11a1a7ed3e4788c3287d067db33 (diff) | |
Allow VPMADT032 and HPEC binary modules to be used on platforms where ARCH is set to the new 'generic' x86 flavor available in recent Linux kernel releases
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6609 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/Kbuild | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 1bfa63d..13948f0 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -66,25 +66,35 @@ endif dahdi-objs := dahdi-base.o ############################################################################### +# Find appropriate ARCH value for VPMADT032 and HPEC binary modules +############################################################################### + +ifeq ($(ARCH),i386) + DAHDI_ARCH=x86_32 +else ifeq ($(ARCH),x86_64) + DAHDI_ARCH=x86_64 +else ifeq ($(ARCH),x86) + ifeq ($(CONFIG_x86_32),y) + DAHDI_ARCH=x86_32 + else + DAHDI_ARCH=x86_64 + endif +else +$(warning CPU Architecture '$(ARCH)' does not support VPMADT032 or HPEC. Skipping.) +endif + +############################################################################### # VPMADT032 Loader ############################################################################### dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o -ifeq ($(ARCH),i386) - ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_x86_32.o_shipped),) +ifneq ($(DAHDI_ARCH),) + ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),) VPMADT032_LOADER_PRESENT=yes - dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_x86_32.o + dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o endif -else ifeq ($(ARCH),x86_64) - ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_x86_64.o_shipped),) - VPMADT032_LOADER_PRESENT=yes - dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_x86_64.o - obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o - endif -else -$(warning CPU Architecture '$(ARCH)' does not support VPMADT032 firmware downloader. Skipping.) endif ############################################################################### @@ -94,18 +104,11 @@ endif dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o CFLAGS_dahdi_echocan_hpec.o := -I$(src)/hpec -ifeq ($(ARCH),i386) - ifneq ($(wildcard $(src)/hpec/hpec_x86_32.o_shipped),) +ifneq ($(DAHDI_ARCH),) + ifneq ($(wildcard $(src)/hpec/hpec_$(DAHDI_ARCH).o_shipped),) HPEC_PRESENT=yes - dahdi_echocan_hpec-objs += hpec/hpec_x86_32.o + dahdi_echocan_hpec-objs += hpec/hpec_$(DAHDI_ARCH).o endif -else ifeq ($(ARCH),x86_64) - ifneq ($(wildcard $(src)/hpec/hpec_x86_64.o_shipped),) - HPEC_PRESENT=yes - dahdi_echocan_hpec-objs += hpec/hpec_x86_64.o - endif -else -$(warning CPU Architecture '$(ARCH)' does not support HPEC echo canceller. Skipping.) endif ifeq ($(HPEC_PRESENT),yes) |