Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
e5fc70ae
Commit
e5fc70ae
authored
7 years ago
by
Alexandre Abadie
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: cleanup indentation
parent
2097f681
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
makefiles/bindist.inc.mk
+2
-2
2 additions, 2 deletions
makefiles/bindist.inc.mk
makefiles/tools/bossa.inc.mk
+10
-10
10 additions, 10 deletions
makefiles/tools/bossa.inc.mk
makefiles/tools/serial.inc.mk
+1
-1
1 addition, 1 deletion
makefiles/tools/serial.inc.mk
with
13 additions
and
13 deletions
makefiles/bindist.inc.mk
+
2
−
2
View file @
e5fc70ae
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
makefiles/tools/bossa.inc.mk
+
10
−
10
View file @
e5fc70ae
...
@@ -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
This diff is collapsed.
Click to expand it.
makefiles/tools/serial.inc.mk
+
1
−
1
View file @
e5fc70ae
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment