X-Git-Url: https://jxself.org/git/?p=linux-libre-firmware.git;a=blobdiff_plain;f=Makefile;h=1a9ceb64fb74a232256f4ede0bda466d671efbee;hp=08b6ff83d2558bf63b8fa136647541db2231e46b;hb=4934781ab90052a6eaa286e2ade9c0f6c67e5abe;hpb=6e823d0b6ee854eaf5f0bf28a099a5e6b7c45be2

diff --git a/Makefile b/Makefile
index 08b6ff8..1a9ceb6 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
@@ -17,16 +17,19 @@ shell=/bin/sh
 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_firmware 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 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
 
@@ -54,13 +57,13 @@ cis-tools:
 dsp56k: a56
 	cd dsp56k && $(MAKE)
 
-ihex2fw: 
+ihex2fw:
 	cd ihex2fw && $(MAKE)
 
 isci:
 	cd isci && $(MAKE)
 
-keyspan_pda: ihex2fw
+keyspan_pda: ihex2fw as31
 	cd keyspan_pda && $(MAKE)
 
 openfwwf: b43-tools
@@ -73,6 +76,7 @@ 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
@@ -90,8 +94,11 @@ clean:
 	cd usbdux && $(MAKE) -f Makefile_dux clean
 
 install:
-	if [ -a ath9k_htc/target_firmware/build/k2/htc_9271.fw ]; then $(install_program) -D ath9k_htc/target_firmware/build/k2/htc_9271.fw $(prefix)/ath9k_htc/htc_9271.fw; fi;
-	if [ -a ath9k_htc/target_firmware/build/magpie/htc_7010.fw ]; then $(install_program) -D ath9k_htc/target_firmware/build/magpie/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 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 +121,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