carl9170 firmware: various small updates

 * remove outdated Kconfig option

 * fix carlu firmware location

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 262c2471ec65e476a536543d76988af856c4a7fa..4386ddb2da71d6b22c33afadebe70f8f3020defc 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -1,13 +1,7 @@
 menu "General"
 
-config CARL9170FW_MAKE_RELEASE
-       def_bool y
-       prompt "Update/Generate new release/revision files"
-
 config CARL9170FW_RELEASE_VERSION
        int
-       depends on CARL9170FW_MAKE_RELEASE
-       prompt "Major CARL9170 Firmware Revision"
        default 1
 
 menu "Selectable Hardware Options"

diff --git a/tools/carlu/CMakeLists.txt b/tools/carlu/CMakeLists.txt
index 2bd27391ea3a660303998350ed5d59f8149d1f21..0ea6a05d5050fc75acfa6c61a9be6870e2a66f1d 100644 (file)
--- a/tools/carlu/CMakeLists.txt
+++ b/tools/carlu/CMakeLists.txt
@@ -9,6 +9,7 @@ set(carlu_src src/debug.c src/cmd.c src/usb.c src/rx.c src/tx.c src/fw.c
              src/test.c src/main.c)
 
 add_definitions(-D_GNU_SOURCE ${USB-1.0_DEFINITIONS})
+add_definitions(-DCARLU_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
 
 include_directories(${SDL_INCLUDE_DIR} ${USB-1.0_INCLUDE_DIRS})
 

diff --git a/tools/carlu/src/usb.h b/tools/carlu/src/usb.h
index 4e897a163148308bcc9138b7338dc91b0a499351..6382780f1ae0fab1f96d00258604aaf170cd9511 100644 (file)
--- a/tools/carlu/src/usb.h
+++ b/tools/carlu/src/usb.h
@@ -45,7 +45,7 @@
 
 #define AR9170_TX_MAX_ACTIVE_URBS              8
 
-#define CARL9170_FIRMWARE_FILE "/lib/firmware/carl9170-1"
+#define CARL9170_FIRMWARE_FILE (CARLU_PATH "/../../carlfw/carl9170.fw")
 
 struct carlu;