.

orrmany · orrmany · commit a8ff9e2c20b6 · 2020-12-04T20:36:57.000+01:00
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ LD_FILE      = $(SRC_PATH)/linker/$(MCU_SUB_VARIANT)_$(SD_NAME)_v$(word 1, $(sub
 MERGED_FNAME = $(OUTPUT_FILENAME)_$(SD_NAME)_$(SD_VERSION)
 
 GIT_VERSION = $(shell git describe --dirty --always --tags)
-GIT_SUBMODULE_VERSIONS = $(shell git submodule status | cut -d' ' -f3,4 | paste -s -d" " -)
+GIT_SUBMODULE_VERSIONS = $(shell git submodule status | cut -d" " -f3,4 | paste -s -d" " -)
 
 OUTPUT_FILENAME = $(BOARD)_bootloader-$(GIT_VERSION)
 
diff --git a/make.txt b/make.txt
@@ -0,0 +1,4 @@
+make GNU_INSTALL_ROOT="C:/Program Files (x86)/GNU Tools Arm Embedded/9 2019-q4-major/bin/"  NRFUTIL="C:\Users\G�bor\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.7_qbz5n2kfra8p0\LocalCache\local-packages\Python37\Scripts\adafruit-nrfutil" BOARD=feather_nrf52840_express_s340 V=1 SERIAL=COM4 dfu-flash
+
+
+make BOARD=feather_nrf52840_express all 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +make GNU_INSTALL_ROOT="C:/Program Files (x86)/GNU Tools Arm Embedded/9 2019-q4-major/bin/"  NRFUTIL="C:\Users\G�bor\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.7_qbz5n2kfra8p0\LocalCache\local-packages\Python37\Scripts\adafruit-nrfutil" BOARD=feather_nrf52840_express_s340 V=1 SERIAL=COM4 dfu-flash
++
++
 +make BOARD=feather_nrf52840_express all