Merge branch 'master' of 192.168.24.200:ebalbekova/bt-67xx_universal_hw

Makefile.inc.stm32

@@ -18,7 +18,11 @@ LDFLAGS += -Wl,--undefined=uxTopUsedPriority	# openocd freertos support
 ASFLAGS = $(COMMONFLAGS)
 
 
-CROSS = arm-none-eabi
+#CROSS = arm-none-eabi
+CROSS ?= arm-none-eabi
+ifeq ($(shell uname -n),x220)
+CROSS = /opt/gcc-arm-none-eabi-7-2017-q4-major/bin/arm-none-eabi
+endif
 GCC = $(CROSS)-gcc
 AS = $(CROSS)-as
 SIZE = $(CROSS)-size