lib/utils/printf: Move from stmhal/ .

This file contains various MicroPython-specific helper functions, so isn't
good fit for lib/libc/.
This commit is contained in:
Paul Sokolovsky 2015-11-10 18:57:45 +02:00
parent b1dbbd32eb
commit 73ff0687f2
7 changed files with 7 additions and 10 deletions

View File

@ -152,6 +152,7 @@ APP_LIB_SRC_C = $(addprefix lib/,\
netutils/netutils.c \ netutils/netutils.c \
timeutils/timeutils.c \ timeutils/timeutils.c \
utils/pyexec.c \ utils/pyexec.c \
utils/printf.c \
) )
APP_STM_SRC_C = $(addprefix stmhal/,\ APP_STM_SRC_C = $(addprefix stmhal/,\
@ -162,7 +163,6 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
irq.c \ irq.c \
lexerfatfs.c \ lexerfatfs.c \
moduselect.c \ moduselect.c \
printf.c \
pybstdio.c \ pybstdio.c \
) )

View File

@ -65,16 +65,13 @@ BOOT_PY_SRC_C = $(addprefix py/,\
mpprint.c \ mpprint.c \
) )
BOOT_STM_SRC_C = $(addprefix stmhal/,\
printf.c \
)
BOOT_LIB_SRC_C = $(addprefix lib/,\ BOOT_LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \ 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_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)) OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
# Add the linker script # Add the linker script

View File

@ -67,7 +67,6 @@ SRC_C = \
$(BUILD)/frozen.c \ $(BUILD)/frozen.c \
STM_SRC_C = $(addprefix stmhal/,\ STM_SRC_C = $(addprefix stmhal/,\
printf.c \
pybstdio.c \ pybstdio.c \
) )
@ -77,6 +76,7 @@ LIB_SRC_C = $(addprefix lib/,\
netutils/netutils.c \ netutils/netutils.c \
timeutils/timeutils.c \ timeutils/timeutils.c \
utils/pyexec.c \ utils/pyexec.c \
utils/printf.c \
) )
SRC_S = \ SRC_S = \

View File

@ -44,7 +44,7 @@ SRC_C = \
main.c \ main.c \
uart_core.c \ uart_core.c \
uart_extra.c \ uart_extra.c \
stmhal/printf.c \ lib/utils/printf.c \
lib/utils/pyexec.c \ lib/utils/pyexec.c \
lib/libc/string0.c \ lib/libc/string0.c \
lib/mp-readline/readline.c \ lib/mp-readline/readline.c \

View File

@ -104,6 +104,7 @@ SRC_LIB = $(addprefix lib/,\
netutils/netutils.c \ netutils/netutils.c \
timeutils/timeutils.c \ timeutils/timeutils.c \
utils/pyexec.c \ utils/pyexec.c \
utils/printf.c \
) )
SRC_C = \ SRC_C = \
@ -130,7 +131,6 @@ SRC_C = \
uart.c \ uart.c \
can.c \ can.c \
usb.c \ usb.c \
printf.c \
gccollect.c \ gccollect.c \
pybstdio.c \ pybstdio.c \
help.c \ help.c \

View File

@ -98,7 +98,6 @@ STM_SRC_C = $(addprefix stmhal/,\
irq.c \ irq.c \
pin.c \ pin.c \
pin_named_pins.c \ pin_named_pins.c \
printf.c \
pybstdio.c \ pybstdio.c \
) )
@ -110,6 +109,7 @@ LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \ libc/string0.c \
mp-readline/readline.c \ mp-readline/readline.c \
utils/pyexec.c \ utils/pyexec.c \
utils/printf.c \
) )
SRC_TEENSY = $(addprefix core/,\ SRC_TEENSY = $(addprefix core/,\