X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Ffw.c;h=a999e2d4a059eede39e7f59f71b10ce85619d7ff;hb=593709de14b8c10bce1164eeb22fa7b77a9e4bce;hp=8124588c731020bc2c48929593218aff5fedd60e;hpb=d7eb06db9a6f2a82ae3aacc8e01faacc53b370d9;p=carl9170fw.git

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index 8124588..a999e2d 100644
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -21,6 +21,7 @@
  */
 #include "carl9170.h"
 #include "fwdsc.h"
+#include "pattern_generator.h"
 
 #define FILL(small, big, more...)					\
 	.small = {							\
@@ -54,9 +55,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_
 #ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
 					BIT(CARL9170FW_COMMAND_CAM) |
 #endif /* CONFIG_CARL9170FW_SECURITY_ENGINE */
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 					BIT(CARL9170FW_WLANTX_CAB) |
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 #ifdef CONFIG_CARL9170FW_UNUSABLE
 					BIT(CARL9170FW_UNUSABLE) |
 #endif /* CONFIG_CARL9170FW_UNUSABLE */
@@ -103,7 +102,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_
 	     .release = CARL9170FW_VERSION_GIT),
 
 
-#ifdef CONFIG_CARL9170FW_RADAR
+#if defined(CARL9170FW_PATTERN_GENERATOR)
 	FILL(radar, RADAR,
 	     .soft_radar = cpu_to_le32(&fw.wlan.soft_radar),
 	     .num_radars = __CARL9170FW_NUM_RADARS,