From df5d9c77f4a75ee74b4bbac68fd21e601f8b0985 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Sun, 19 Apr 2015 20:54:43 +0200 Subject: cc3200: Fix bootloader and modpyb after printf overhaul. The bootloader needs string0.c because of memset, memcpy and others, without string0.c it magically links, but calling any of those functions results in a hard fault. In debug mode, modpyb needs printf, and including stdio.h leads to conflicts due to the redefinitions made in the simplelink drivers. --- cc3200/bootmgr/bootloader.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cc3200/bootmgr') diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index a74579d1c..da02a02d0 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -67,8 +67,13 @@ BOOT_STM_SRC_C = $(addprefix stmhal/,\ printf.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 -- cgit v1.2.3