Merge branch 'master' of https://github.com/MCUdude/MiniCore

MCUdude · Mar 7, 2020 · fa9e70f · fa9e70f
2 parents e61011a + d70cd3c
commit fa9e70f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/avr/bootloaders/optiboot_flash/Makefile b/avr/bootloaders/optiboot_flash/Makefile
@@ -196,6 +196,8 @@ ifeq ($(SUPPORT_EEPROM),1)
 SUPPORT_EEPROM_CMD = -DSUPPORT_EEPROM=1
 dummy = FORCE
 endif
+else
+SUPPORT_EEPROM=0
 endif
 
 # Ability to copy flash pages
@@ -204,6 +206,8 @@ ifeq ($(COPY_FLASH_PAGES),1)
 COPY_FLASH_PAGES_CMD = -DCOPY_FLASH_PAGES=1
 dummy = FORCE
 endif
+else
+COPY_FLASH_PAGES=0
 endif
 
 

diff --git a/avr/bootloaders/optiboot_flash/optiboot_flash.c b/avr/bootloaders/optiboot_flash/optiboot_flash.c
@@ -461,7 +461,7 @@ void pre_main(void) {
   asm volatile (
     " rjmp 1f\n"
     " rjmp do_spm\n"
-#ifdef COPY_FLASH_PAGES_FNC
+#ifdef COPY_FLASH_PAGES
     " rjmp copy_flash_pages\n"
 #endif
     "1:\n"