djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul Sokolovsky 2015-04-05 21:44:20 +03:00
parent e5c4362a98
commit 3a84c8b58d
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc3200/application.mk
View File

@ -139,6 +139,7 @@ APP_MAIN_SRC_C = \
serverstask.c serverstask.c
APP_LIB_SRC_C = $(addprefix lib/,\ APP_LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
fatfs/ff.c \ fatfs/ff.c \
mp-readline/readline.c \ mp-readline/readline.c \
) )
@ -154,7 +155,6 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
printf.c \ printf.c \
pyexec.c \ pyexec.c \
pybstdio.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)) 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))

6
cc3200/bootmgr/bootloader.mk
View File

@ -66,11 +66,15 @@ BOOT_PY_SRC_C = $(addprefix py/,\
BOOT_STM_SRC_C = $(addprefix stmhal/,\ BOOT_STM_SRC_C = $(addprefix stmhal/,\
printf.c \ 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_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) $(BOOT_STM_SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o)
# Add the linker script # Add the linker script
LINKER_SCRIPT = bootmgr/bootmgr.lds LINKER_SCRIPT = bootmgr/bootmgr.lds

2
esp8266/Makefile
View File

@ -52,12 +52,12 @@ SRC_C = \
STM_SRC_C = $(addprefix stmhal/,\ STM_SRC_C = $(addprefix stmhal/,\
printf.c \ printf.c \
string0.c \
pyexec.c \ pyexec.c \
pybstdio.c \ pybstdio.c \
) )
LIB_SRC_C = $(addprefix lib/,\ LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
mp-readline/readline.c \ mp-readline/readline.c \
) )

0
stmhal/string0.c → lib/libc/string0.c
View File

2
minimal/Makefile
View File

@ -45,8 +45,8 @@ SRC_C = \
uart_core.c \ uart_core.c \
uart_extra.c \ uart_extra.c \
stmhal/printf.c \ stmhal/printf.c \
stmhal/string0.c \
stmhal/pyexec.c \ stmhal/pyexec.c \
lib/libc/string0.c \
lib/mp-readline/readline.c \ lib/mp-readline/readline.c \
SRC_S = \ SRC_S = \

2
stmhal/Makefile
View File

@ -62,6 +62,7 @@ endif
#LIBS += $(shell $(CC) -print-libgcc-file-name) #LIBS += $(shell $(CC) -print-libgcc-file-name)
SRC_LIB = $(addprefix lib/,\ SRC_LIB = $(addprefix lib/,\
libc/string0.c \
libm/math.c \ libm/math.c \
libm/asinfacosf.c \ libm/asinfacosf.c \
libm/atanf.c \ libm/atanf.c \
@ -94,7 +95,6 @@ SRC_LIB = $(addprefix lib/,\
SRC_C = \ SRC_C = \
main.c \ main.c \
string0.c \
system_stm32f4xx.c \ system_stm32f4xx.c \
stm32f4xx_it.c \ stm32f4xx_it.c \
usbd_conf.c \ usbd_conf.c \

2
teensy/Makefile
View File

@ -101,7 +101,6 @@ STM_SRC_C = $(addprefix stmhal/,\
printf.c \ printf.c \
pyexec.c \ pyexec.c \
pybstdio.c \ pybstdio.c \
string0.c \
) )
STM_SRC_S = $(addprefix stmhal/,\ STM_SRC_S = $(addprefix stmhal/,\
@ -109,6 +108,7 @@ STM_SRC_S = $(addprefix stmhal/,\
) )
LIB_SRC_C = $(addprefix lib/,\ LIB_SRC_C = $(addprefix lib/,\
libc/string0.c \
mp-readline/readline.c \ mp-readline/readline.c \
) )