Merge pull request #2123 from hierophect/stm32-flashstub-fix

dhalbert · web-flow · commit cf6fbcbf2df4 · 2019-09-06T14:56:24.000-04:00
Fix stm32f412zg compile warning
diff --git a/ports/stm32f4/Makefile b/ports/stm32f4/Makefile
@@ -105,8 +105,7 @@ endif
 
 C_DEFS += -DMCU_PACKAGE=$(MCU_PACKAGE)
 
-#TODO: Add ASM Flags? -Werror
-CFLAGS += $(INC) -Wall -std=gnu11 -nostdlib $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
+CFLAGS += $(INC) -Werror -Wall -std=gnu11 -nostdlib $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)
 
 # Undo some warnings.
 # STM32 apparently also uses undefined preprocessor variables quite casually, 
diff --git a/supervisor/stub/internal_flash.c b/supervisor/stub/internal_flash.c
@@ -49,10 +49,6 @@ uint32_t supervisor_flash_get_block_count(void) {
 void supervisor_flash_flush(void) {
 }
 
-static int32_t convert_block_to_flash_addr(uint32_t block) {
-    return -1;
-}
-
 mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
     return 0; // success
 }

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,6 @@ uint32_t supervisor_flash_get_block_count(void) {`
`49`	`49`	`void supervisor_flash_flush(void) {`
`50`	`50`	`}`
`51`	`51`
`52`		`-static int32_t convert_block_to_flash_addr(uint32_t block) {`
`53`		`- return -1;`
`54`		`-}`
`55`		`-`
`56`	`52`	`mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {`
`57`	`53`	`return 0; // success`
`58`	`54`	`}`