diff options
| author | Daniel Campora <daniel@wipy.io> | 2015-04-17 09:55:24 +0200 |
|---|---|---|
| committer | Daniel Campora <daniel@wipy.io> | 2015-04-17 09:55:24 +0200 |
| commit | 2cd247e819a8c7b0fed59ee400e9eef4b1eba52c (patch) | |
| tree | edef742b268bae2f6832d7cff6908c37329d928a /cc3200/bootmgr | |
| parent | dcbf62b43d059cfa6d4ceffbaf3bf76defe2aa9c (diff) | |
| download | micropython-2cd247e819a8c7b0fed59ee400e9eef4b1eba52c.tar.gz micropython-2cd247e819a8c7b0fed59ee400e9eef4b1eba52c.zip | |
cc3200: Clean up bootloader makefile and remove superflous assert.
Diffstat (limited to 'cc3200/bootmgr')
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 5 | ||||
| -rw-r--r-- | cc3200/bootmgr/main.c | 2 |
2 files changed, 1 insertions, 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 |