Skip to content

Commit a414199

Browse files
committed
ports/nrf: Update Makefile and README.md after moving port to new directory
1 parent 831759f commit a414199

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

ports/nrf/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
1515
ifeq ($(SD), )
1616
# If the build directory is not given, make it reflect the board name.
1717
BUILD ?= build-$(BOARD)
18-
include ../py/mkenv.mk
18+
include ../../py/mkenv.mk
1919
include boards/$(BOARD)/mpconfigboard.mk
2020
else
2121
# If the build directory is not given, make it reflect the board name.
2222
BUILD ?= build-$(BOARD)-$(SD_LOWER)
23-
include ../py/mkenv.mk
23+
include ../../py/mkenv.mk
2424
include boards/$(BOARD)/mpconfigboard_$(SD_LOWER).mk
2525

2626
include drivers/bluetooth/bluetooth_common.mk
@@ -32,21 +32,21 @@ QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
3232
FROZEN_MPY_DIR = freeze
3333

3434
# include py core make definitions
35-
include ../py/py.mk
35+
include ../../py/py.mk
3636

3737

3838
FATFS_DIR = lib/oofatfs
39-
MPY_CROSS = ../mpy-cross/mpy-cross
40-
MPY_TOOL = ../tools/mpy-tool.py
39+
MPY_CROSS = ../../mpy-cross/mpy-cross
40+
MPY_TOOL = ../../tools/mpy-tool.py
4141

4242
CROSS_COMPILE = arm-none-eabi-
4343

4444
MCU_VARIANT_UPPER = $(shell echo $(MCU_VARIANT) | tr '[:lower:]' '[:upper:]')
4545

4646
INC += -I.
47-
INC += -I..
47+
INC += -I../..
4848
INC += -I$(BUILD)
49-
INC += -I./../lib/cmsis/inc
49+
INC += -I./../../lib/cmsis/inc
5050
INC += -I./device
5151
INC += -I./device/$(MCU_VARIANT)
5252
INC += -I./hal
@@ -56,7 +56,7 @@ INC += -I./modules/ubluepy
5656
INC += -I./modules/music
5757
INC += -I./modules/random
5858
INC += -I./modules/ble
59-
INC += -I../lib/mp-readline
59+
INC += -I../../lib/mp-readline
6060
INC += -I./drivers/bluetooth
6161
INC += -I./drivers
6262

@@ -288,5 +288,5 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
288288
CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
289289
endif
290290

291-
include ../py/mkrules.mk
291+
include ../../py/mkrules.mk
292292

ports/nrf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Prerequisite steps for building the nrf port:
4545
git submodule update --init
4646
make -C mpy-cross
4747

48-
By default, the PCA10040 (nrf52832) is used as compile target. To build and flash issue the following command inside the nrf/ folder:
48+
By default, the PCA10040 (nrf52832) is used as compile target. To build and flash issue the following command inside the ports/nrf/ folder:
4949

5050
make
5151
make flash

0 commit comments

Comments
 (0)