Skip to content

Commit 2cd247e

Browse files
author
Daniel Campora
committed
cc3200: Clean up bootloader makefile and remove superflous assert.
1 parent dcbf62b commit 2cd247e

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

‎cc3200/bootmgr/bootloader.mk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,8 @@ BOOT_STM_SRC_C = $(addprefix stmhal/,\
6767
printf.c \
6868
)
6969

70-
BOOT_LIB_SRC_C = $(addprefix lib/,\
71-
libc/string0.c \
72-
)
73-
7470
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))
7571
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))
76-
OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
7772

7873
# Add the linker script
7974
LINKER_SCRIPT = bootmgr/bootmgr.lds

‎cc3200/bootmgr/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static bool bootmgr_verify (void) {
196196
}
197197

198198
// read the hash from the file and close it
199-
ASSERT (BOOTMGR_HASH_SIZE == sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE));
199+
sl_FsRead(fHandle, offset, bootmgr_file_buf, BOOTMGR_HASH_SIZE);
200200
sl_FsClose (fHandle, NULL, NULL, 0);
201201
bootmgr_file_buf[BOOTMGR_HASH_SIZE] = '\0';
202202
// compare both hashes

0 commit comments

Comments
 (0)