Commit 3a84c8b5 authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

string0.c: Move from stmhal/ to lib/.

parent e5c4362a
......@@ -139,6 +139,7 @@ APP_MAIN_SRC_C = \
serverstask.c
APP_LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
fatfs/ff.c \
mp-readline/readline.c \
)
......@@ -154,7 +155,6 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
printf.c \
pyexec.c \
pybstdio.c \
string0.c \
)
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
......
......@@ -66,11 +66,15 @@ BOOT_PY_SRC_C = $(addprefix py/,\
BOOT_STM_SRC_C = $(addprefix stmhal/,\
printf.c \
string0.c \
)
BOOT_LIB_SRC_C = $(addprefix lib/,\
libc/string0.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_LIB_SRC_C:.c=.o)
# Add the linker script
LINKER_SCRIPT = bootmgr/bootmgr.lds
......
......@@ -52,12 +52,12 @@ SRC_C = \
STM_SRC_C = $(addprefix stmhal/,\
printf.c \
string0.c \
pyexec.c \
pybstdio.c \
)
LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
mp-readline/readline.c \
)
......
......@@ -45,8 +45,8 @@ SRC_C = \
uart_core.c \
uart_extra.c \
stmhal/printf.c \
stmhal/string0.c \
stmhal/pyexec.c \
lib/libc/string0.c \
lib/mp-readline/readline.c \
SRC_S = \
......
......@@ -62,6 +62,7 @@ endif
#LIBS += $(shell $(CC) -print-libgcc-file-name)
SRC_LIB = $(addprefix lib/,\
libc/string0.c \
libm/math.c \
libm/asinfacosf.c \
libm/atanf.c \
......@@ -94,7 +95,6 @@ SRC_LIB = $(addprefix lib/,\
SRC_C = \
main.c \
string0.c \
system_stm32f4xx.c \
stm32f4xx_it.c \
usbd_conf.c \
......
......@@ -101,7 +101,6 @@ STM_SRC_C = $(addprefix stmhal/,\
printf.c \
pyexec.c \
pybstdio.c \
string0.c \
)
STM_SRC_S = $(addprefix stmhal/,\
......@@ -109,6 +108,7 @@ STM_SRC_S = $(addprefix stmhal/,\
)
LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
mp-readline/readline.c \
)
......
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