From 49a66e309c5c7564027efa4cf823fac6b374a751 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 22 May 2008 11:35:33 +0000 Subject: fix up all remaining references to zaptel/zapata (except for the ones in credits that need to be left alone) git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4324 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- firmware/Makefile | 146 +++++++++++++++++++++++++------------------------- firmware/firmware.xml | 18 ------- 2 files changed, 73 insertions(+), 91 deletions(-) delete mode 100644 firmware/firmware.xml (limited to 'firmware') diff --git a/firmware/Makefile b/firmware/Makefile index 9c0e126..03a9560 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,9 +1,9 @@ # -# Zaptel +# DAHDI # # Makefile for firmware downloading/installation # -# Copyright (C) 2007, Digium, Inc. +# Copyright (C) 2007-2008, Digium, Inc. # # Joshua Colp # @@ -24,23 +24,23 @@ VPMADT032_VERSION:=1.07 FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases -# Firmware files should use the naming convention: zaptel-fw--- or zaptel-fw-- -# First example: zaptel-fw-oct6114-064-1.05.01 +# Firmware files should use the naming convention: dahdi-fw--- or dahdi-fw-- +# First example: dahdi-fw-oct6114-064-1.05.01 # This means this is version 1.05.01 of the oct6114 64 firmware -# Second example: zaptel-fw-tc400m-MR5.6 +# Second example: dahdi-fw-tc400m-MR5.6 # This means this is version MR5.6 of the tc400m firmware # Build a list of firmware package filenames we need -FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz) -FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz) -FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz) -FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz) +FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz) +FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz) +FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz) +FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMADT032=dahdi-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz) # Build a list of object files if hotplug will not be used -OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.o) -OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.o) -OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.o) -OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032.o) +OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064.o) +OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128.o) +OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=dahdi-fw-tc400m.o) +OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=dahdi-fw-vpmadt032.o) # If "fetch" is used, --continue is not a valid option. ifeq ($(WGET),wget) @@ -62,106 +62,106 @@ have_download: fi # Download and extract firmware tarballs -zaptel-fw-oct6114-064-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-oct6114-064-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-oct6114-064.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-oct6114-064.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)" + @echo "Firmware dahdi-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)" endif -zaptel-fw-oct6114-128-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-oct6114-128-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-oct6114-128.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-oct6114-128.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" + @echo "Firmware dahdi-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" endif -zaptel-fw-tc400m-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-tc400m-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-tc400m.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-tc400m.bin is already installed with required version $(TC400M_VERSION)" + @echo "Firmware dahdi-fw-tc400m.bin is already installed with required version $(TC400M_VERSION)" endif -zaptel-fw-vpmadt032-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-vpmadt032-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-vpmadt032.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-vpmadt032.bin is already installed with required version $(VPMADT032_VERSION)" + @echo "Firmware dahdi-fw-vpmadt032.bin is already installed with required version $(VPMADT032_VERSION)" endif # Clean up any downloaded/extracted firmware packages dist-clean: clean - rm -f zaptel-fw-*.bin - rm -f zaptel-fw-*.tar.gz + rm -f dahdi-fw-*.bin + rm -f dahdi-fw-*.tar.gz # Clean up anything we built clean: - rm -f zaptel-fw-*.o + rm -f dahdi-fw-*.o # Create object files suitable for linking against object-build: $(FIRMWARE) $(OBJECT_FILES) @@ -169,33 +169,33 @@ object-build: $(FIRMWARE) $(OBJECT_FILES) # Install all downloaded firmware images for hotplug usage and build headers for inclusion hotplug-install: $(FIRMWARE) -# Uninstall any installed zaptel firmware images from hotplug firmware directories +# Uninstall any installed dahdi firmware images from hotplug firmware directories hotplug-uninstall: if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - rm -f $(DESTDIR)/usr/lib/hotplug/firmware/zaptel-fw-*.bin; \ - rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw*; \ + rm -f $(DESTDIR)/usr/lib/hotplug/firmware/dahdi-fw-*.bin; \ + rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw*; \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - rm -f $(DESTDIR)/lib/firmware/zaptel-fw-*.bin; \ - rm -f $(DESTDIR)/lib/firmware/.zaptel-fw*; \ + rm -f $(DESTDIR)/lib/firmware/dahdi-fw-*.bin; \ + rm -f $(DESTDIR)/lib/firmware/.dahdi-fw*; \ fi # Build object file of an oct6114 064 firmware image for linking -zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz zaptel-fw-oct6114-064.bin - @echo Making firmware object file for zaptel-fw-oct6114-064.bin - ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ +dahdi-fw-oct6114-064.o: dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz dahdi-fw-oct6114-064.bin + @echo Making firmware object file for dahdi-fw-oct6114-064.bin + ../build_tools/make_firmware_object dahdi-fw-oct6114-064.bin $@ # Build object file of an oct6114 128 firmware image for linking -zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz zaptel-fw-oct6114-128.bin - @echo Making firmware object file for zaptel-fw-oct6114-128.bin - ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ +dahdi-fw-oct6114-128.o: dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz dahdi-fw-oct6114-128.bin + @echo Making firmware object file for dahdi-fw-oct6114-128.bin + ../build_tools/make_firmware_object dahdi-fw-oct6114-128.bin $@ # Build object file of a TC400M firmware image for linking -zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz zaptel-fw-tc400m.bin - @echo Making firmware object file for zaptel-fw-tc400m.bin - ../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@ +dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin + @echo Making firmware object file for dahdi-fw-tc400m.bin + ../build_tools/make_firmware_object dahdi-fw-tc400m.bin $@ # Build object file of a VPMADT032 firmware image for linking -zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz zaptel-fw-vpmadt032.bin - @echo Making firmware object file for zaptel-fw-vpmadt032.bin - ../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@ +dahdi-fw-vpmadt032.o: dahdi-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz dahdi-fw-vpmadt032.bin + @echo Making firmware object file for dahdi-fw-vpmadt032.bin + ../build_tools/make_firmware_object dahdi-fw-vpmadt032.bin $@ diff --git a/firmware/firmware.xml b/firmware/firmware.xml deleted file mode 100644 index cedafd1..0000000 --- a/firmware/firmware.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - yes - wct4xxp - - - yes - wct4xxp - - - yes - wctc4xxp - - - yes - wctdm24xxp - - -- cgit v1.2.3