From a414199793d78136fe2614994ba07f9b3a453205 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Wed, 4 Oct 2017 21:54:01 +0200
Subject: [PATCH] ports/nrf: Update Makefile and README.md after moving port to
 new directory

---
 ports/nrf/Makefile  | 18 +++++++++---------
 ports/nrf/README.md |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index be52b749fd..5bc36cadee 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -15,12 +15,12 @@ SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
 ifeq ($(SD), )
 	# If the build directory is not given, make it reflect the board name.
 	BUILD ?= build-$(BOARD)
-	include ../py/mkenv.mk
+	include ../../py/mkenv.mk
 	include boards/$(BOARD)/mpconfigboard.mk
 else
 	# If the build directory is not given, make it reflect the board name.
 	BUILD ?= build-$(BOARD)-$(SD_LOWER)
-	include ../py/mkenv.mk
+	include ../../py/mkenv.mk
 	include boards/$(BOARD)/mpconfigboard_$(SD_LOWER).mk
 
 	include drivers/bluetooth/bluetooth_common.mk
@@ -32,21 +32,21 @@ QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
 FROZEN_MPY_DIR = freeze
 
 # include py core make definitions
-include ../py/py.mk
+include ../../py/py.mk
 
 
 FATFS_DIR = lib/oofatfs
-MPY_CROSS = ../mpy-cross/mpy-cross
-MPY_TOOL = ../tools/mpy-tool.py
+MPY_CROSS = ../../mpy-cross/mpy-cross
+MPY_TOOL = ../../tools/mpy-tool.py
 
 CROSS_COMPILE = arm-none-eabi-
 
 MCU_VARIANT_UPPER = $(shell echo $(MCU_VARIANT) | tr '[:lower:]' '[:upper:]')
 
 INC += -I.
-INC += -I..
+INC += -I../..
 INC += -I$(BUILD)
-INC += -I./../lib/cmsis/inc
+INC += -I./../../lib/cmsis/inc
 INC += -I./device
 INC += -I./device/$(MCU_VARIANT)
 INC += -I./hal
@@ -56,7 +56,7 @@ INC += -I./modules/ubluepy
 INC += -I./modules/music
 INC += -I./modules/random
 INC += -I./modules/ble
-INC += -I../lib/mp-readline
+INC += -I../../lib/mp-readline
 INC += -I./drivers/bluetooth
 INC += -I./drivers
 
@@ -288,5 +288,5 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 endif
 
-include ../py/mkrules.mk
+include ../../py/mkrules.mk
 
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index 54d95087a1..db3e2d44be 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -45,7 +45,7 @@ Prerequisite steps for building the nrf port:
     git submodule update --init
     make -C mpy-cross
 
-By default, the PCA10040 (nrf52832) is used as compile target. To build and flash issue the following command inside the nrf/ folder:
+By default, the PCA10040 (nrf52832) is used as compile target. To build and flash issue the following command inside the ports/nrf/ folder:
 
     make
     make flash