Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BSL: Change PYTHON value to python3 #1448

Merged
merged 2 commits into from Nov 26, 2020
Merged

BSL: Change PYTHON value to python3 #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
571799d
Change PYTHON value to python3
Nov 23, 2020
9566d6b
Call $(BSL) directly
Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
View file
Open in desktop
Expand Up @@ -50,7 +50,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES)

CPU_START_SOURCEFILES += fault-handlers.c $(TI_XXWARE_STARTUP_SRCS)

PYTHON = python
BSL_FLAGS += -e -w -v

ifdef PORT
Expand Down Expand Up @@ -89,7 +88,7 @@ ifeq ($(BOARD_SUPPORTS_BSL),1)
ifeq ($(wildcard $(BSL)), )
@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
else
$(PYTHON) $(BSL) $(BSL_FLAGS) $<
$(BSL) $(BSL_FLAGS) $<
endif
else
%.upload:
Expand Down
3 changes: 1 addition & 2 deletions arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
View file
Open in desktop
Expand Up @@ -146,7 +146,6 @@ include $(CONTIKI_CPU)/$(SUBFAMILY)/Makefile.$(SUBFAMILY)

################################################################################
### For the .upload make target
PYTHON = python
BSL_FLAGS += -e -w -v

ifdef PORT
Expand All @@ -160,7 +159,7 @@ ifeq ($(BOARD_SUPPORTS_BSL),1)
ifeq ($(wildcard $(BSL)), )
@echo "ERROR: Could not find the cc2538-bsl script. Did you run 'git submodule update --init' ?"
else
$(PYTHON) $(BSL) $(BSL_FLAGS) $<
$(BSL) $(BSL_FLAGS) $<
endif
else
%.upload:
Expand Down
3 changes: 1 addition & 2 deletions arch/platform/cc2538dk/Makefile.cc2538dk
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@ include $(CONTIKI_CPU)/Makefile.cc2538

MODULES += $(CONTIKI_NG_STORAGE_DIR)/cfs

PYTHON = python
BSL_FLAGS += -e -w -v

ifdef PORT
Expand All @@ -36,7 +35,7 @@ else
$(BUILD_DIR_BOARD)/$*.elf | grep -B1 LOAD | \
grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$5}' | \
sort -g | head -1))
$(PYTHON) $(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
$(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
endif

ifeq ($(HOST_OS),Darwin)
Expand Down
3 changes: 1 addition & 2 deletions arch/platform/openmote/Makefile.openmote
View file
Open in desktop
Expand Up @@ -28,7 +28,6 @@ include $(CONTIKI_CPU)/Makefile.cc2538

MODULES += $(CONTIKI_NG_STORAGE_DIR)/cfs

PYTHON = python
BSL_FLAGS += -e -w -v -b 450000

ifdef PORT
Expand All @@ -45,5 +44,5 @@ else
$(BUILD_DIR_BOARD)/$*.elf | grep -B1 LOAD | \
grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$5}' | \
sort -g | head -1))
$(PYTHON) $(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
$(BSL) $(BSL_FLAGS) $(BSL_ADDRESS_ARG) $<
endif
3 changes: 1 addition & 2 deletions arch/platform/zoul/Makefile.zoul
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@ ifeq ($(BOARD), remote)
override BOARD = remote-reva
endif

PYTHON = python
BSL_FLAGS += -e -w -v

BSL_SPEED ?= 460800
Expand Down Expand Up @@ -76,7 +75,7 @@ define UPLOAD_RULE
@BSL_ADDRESS=`$(OBJDUMP) -h $(BUILD_DIR_BOARD)/$$*.elf | grep -B1 LOAD | \
grep -Ev 'LOAD|\-\-' | awk '{print "0x" $$$$5}' | \
sort -g | head -1`; \
$(PYTHON) $(BSL) $(BSL_FLAGS) -b $(BSL_SPEED) -a $$$${BSL_ADDRESS} -p $(MOTE) $$<
$(BSL) $(BSL_FLAGS) -b $(BSL_SPEED) -a $$$${BSL_ADDRESS} -p $(MOTE) $$<
endef

### Create an upload rule for every MOTE connected
Expand Down