From f3d4187104102344aff91ee5ddce4a780f5bf6ca Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Mon, 14 Feb 2011 23:45:01 +0100 Subject: [PATCH] carl9170 firmware: various small updates * remove outdated Kconfig option * fix carlu firmware location Signed-off-by: Christian Lamparter --- carlfw/Kconfig | 6 ------ tools/carlu/CMakeLists.txt | 1 + tools/carlu/src/usb.h | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/carlfw/Kconfig b/carlfw/Kconfig index 262c247..4386ddb 100644 --- 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 2bd2739..0ea6a05 100644 --- 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 4e897a1..6382780 100644 --- 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; -- 2.31.1