[svn-commits] kpfleming: linux/trunk r4379 - in /linux/trunk: build_tools/ drivers/dahdi/ d...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Jun 17 16:00:58 CDT 2008 

Author: kpfleming
Date: Tue Jun 17 16:00:58 2008
New Revision: 4379

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4379
Log:
get non-hotplug firmware building working again

Added:
    linux/trunk/drivers/dahdi/firmware/make_firmware_object.in
      - copied, changed from r4378, linux/trunk/build_tools/make_firmware_object.in
Removed:
    linux/trunk/build_tools/make_firmware_object.in
Modified:
    linux/trunk/drivers/dahdi/   (props changed)
    linux/trunk/drivers/dahdi/firmware/   (props changed)
    linux/trunk/drivers/dahdi/firmware/Makefile
    linux/trunk/drivers/dahdi/wctc4xxp/Kbuild
    linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild
    linux/trunk/drivers/dahdi/wcte12xp/Kbuild

Propchange: linux/trunk/drivers/dahdi/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Jun 17 16:00:58 2008
@@ -1,1 +1,1 @@
-oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR49-00/software
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR49-01/software

Propchange: linux/trunk/drivers/dahdi/firmware/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 17 16:00:58 2008
@@ -1,3 +1,4 @@
 *.tar.gz
 *.bin
 *.o
+make_firmware_object

Modified: linux/trunk/drivers/dahdi/firmware/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/firmware/Makefile?view=diff&rev=4379&r1=4378&r2=4379
==============================================================================
--- linux/trunk/drivers/dahdi/firmware/Makefile (original)
+++ linux/trunk/drivers/dahdi/firmware/Makefile Tue Jun 17 16:00:58 2008
@@ -12,8 +12,6 @@
 #
 
 .PHONY: dist-clean all uninstall have_download install
-
--include ../menuselect.makeopts ../makeopts
 
 PWD:=$(shell pwd)
 
@@ -24,20 +22,22 @@
 
 FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases
 
+ALL_FIRMWARE="FIRMWARE-OCT6114-064 FIRMWARE-OCT6114-128 FIRMWARE-TC400M FIRMWARE-VPMADT032"
+
 # Firmware files should use the naming convention: dahdi-fw-<base name>-<sub name>-<version> or dahdi-fw-<base name>-<version>
 # First example: dahdi-fw-oct6114-064-1.05.01
-# This means this is version 1.05.01 of the oct6114 64 firmware
+# This means this is version 1.05.01 of the oct6114-064 firmware
 # 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=dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz)
+FIRMWARE:=$(ALL_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=dahdi-fw-oct6114-064.o)
+OBJECT_FILES:=$(ALL_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)
@@ -158,6 +158,7 @@
 dist-clean: clean
 	rm -f dahdi-fw-*.bin
 	rm -f dahdi-fw-*.tar.gz
+	rm -f make_firmware_object
 
 # Clean up anything we built
 clean:
@@ -180,22 +181,28 @@
 		rm -f $(DESTDIR)/lib/firmware/.dahdi-fw*; \
 	fi
 
+make_firmware_object: make_firmware_object.in ../dahdi-base.o
+	@export BFDNAME=`LANG=C objdump -f ../dahdi-base.o | grep -e "dahdi-base.o:" | sed "s/.*file format \(.*\)/\1/"`; \
+	 export BFDARCH=`LANG=C objdump -f ../dahdi-base.o | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`; \
+	 sed -e s/BFDNAME/$${BFDNAME}/ -e s/BFDARCH/$${BFDARCH}/ $< > $@
+	@chmod +x $@
+
 # Build object file of an oct6114 064 firmware image for linking
-dahdi-fw-oct6114-064.o: dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz dahdi-fw-oct6114-064.bin
+dahdi-fw-oct6114-064.o: dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz dahdi-fw-oct6114-064.bin make_firmware_object
 	@echo Making firmware object file for dahdi-fw-oct6114-064.bin
-	../build_tools/make_firmware_object dahdi-fw-oct6114-064.bin $@
+	./make_firmware_object dahdi-fw-oct6114-064.bin $@
 
 # Build object file of an oct6114 128 firmware image for linking
-dahdi-fw-oct6114-128.o: dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz dahdi-fw-oct6114-128.bin
+dahdi-fw-oct6114-128.o: dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz dahdi-fw-oct6114-128.bin make_firmware_object
 	@echo Making firmware object file for dahdi-fw-oct6114-128.bin
-	../build_tools/make_firmware_object dahdi-fw-oct6114-128.bin $@
+	./make_firmware_object dahdi-fw-oct6114-128.bin $@
 
 # Build object file of a TC400M firmware image for linking
-dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin
+dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin make_firmware_object
 	@echo Making firmware object file for dahdi-fw-tc400m.bin
-	../build_tools/make_firmware_object dahdi-fw-tc400m.bin $@
+	./make_firmware_object dahdi-fw-tc400m.bin $@
 
 # Build object file of a VPMADT032 firmware image for linking
-dahdi-fw-vpmadt032.o: dahdi-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz dahdi-fw-vpmadt032.bin
+dahdi-fw-vpmadt032.o: dahdi-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz dahdi-fw-vpmadt032.bin make_firmware_object
 	@echo Making firmware object file for dahdi-fw-vpmadt032.bin
-	../build_tools/make_firmware_object dahdi-fw-vpmadt032.bin $@
+	./make_firmware_object dahdi-fw-vpmadt032.bin $@

Copied: linux/trunk/drivers/dahdi/firmware/make_firmware_object.in (from r4378, linux/trunk/build_tools/make_firmware_object.in)
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/firmware/make_firmware_object.in?view=diff&rev=4379&p1=linux/trunk/build_tools/make_firmware_object.in&r1=4378&p2=linux/trunk/drivers/dahdi/firmware/make_firmware_object.in&r2=4379
==============================================================================
--- linux/trunk/build_tools/make_firmware_object.in (original)
+++ linux/trunk/drivers/dahdi/firmware/make_firmware_object.in Tue Jun 17 16:00:58 2008
@@ -5,7 +5,4 @@
 #   1 - firmware file
 #   2 - output file
 
-bfdname=@BDFNAME@
-bfdarch=@BDFARCH@
-
-objcopy -I binary ${1} -B ${bfdarch} -O ${bfdname} ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly
+objcopy -I binary ${1} -B BFDARCH -O BFDNAME ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly

Modified: linux/trunk/drivers/dahdi/wctc4xxp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/Kbuild?view=diff&rev=4379&r1=4378&r2=4379
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/Kbuild Tue Jun 17 16:00:58 2008
@@ -1,6 +1,6 @@
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp.o
 
-FIRM_DIR	:= ../../firmware
+FIRM_DIR	:= ../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild?view=diff&rev=4379&r1=4378&r2=4379
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/Kbuild Tue Jun 17 16:00:58 2008
@@ -1,6 +1,6 @@
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp.o
 
-FIRM_DIR	:= ../../firmware
+FIRM_DIR	:= ../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
 

Modified: linux/trunk/drivers/dahdi/wcte12xp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/Kbuild?view=diff&rev=4379&r1=4378&r2=4379
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/Kbuild Tue Jun 17 16:00:58 2008
@@ -1,6 +1,6 @@
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp.o
 
-FIRM_DIR	:= ../../firmware
+FIRM_DIR	:= ../firmware
 
 EXTRA_CFLAGS := -I$(src)/.. -Wno-undef

More information about the svn-commits mailing list