diff options
| author | Paul Sokolovsky | 2015-11-10 18:57:45 +0200 |
|---|---|---|
| committer | Paul Sokolovsky | 2015-11-10 18:58:58 +0200 |
| commit | 73ff0687f2f5331e962a4af0126097e9921db631 (patch) | |
| tree | 74d585ab25bfc3097f7a4fdad22e1ae54bb2c06b /cc3200 | |
| parent | b1dbbd32ebcdafd046e8d69ec29a1565f42765cb (diff) | |
lib/utils/printf: Move from stmhal/ .
This file contains various MicroPython-specific helper functions, so isn't
good fit for lib/libc/.
Diffstat (limited to 'cc3200')
| -rw-r--r-- | cc3200/application.mk | 2 | ||||
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cc3200/application.mk b/cc3200/application.mk index 36d8e4090..5b81f7228 100644 --- a/cc3200/application.mk +++ b/cc3200/application.mk @@ -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 \ ) diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index a97f888ed..ee5236913 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -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 |