Define boot delay in Makefile as well

jdeitmerg · Sep 19, 2015 · acf57b8 · acf57b8
1 parent 217e711
commit acf57b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -79,6 +79,10 @@ ATMEL_INC = m8def.inc
 #F_CPU = 14745600
 F_CPU = 8000000
 
+# Boot dealy. How many cycles after boot to wait for bootload request
+# In seconds: Boot_Delay/F_CPU
+Boot_Delay = 2000000
+
 #     AVR Studio 4.10 requires dwarf-2.
 #     gdb runs better with stabs
 #DEBUG = dwarf-2
@@ -104,6 +108,7 @@ CFLAGS += -L,-g$(DEBUG)
 CFLAGS += -DRAM_START=$(SRAM_START) -DSRAM_SIZE=$(SRAM_SIZE)
 CFLAGS += -DSTX_PORT=$(STX_PORT) -DSTX=$(STX)
 CFLAGS += -DSRX_PORT=$(SRX_PORT) -DSRX=$(SRX)
+CFLAGS += -DBootDelay=$(Boot_Delay) -DBOOTDELAY=$(Boot_Delay)
 
 # The following files were imported by a gawk script without user
 # intervention (in order to ease keeping up with future releases of

diff --git a/added/fastload.h b/added/fastload.h
@@ -39,8 +39,9 @@
 #define  VERSION 0x0201
 
 #define  XTAL F_CPU	// 8MHz, not critical
-#define  BootDelay XTAL / 3	// 0.33s
-#define  BOOTDELAY XTAL / 3
+//Defined in Makefile as well:
+//#define  BootDelay XTAL / 3	// 0.33s
+//#define  BOOTDELAY XTAL / 3
 
 ;------------------------------	select UART mode -------------------------
 #if SRX == STX && SRX_PORT == STX_PORT