Merge branch 'master' into radar

[carl9170fw.git] / carlfw / src / fw.c

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index 8f0b33e6b8b6065bef73a5a5c33d6cc1c6dcd860..8124588c731020bc2c48929593218aff5fedd60e 100644 (file)
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -66,6 +66,9 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_
 #ifdef CONFIG_CARL9170FW_WOL
                                        BIT(CARL9170FW_WOL) |
 #endif /* CONFIG_CARL9170FW_WOL */
+#ifdef CONFIG_CARL9170FW_RADAR
+                                       BIT(CARL9170FW_RADAR_PATTERN_GENERATOR) |
+#endif /* CONFIG_CARL9170FW_RADAR */
                                        (0)),
 
             .miniboot_size = cpu_to_le16(0),
@@ -91,7 +94,6 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_
        ),
 #endif /* CONFIG_CARL9170FW_WOL */
 
-
        FILL(motd, MOTD,
             .fw_year_month_day = cpu_to_le32(
                        CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
@@ -100,6 +102,15 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_
             .desc = "Community AR9170 Linux",
             .release = CARL9170FW_VERSION_GIT),
 
+
+#ifdef CONFIG_CARL9170FW_RADAR
+       FILL(radar, RADAR,
+            .soft_radar = cpu_to_le32(&fw.wlan.soft_radar),
+            .num_radars = __CARL9170FW_NUM_RADARS,
+            .radars = { /* filled by the fwprepare tool */ },
+       ),
+#endif /* CONFIG_CARL9170FW_RADAR */
+
        FILL(dbg, DBG,
             .bogoclock_addr = cpu_to_le32(0),
             .counter_addr = cpu_to_le32(&fw.counter),