Skip to content
Snippets Groups Projects
Commit 7a2cc4ae authored by Oleg Hahm's avatar Oleg Hahm
Browse files

minor changes:

* renamed terminal program variable
* added terminal program for MSB-430 platforms
* changed default JTAG for MSB-430 platforms from uif to olimex
parent d8994062
No related branches found
No related tags found
No related merge requests found
...@@ -13,12 +13,14 @@ export LINK = $(PREFIX)gcc ...@@ -13,12 +13,14 @@ export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o export LINKFLAGS = -mmcu=$(MCU) -lgcc $(RIOTBASE)/bin/startup.o
TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export FLASHER = mspdebug export FLASHER = mspdebug
ifeq ($(strip $(PORT)),) ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0 export PORT = /dev/ttyUSB0
endif endif
export HEXFILE = bin/$(PROJECT).hex export HEXFILE = bin/$(PROJECT).hex
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)" #export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
export FFLAGS = -j olimex "prog $(HEXFILE)"
export USEMODULE += msp430_common export USEMODULE += msp430_common
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ export INCLUDES += -I $(RIOTCPU)/msp430-common/include/
...@@ -13,7 +13,7 @@ export LINK = $(PREFIX)gcc ...@@ -13,7 +13,7 @@ export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy export OBJCOPY = $(PREFIX)objcopy
FLASHER = lpc2k_pgm FLASHER = lpc2k_pgm
TERM = $(RIOTBASE)/dist/tools/pyterm/pyterm.py TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x
ifeq ($(strip $(PORT)),) ifeq ($(strip $(PORT)),)
......
...@@ -5,6 +5,7 @@ export ARCH = msba2_base.a ...@@ -5,6 +5,7 @@ export ARCH = msba2_base.a
DEP = $(SRC:%.c=$(BINDIR)%.d) DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -I$(RIOTBOARD)/msba2/include/
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/ INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/ INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/ INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment