Make hciattach_qualcomm.c and hciattach_tialt.c behave the same way as hciattach_bcm43xx.c does, where FIRMWARE_DIR can be overridden at build time by using -DFIRMWARE_DIR= CFLAGS. Signed-off-by: Marek Vasut <marex@xxxxxxx> --- tools/hciattach.h | 4 ++++ tools/hciattach_bcm43xx.c | 4 ---- tools/hciattach_qualcomm.c | 3 ++- tools/hciattach_tialt.c | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/hciattach.h b/tools/hciattach.h index 26c0d5424..dfa4c1e7a 100644 --- a/tools/hciattach.h +++ b/tools/hciattach.h @@ -40,6 +40,10 @@ #define HCI_UART_EXT_CONFIG 4 #define HCI_UART_VND_DETECT 5 +#ifndef FIRMWARE_DIR +#define FIRMWARE_DIR "/etc/firmware" +#endif + int read_hci_event(int fd, unsigned char *buf, int size); int set_speed(int fd, struct termios *ti, int speed); int uart_speed(int speed); diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c index dbb5a3fe3..b89fc1b50 100644 --- a/tools/hciattach_bcm43xx.c +++ b/tools/hciattach_bcm43xx.c @@ -30,10 +30,6 @@ #include "hciattach.h" -#ifndef FIRMWARE_DIR -#define FIRMWARE_DIR "/etc/firmware" -#endif - #define FW_EXT ".hcd" #define BCM43XX_CLOCK_48 1 diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c index 77b6db170..d228aeec0 100644 --- a/tools/hciattach_qualcomm.c +++ b/tools/hciattach_qualcomm.c @@ -222,7 +222,8 @@ int qualcomm_init(int fd, int speed, struct termios *ti, const char *bdaddr) } while (resp[3] != 0 && resp[4] != 2); - snprintf(fw, sizeof(fw), "/etc/firmware/%c%c%c%c%c%c_%c%c%c%c.bin", + snprintf(fw, sizeof(fw), "%s/%c%c%c%c%c%c_%c%c%c%c.bin", + FIRMWARE_DIR, resp[18], resp[19], resp[20], resp[21], resp[22], resp[23], resp[32], resp[33], resp[34], resp[35]); diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c index 4f7fd42a3..bf6e84923 100644 --- a/tools/hciattach_tialt.c +++ b/tools/hciattach_tialt.c @@ -221,7 +221,8 @@ int texasalt_init(int fd, int speed, struct termios *ti) ((brf_chip > 7) ? "unknown" : c_brf_chip[brf_chip]), brf_chip); - sprintf(fw, "/etc/firmware/%s.bin", + sprintf(fw, "%s/%s.bin", + FIRMWARE_DIR, (brf_chip > 7) ? "unknown" : c_brf_chip[brf_chip]); texas_load_firmware(fd, fw); -- 2.35.1
