diff options
author | Renato Botelho <renato@netgate.com> | 2016-08-08 13:19:03 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-08-08 13:19:03 -0300 |
commit | 63fe395613bf86f1aee2994bd82c69313ee22ab1 (patch) | |
tree | 56f909a8b2d06f37f28712f84a15c6deb029be30 /sys/conf/files | |
parent | 83f06da895bc5aefd60783a7919a54a6e4431e63 (diff) | |
parent | 2113444d0301d1afc9b8683a32969e80fea47895 (diff) | |
download | FreeBSD-src-63fe395613bf86f1aee2994bd82c69313ee22ab1.zip FreeBSD-src-63fe395613bf86f1aee2994bd82c69313ee22ab1.tar.gz |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/conf/files')
-rw-r--r-- | sys/conf/files | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files index 7982fd7..2b2650b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1732,7 +1732,7 @@ iwm3160fw.fwo optional iwm3160fw | iwmfw \ no-implicit-rule \ clean "iwm3160fw.fwo" iwm3160.fw optional iwm3160fw | iwmfw \ - dependency "$S/contrib/dev/iwm/iwm-3160-9.fw.uu" \ + dependency "$S/contrib/dev/iwm/iwm-3160-16.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm3160.fw" @@ -1746,7 +1746,7 @@ iwm7260fw.fwo optional iwm7260fw | iwmfw \ no-implicit-rule \ clean "iwm7260fw.fwo" iwm7260.fw optional iwm7260fw | iwmfw \ - dependency "$S/contrib/dev/iwm/iwm-7260-9.fw.uu" \ + dependency "$S/contrib/dev/iwm/iwm-7260-16.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm7260.fw" @@ -1760,10 +1760,24 @@ iwm7265fw.fwo optional iwm7265fw | iwmfw \ no-implicit-rule \ clean "iwm7265fw.fwo" iwm7265.fw optional iwm7265fw | iwmfw \ - dependency "$S/contrib/dev/iwm/iwm-7265-9.fw.uu" \ + dependency "$S/contrib/dev/iwm/iwm-7265-16.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwm7265.fw" +iwm8000Cfw.c optional iwm8000Cfw | iwmfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwm8000C.fw:iwm8000Cfw -miwm8000Cfw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwm8000Cfw.c" +iwm8000Cfw.fwo optional iwm8000Cfw | iwmfw \ + dependency "iwm8000C.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwm8000Cfw.fwo" +iwm8000C.fw optional iwm8000Cfw | iwmfw \ + dependency "$S/contrib/dev/iwm/iwm-8000C-16.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwm8000C.fw" dev/iwn/if_iwn.c optional iwn iwn1000fw.c optional iwn1000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \ |