Merge pull request #16 from im-tomu/small-fixes

Small fixes
im-tomu · Jan 9, 2017 · 87a1f0c · 87a1f0c
2 parents 3f48c85 + 954edfa
commit 87a1f0c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@
 *.i*86
 *.x86_64
 *.hex
+*.bin
 
 # Debug files
 *.dSYM/
@@ -38,7 +39,14 @@
 *.tar.gz
 *.tar.bz2
 
+# Extra files
+*.dump
+*.map
+*.d
+
 # External libraries
 Gecko_SDK
 gcc-arm-none-eabi-5_4-2016q2
 
+# Patched linker file
+tomu.ld
diff --git a/efm32hg-blinky/Makefile b/efm32hg-blinky/Makefile
@@ -125,14 +125,26 @@ clean:
 	@find Gecko_SDK -type f -name \*.o -delete
 	@rm -f *.o
 
+dist-clean:
+	make clean || true
+	rm -rf Gecko_SDK
+	rm tomu.ld
+
 deps:
-	@[ ! -d Gecko_SDK ] && git clone --depth 1 https://github.com/SiliconLabs/Gecko_SDK
-	@echo "Patching linker file to ${LSCRIPT}"
-	@patch -o tomu.ld Gecko_SDK/platform/Device/SiliconLabs/EFM32HG/Source/GCC/efm32hg.ld linker.patch
+	@if [ ! -d Gecko_SDK ]; then \
+		git clone --depth 1 https://github.com/SiliconLabs/Gecko_SDK --branch ${GECKO_SDK_REV}; \
+	fi
+	@if [ ! -f "${LSCRIPT}" ]; then \
+		echo "Patching linker file to ${LSCRIPT}"; \
+		patch -o ${LSCRIPT} Gecko_SDK/platform/Device/SiliconLabs/EFM32HG/Source/GCC/efm32hg.ld linker.patch; \
+	fi
+
+
 ################################################################################
 #
 # REAL TARGETS // COMMON
 #
+GECKO_SDK_REV = v5.0.0
 GECKO_A_SRC = Gecko_SDK/platform/Device/SiliconLabs/EFM32HG/Source/GCC/startup_efm32hg.S
 GECKO_C_SRC = $(shell [ -d Gecko_SDK ] && find Gecko_SDK/platform/emlib/src -name \*.c) \
 							Gecko_SDK/platform/Device/SiliconLabs/EFM32HG/Source/system_efm32hg.c \