carl9170: Update based on commit 370b7919114a02149088c482c8709cafb9bf7478 dated May...

[linux-libre-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index 4bcc6569b836fac24d0388f7987a35ba0c5ac6f8..122f659c13a83eda6d4bac50f2278378cc7467ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ all: ath9k_htc av7110 carl9170fw cis dsp56k isci keyspan_pda openfwwf usbdux
 
 a56:
        cd a56 && $(MAKE)
-       
+
 as31:
        cd as31 && ./configure && $(MAKE)
 
@@ -54,13 +54,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
@@ -90,8 +90,8 @@ 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/build/k2/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/build/magpie/htc_7010.fw $(prefix)/ath9k_htc/htc_7010.fw; fi;
+       if [ -a ath9k_htc/target_firmware/htc_9271.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_9271.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)/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 +114,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