linux-libre: Build in ath9k_htc firmware

3 files changed, 6 insertions, 1 deletions

diff --git a/changelog b/changelog
index 203767a..a5af8fe 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ config-x60 (1.3) trunk
   * config-lilo: Use ProteanOS background image and clearer menu entry
     labels.
   * config-linux-libre-x60: New upstream version.
+  * config-linux-libre-dimension2400: Depend on open-ath9k-htc-firmware.
+  * config-linux-libre-dimension2400: Set CONFIG_EXTRA_FIRMWARE and
+    CONFIG_EXTRA_FIRMWARE_DIR to include ath9k_htc firmware.
 
  -- "P. J. McDermott" <pj@pehjota.net>  Tue, 11 Nov 2014 09:29:00 -0500
 
diff --git a/src/build/linux-libre/3.10.60~gnu/config b/src/build/linux-libre/3.10.60~gnu/config
index 25c7bf4..1a0fc63 100644
--- a/src/build/linux-libre/3.10.60~gnu/config
+++ b/src/build/linux-libre/3.10.60~gnu/config
@@ -1274,7 +1274,8 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_FIRMWARE="htc_7010.fw htc_9271.fw"
+CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
diff --git a/substvars b/substvars
index 37a81fc..dd2a7b6 100644
--- a/substvars
+++ b/substvars
@@ -1,2 +1,3 @@
 Config-Base-Depends: proteanos-branding, lilo
 Config-lilo-Depends: proteanos-branding-lilo
+Config-linux-libre-Depends: open-ath9k-htc-firmware