From b3ab9c84ec79f97032164456691d7834ddb55518 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 5 Dec 2016 16:40:54 +0100 Subject: [PATCH] bootloader_config.h: Don't redefine BL_TARGET_FLASH BL_TARGET_FLASH can be specified on the command-line too, do not redefine it unconditionally, but guard it with an ifdef. This should eliminate the warnings seen during compilation, and as such, fixes #1. Signed-off-by: Gergely Nagy --- targets/MK22F51212/src/bootloader_config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/targets/MK22F51212/src/bootloader_config.h b/targets/MK22F51212/src/bootloader_config.h index 6187c22..ec95200 100644 --- a/targets/MK22F51212/src/bootloader_config.h +++ b/targets/MK22F51212/src/bootloader_config.h @@ -58,7 +58,9 @@ #if !defined(BL_CONFIG_USB_MSC) #define BL_CONFIG_USB_MSC (0) #endif +#if !defined(BL_TARGET_FLASH) #define BL_TARGET_FLASH (1) +#endif //@} #if !defined(BL_TARGET_FLASH) && !defined(BL_TARGET_RAM)