Commit 73ff0687 authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

lib/utils/printf: Move from stmhal/ .

This file contains various MicroPython-specific helper functions, so isn't
good fit for lib/libc/.
parent b1dbbd32
......@@ -152,6 +152,7 @@ APP_LIB_SRC_C = $(addprefix lib/,\
netutils/netutils.c \
timeutils/timeutils.c \
utils/pyexec.c \
utils/printf.c \
)
APP_STM_SRC_C = $(addprefix stmhal/,\
......@@ -162,7 +163,6 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
irq.c \
lexerfatfs.c \
moduselect.c \
printf.c \
pybstdio.c \
)
......
......@@ -65,16 +65,13 @@ BOOT_PY_SRC_C = $(addprefix py/,\
mpprint.c \
)
BOOT_STM_SRC_C = $(addprefix stmhal/,\
printf.c \
)
BOOT_LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
utils/printf.c \
)
OBJ = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MISC_SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o) $(BOOT_STM_SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
# Add the linker script
......
......@@ -67,7 +67,6 @@ SRC_C = \
$(BUILD)/frozen.c \
STM_SRC_C = $(addprefix stmhal/,\
printf.c \
pybstdio.c \
)
......@@ -77,6 +76,7 @@ LIB_SRC_C = $(addprefix lib/,\
netutils/netutils.c \
timeutils/timeutils.c \
utils/pyexec.c \
utils/printf.c \
)
SRC_S = \
......
......@@ -44,7 +44,7 @@ SRC_C = \
main.c \
uart_core.c \
uart_extra.c \
stmhal/printf.c \
lib/utils/printf.c \
lib/utils/pyexec.c \
lib/libc/string0.c \
lib/mp-readline/readline.c \
......
......@@ -104,6 +104,7 @@ SRC_LIB = $(addprefix lib/,\
netutils/netutils.c \
timeutils/timeutils.c \
utils/pyexec.c \
utils/printf.c \
)
SRC_C = \
......@@ -130,7 +131,6 @@ SRC_C = \
uart.c \
can.c \
usb.c \
printf.c \
gccollect.c \
pybstdio.c \
help.c \
......
......@@ -98,7 +98,6 @@ STM_SRC_C = $(addprefix stmhal/,\
irq.c \
pin.c \
pin_named_pins.c \
printf.c \
pybstdio.c \
)
......@@ -110,6 +109,7 @@ LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
mp-readline/readline.c \
utils/pyexec.c \
utils/printf.c \
)
SRC_TEENSY = $(addprefix core/,\
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment