Skip to content
Snippets Groups Projects
Commit e5fc70ae authored by Alexandre Abadie's avatar Alexandre Abadie
Browse files

makefiles: cleanup indentation

parent 2097f681
No related branches found
No related tags found
No related merge requests found
...@@ -5,9 +5,9 @@ DIST_FILES += $(BIN_USEMODULE:%=bin/$(BOARD)/%.a) ...@@ -5,9 +5,9 @@ DIST_FILES += $(BIN_USEMODULE:%=bin/$(BOARD)/%.a)
# if the file Makefile.distcheck exists, we're executing from within a folder # if the file Makefile.distcheck exists, we're executing from within a folder
# generated by "make bindist". # generated by "make bindist".
ifneq (, $(wildcard Makefile.distcheck)) ifneq (, $(wildcard Makefile.distcheck))
include Makefile.distcheck include Makefile.distcheck
else else
DIRS+=$(BIN_DIRS) DIRS+=$(BIN_DIRS)
endif endif
bindist: all bindist: all
......
...@@ -7,20 +7,20 @@ export HEXFILE = $(ELFFILE:.elf=.bin) ...@@ -7,20 +7,20 @@ export HEXFILE = $(ELFFILE:.elf=.bin)
# some arduino boards need to toggle the serial interface a little bit to get # some arduino boards need to toggle the serial interface a little bit to get
# them ready for flashing... # them ready for flashing...
ifneq (,$(BOSSA_ARDUINO_PREFLASH)) ifneq (,$(BOSSA_ARDUINO_PREFLASH))
OS := $(shell uname) OS := $(shell uname)
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
STTY_FLAG = -F STTY_FLAG = -F
else ifeq ($(OS),Darwin) else ifeq ($(OS),Darwin)
STTY_FLAG = -f STTY_FLAG = -f
endif endif
PREFLASHER ?= stty PREFLASHER ?= stty
PREFFLAGS ?= $(STTY_FLAG) $(PORT) raw ispeed 1200 ospeed 1200 cs8 -cstopb ignpar eol 255 eof 255 PREFFLAGS ?= $(STTY_FLAG) $(PORT) raw ispeed 1200 ospeed 1200 cs8 -cstopb ignpar eol 255 eof 255
FLASHDEPS += preflash FLASHDEPS += preflash
endif endif
# if we go with the default (BOSSA shipped with RIOT), we download and build # if we go with the default (BOSSA shipped with RIOT), we download and build
# the tool if not already done # the tool if not already done
ifeq ($(RIOTBASE)/dist/tools/bossa/bossac,$(FLASHER)) ifeq ($(RIOTBASE)/dist/tools/bossa/bossac,$(FLASHER))
FLASHDEPS += $(RIOTBASE)/dist/tools/bossa/bossac FLASHDEPS += $(RIOTBASE)/dist/tools/bossa/bossac
endif endif
...@@ -7,7 +7,7 @@ else ifeq ($(OS),Darwin) ...@@ -7,7 +7,7 @@ else ifeq ($(OS),Darwin)
endif endif
ifeq ($(PORT),) ifeq ($(PORT),)
$(info Warning: no PORT set!) $(info Warning: no PORT set!)
endif endif
export BAUD ?= 115200 export BAUD ?= 115200
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment