From 2cd247e819a8c7b0fed59ee400e9eef4b1eba52c Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Fri, 17 Apr 2015 09:55:24 +0200 Subject: [PATCH] cc3200: Clean up bootloader makefile and remove superflous assert. --- cc3200/bootmgr/bootloader.mk | 5 ----- cc3200/bootmgr/main.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index da02a02d07..a74579d1cb 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -67,13 +67,8 @@ 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 diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c index 8dc37b4a42..2297c568d9 100644 --- a/cc3200/bootmgr/main.c +++ b/cc3200/bootmgr/main.c @@ -196,7 +196,7 @@ static bool bootmgr_verify (void) { } // read the hash from the file and close it - ASSERT (BOOTMGR_HASH_SIZE == sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE)); + sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE); sl_FsClose (fHandle, NULL, NULL, 0); bootmgr_file_buf[BOOTMGR_HASH_SIZE] = '\0'; // compare both hashes