X-Git-Url: https://jxself.org/git/?p=linux-libre-firmware.git;a=blobdiff_plain;f=Makefile;h=5e38d940642e3072f5063301f439814a87ff996e;hp=8190e875dd9d2bad607639b14a1e752c227971c0;hb=a4d24e3a224a19404bc3ac98389ff376198c85ef;hpb=0d806d75ff1d1afb81118beea51691d5e90fb506

diff --git a/Makefile b/Makefile
index 8190e87..5e38d94 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 Jason Self <j@jxself.org>
+# Copyright (C) 2017, 2018 Jason Self <j@jxself.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,26 +13,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-shell=/bin/sh
+shell=/bin/bash
 prefix=/lib/firmware
 install_program=install
 
-.PHONY:	all test clean install a56 as31 ath9k_htc_toolchain ath9k_htc_firmware av7110 b43-tools carl9170fw-toolchain carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux
+.PHONY:	all test clean install a56 as31 aica ath9k_htc_toolchain ath9k_htc atusb av7110 b43-tools carl9170fw-toolchain carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux
 
-all: ath9k_htc av7110 carl9170fw cis dsp56k isci keyspan_pda openfwwf usbdux
+all: aica ath9k_htc atusb av7110 carl9170fw cis dsp56k isci keyspan_pda openfwwf usbdux
 
 a56:
 	cd a56 && $(MAKE)
-	
+
 as31:
 	cd as31 && ./configure && $(MAKE)
 
+aica:
+	cd aica/arm && $(MAKE)
+
 ath9k_htc_toolchain:
 	cd ath9k_htc && $(MAKE) toolchain
 
 ath9k_htc: ath9k_htc_toolchain
 	cd ath9k_htc && $(MAKE) -C target_firmware
 
+atusb:
+	cd atusb && $(MAKE) atusb.dfu
+
 av7110:
 	cd av7110 && $(MAKE)
 
@@ -54,7 +60,7 @@ cis-tools:
 dsp56k: a56
 	cd dsp56k && $(MAKE)
 
-ihex2fw: 
+ihex2fw:
 	cd ihex2fw && $(MAKE)
 
 isci:
@@ -73,10 +79,12 @@ test:
 	@echo This function is not implemented.
 
 clean:
+	cd aica/arm && $(MAKE) clean
 	cd a56 && $(MAKE) clean
 	if [ -a as31/Makefile ]; then cd as31 && $(MAKE) clean; fi;
 	cd ath9k_htc && $(MAKE) toolchain-clean
 	cd ath9k_htc && $(MAKE) -C target_firmware clean
+	cd atusb && $(MAKE) clean
 	cd av7110 && $(MAKE) clean
 	cd carl9170fw/toolchain && $(MAKE) clean
 	if [ -a carl9170fw/Makefile ]; then cd carl9170fw && $(MAKE) clean; fi;
@@ -90,8 +98,12 @@ clean:
 	cd usbdux && $(MAKE) -f Makefile_dux clean
 
 install:
-	if [ -a ath9k_htc/target_firmware/htc_9271.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_9271.fw $(prefix)/ath9k_htc/htc_9271.fw; fi;
-	if [ -a ath9k_htc/target_firmware/htc_7010.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_7010.fw $(prefix)/ath9k_htc/htc_7010.fw; fi;
+	if [ -a aica/arm/aica_firmware.bin ]; then $(install_program) -D aica/arm/aica_firmware.bin $(prefix)/aica_firmware.bin; fi;
+	if [ -a ath9k_htc/target_firmware/htc_9271.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_9271.fw $(prefix)/ath9k_htc/htc_9271-1.4.0.fw && \
+		ln -s ath9k_htc/htc_9271-1.4.0.fw $(prefix)/htc_9271.fw; fi;
+	if [ -a ath9k_htc/target_firmware/htc_7010.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_7010.fw $(prefix)/ath9k_htc/htc_7010-1.4.0.fw && \
+		ln -s ath9k_htc/htc_7010-1.4.0.fw $(prefix)/htc_7010.fw; fi;
+	if [ -a atusb/atusb.dfu ]; then $(install_program) -D atusb/atusb.dfu $(prefix)/atusb/atusb.dfu; fi;
 	if [ -a av7110/bootcode.bin ]; then $(install_program) -D av7110/bootcode.bin $(prefix)/av7110/bootcode.bin; fi;
 	if [ -a cis/3CCFEM556.cis ]; then $(install_program) -D cis/3CCFEM556.cis $(prefix)/cis/3CCFEM556.cis; fi;
 	if [ -a cis/3CXEM556.cis ]; then $(install_program) -D cis/3CXEM556.cis $(prefix)/cis/3CXEM556.cis; fi;
@@ -114,9 +126,9 @@ install:
 	if [ -a isci/isci_firmware.bin ]; then $(install_program) -D isci/isci_firmware.bin $(prefix)/isci/isci_firmware.bin; fi
 	if [ -a keyspan_pda/keyspan_pda.fw ]; then $(install_program) -D isci/isci_firmware.bin $(prefix)/keyspan_pda/keyspan_pda.fw; fi
 	if [ -a keyspan_pda/keyspan_pda.fw ]; then $(install_program) -D isci/isci_firmware.bin $(prefix)/keyspan_pda/xircom_pgs.fw; fi
-	if [ -a openfwwf/ucode5.fw ]; then $(install_program) -D openfwwf/ucode5.fw $(prefix)/b43/ucode5.fw; fi
-	if [ -a openfwwf/b0g0bsinitvals5.fw ]; then $(install_program) -D openfwwf/b0g0bsinitvals5.fw $(prefix)/b43/b0g0bsinitvals5.fw; fi
-	if [ -a openfwwf/b0g0initvals5.fw ]; then $(install_program) -D openfwwf/b0g0initvals5.fw $(prefix)/b43/b0g0initvals5.fw; fi
+	if [ -a openfwwf/ucode5.fw ]; then $(install_program) -D openfwwf/ucode5.fw $(prefix)/b43-open/ucode5.fw; fi
+	if [ -a openfwwf/b0g0bsinitvals5.fw ]; then $(install_program) -D openfwwf/b0g0bsinitvals5.fw $(prefix)/b43-open/b0g0bsinitvals5.fw; fi
+	if [ -a openfwwf/b0g0initvals5.fw ]; then $(install_program) -D openfwwf/b0g0initvals5.fw $(prefix)/b43-open/b0g0initvals5.fw; fi
 	if [ -a usbdux/usbduxfast_firmware.bin ]; then $(install_program) -D usbdux/usbduxfast_firmware.bin $(prefix)/usbduxfast_firmware.bin; fi
 	if [ -a usbdux/usbdux_firmware.bin ]; then $(install_program) -D usbdux/usbdux_firmware.bin $(prefix)/usbdux_firmware.bin; fi
-	if [ -a usbdux/usbduxsigma_firmware.bin ]; then $(install_program) -D usbdux/usbduxsigma_firmware.bin $(prefix)/usbduxsigma_firmware.bin; fi
\ No newline at end of file
+	if [ -a usbdux/usbduxsigma_firmware.bin ]; then $(install_program) -D usbdux/usbduxsigma_firmware.bin $(prefix)/usbduxsigma_firmware.bin; fi