aboutsummaryrefslogtreecommitdiff
path: root/ports/teensy
diff options
context:
space:
mode:
authorDamien George2017-09-06 14:09:13 +1000
committerDamien George2017-09-06 14:09:13 +1000
commit4a93801c12898898744131f57d79cf216d0861b3 (patch)
tree1de68ace1e4799d82c65f3f4e0b29554f611d996 /ports/teensy
parent01dd7804b87d60b2deab16712eccb3b97351a9b7 (diff)
all: Update Makefiles and others to build with new ports/ dir layout.
Also renames "stmhal" to "stm32" in documentation and everywhere else.
Diffstat (limited to 'ports/teensy')
-rw-r--r--ports/teensy/Makefile8
-rw-r--r--ports/teensy/lcd.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index 944e281a4..08ecf0f91 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -1,4 +1,4 @@
-include ../py/mkenv.mk
+include ../../py/mkenv.mk
# qstr definitions (must come before including py.mk)
QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
@@ -31,7 +31,7 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -mfloat
INC += -I.
INC += -I$(TOP)
-INC += -I$(TOP)/stmhal
+INC += -I$(TOP)/ports/stm32
INC += -I$(BUILD)
INC += -Icore
@@ -91,14 +91,14 @@ SRC_C = \
uart.c \
usb.c \
-STM_SRC_C = $(addprefix stmhal/,\
+STM_SRC_C = $(addprefix ports/stm32/,\
gccollect.c \
irq.c \
pin.c \
pin_named_pins.c \
)
-STM_SRC_S = $(addprefix stmhal/,\
+STM_SRC_S = $(addprefix ports/stm32/,\
gchelper.s \
)
diff --git a/ports/teensy/lcd.c b/ports/teensy/lcd.c
index e79b7d5ac..e5d6115d7 100644
--- a/ports/teensy/lcd.c
+++ b/ports/teensy/lcd.c
@@ -1,5 +1,5 @@
#include "py/obj.h"
-#include "../stmhal/lcd.h"
+#include "../stm32/lcd.h"
void lcd_init(void) {
}