From 572d04a79980dea1a0127d2f37f01c4450118a33 Mon Sep 17 00:00:00 2001
From: dron0gus <dron0gus@gmail.com>
Date: Wed, 10 Apr 2019 02:12:35 +0300
Subject: [PATCH] Some more include fixes for linux (#738)

* Some more include fixes for linux

* Pass cross-compile path through CROSS_COMPILE

* Lower-upper case conversion fixes for linux
---
 firmware/Makefile                                  | 7 +++++--
 firmware/config/boards/st_stm32f4/board.mk         | 4 ++--
 firmware/controllers/algo/engine_configuration.cpp | 2 +-
 firmware/controllers/engine_controller.cpp         | 2 +-
 firmware/controllers/sensors/ego.cpp               | 2 +-
 firmware/hw_layer/hip9011.h                        | 2 +-
 firmware/hw_layer/sensors/cj125.h                  | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/firmware/Makefile b/firmware/Makefile
index d444435380..fc6ee6eeb2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -310,8 +310,11 @@ INCDIR = $(CHIBIOS)/os/license \
 
 MCU  = cortex-m4
 
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
+ifeq ($(CROSS_COMPILE),)
+  TRGT = arm-none-eabi-
+else
+  TRGT = $(CROSS_COMPILE)
+endif
 CC   = $(TRGT)gcc
 CPPC = $(TRGT)g++
 # Enable loading with g++ only if you need C++ runtime support.
diff --git a/firmware/config/boards/st_stm32f4/board.mk b/firmware/config/boards/st_stm32f4/board.mk
index cd52bf6250..fc48186d0a 100644
--- a/firmware/config/boards/st_stm32f4/board.mk
+++ b/firmware/config/boards/st_stm32f4/board.mk
@@ -1,9 +1,9 @@
 # List of all the board related files.
-BOARDSRC = $(PROJECT_DIR)/config/boards/ST_STM32F4/board.c
+BOARDSRC = $(PROJECT_DIR)/config/boards/st_stm32f4/board.c
 BOARDSRC_CPP =
 
 # Required include directories
-BOARDINC = $(PROJECT_DIR)/config/boards/ST_STM32F4
+BOARDINC = $(PROJECT_DIR)/config/boards/st_stm32f4
 
 # MCU defines
 DDEFS += -DSTM32F407xx
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index ddaee41dd2..b6b3857315 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -96,7 +96,7 @@
 #endif
 
 #if EFI_HIP_9011 || defined(__DOXYGEN__)
-#include "HIP9011.h"
+#include "hip9011.h"
 #endif
 
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index cc735891a9..c50edc9a78 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -76,7 +76,7 @@
 #endif /* EFI_PROD_CODE */
 
 #if EFI_CJ125 || defined(__DOXYGEN__)
-#include "CJ125.h"
+#include "cj125.h"
 #endif
 
 #if defined(EFI_BOOTLOADER_INCLUDE_CODE) || defined(__DOXYGEN__)
diff --git a/firmware/controllers/sensors/ego.cpp b/firmware/controllers/sensors/ego.cpp
index c436fe5b24..2709426e18 100644
--- a/firmware/controllers/sensors/ego.cpp
+++ b/firmware/controllers/sensors/ego.cpp
@@ -18,7 +18,7 @@
 #include "cyclic_buffer.h"
 
 #if EFI_CJ125 || defined(__DOXYGEN__)
-#include "CJ125.h"
+#include "cj125.h"
 #endif /* EFI_CJ125 */
 
 EXTERN_ENGINE;
diff --git a/firmware/hw_layer/hip9011.h b/firmware/hw_layer/hip9011.h
index a120f4d8dc..e1750d7511 100644
--- a/firmware/hw_layer/hip9011.h
+++ b/firmware/hw_layer/hip9011.h
@@ -1,5 +1,5 @@
 /**
- * @file	HIP9011.h
+ * @file	hip9011.h
  * @brief	HIP9011/TPIC8101 driver
  *
  * @date Nov 27, 2013
diff --git a/firmware/hw_layer/sensors/cj125.h b/firmware/hw_layer/sensors/cj125.h
index edfe253f57..95cec3f0ea 100644
--- a/firmware/hw_layer/sensors/cj125.h
+++ b/firmware/hw_layer/sensors/cj125.h
@@ -1,5 +1,5 @@
 /*
- * @file CJ125.h
+ * @file cj125.h
  *
  * @date: Jul 17, 2016
  * @author Andrey Belomutskiy, (c) 2012-2018