diff options
| author | Paul Sokolovsky | 2015-04-05 21:44:20 +0300 |
|---|---|---|
| committer | Paul Sokolovsky | 2015-04-05 21:57:55 +0300 |
| commit | 3a84c8b58d7c87785bf1ae48eb41c91ecde9fc1c (patch) | |
| tree | 62129d5f488f0680cb6a165a4006c391da18195e /cc3200 | |
| parent | e5c4362a98cf31d909476d9f06825228f05a2c82 (diff) | |
string0.c: Move from stmhal/ to lib/.
Diffstat (limited to 'cc3200')
| -rw-r--r-- | cc3200/application.mk | 2 | ||||
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cc3200/application.mk b/cc3200/application.mk index 70d072e8f..58f377eae 100644 --- a/cc3200/application.mk +++ b/cc3200/application.mk @@ -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)) diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index c7c7b05ef..877ffa878 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -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 |