From 4ce39beb023a342e8a59c4177f1d6c73b54df11b Mon Sep 17 00:00:00 2001
From: MCUdude <mcudude@users.noreply.github.com>
Date: Fri, 28 Feb 2020 09:26:46 +0100
Subject: [PATCH] Squashed 'avr/bootloaders/optiboot_flash/' changes from
 f821250..696a2c8

696a2c8 Fix macro
b75ee5a Define unused parameters as 0

git-subtree-dir: avr/bootloaders/optiboot_flash
git-subtree-split: 696a2c8f72768b42dc407cef91f8466555850cda
---
 Makefile         | 4 ++++
 optiboot_flash.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 37cdf32d8..d5684ea37 100755
--- a/Makefile
+++ b/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/optiboot_flash.c b/optiboot_flash.c
index bd502d7ff..fabadc68f 100755
--- a/optiboot_flash.c
+++ b/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"