From: Stephan Baerwolf <stephan.baerwolf@tu-ilmenau.de>
Date: Mon, 16 Dec 2013 12:26:02 +0000 (+0100)
Subject: revise configuration selection and fix builds for 12MHz
X-Git-Tag: testing-head~7
X-Git-Url: http://git.linex4red.de/pub/USBaspLoader.git/commitdiff_plain/6756d217a20067b62258076d11bbe48a44a90400

revise configuration selection and fix builds for 12MHz

Signed-off-by: Stephan Baerwolf <stephan.baerwolf@tu-ilmenau.de>
---

diff --git a/Makefile.inc b/Makefile.inc
index 4ba9059..47ad505 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -59,18 +59,26 @@ DEFINES_8535            = -DCONFIG_USE__EXCESSIVE_ASSEMBLER -DCONFIG_NO__NEED_WA
 FUSEOPT_16              = -U lfuse:w:0x1f:m -U hfuse:w:0xc0:m
 BOOTLOADER_ADDRESS_16   = 0x3800
 DEFINES_16              = -DCONFIG_USE__EXCESSIVE_ASSEMBLER -DCONFIG_NO__NEED_WATCHDOG -DCONFIG_NO__PRECISESLEEP
-
+ifeq ($(F_CPU), 12000000)
+DEFINES_16             += -DCONFIG_NO__HAVE_READ_LOCK_FUSE
+endif
 
 
 FUSEOPT_88              = -U lfuse:w:0xd7:m -U hfuse:w:0xd4:m -U efuse:w:0xf8:m
 BOOTLOADER_ADDRESS_88   = 0x1800
-DEFINES_88              = -DCONFIG_NO__FLASH_BYTE_READACCESS -DCONFIG_NO__HAVE_READ_LOCK_FUSE
+DEFINES_88              = -DCONFIG_USE__EXCESSIVE_ASSEMBLER -DCONFIG_NO__NEED_WATCHDOG -DCONFIG_NO__PRECISESLEEP
+ifeq ($(F_CPU), 12000000)
+DEFINES_88             += -DCONFIG_NO__FLASH_BYTE_READACCESS
+endif
 
 
 
 FUSEOPT_164             = -U lfuse:w:0xd7:m -U hfuse:w:0xd0:m -U efuse:w:0xfc:m
 BOOTLOADER_ADDRESS_164  = 0x3800
-DEFINES_164             = -DCONFIG_NO__FLASH_BYTE_READACCESS -DCONFIG_NO__HAVE_READ_LOCK_FUSE -DCONFIG_NO__BOOTLOADER_CAN_EXIT
+DEFINES_164             = -DCONFIG_USE__EXCESSIVE_ASSEMBLER -DCONFIG_NO__NEED_WATCHDOG  -DCONFIG_NO__PRECISESLEEP -DCONFIG_NO__FLASH_BYTE_READACCESS -DCONFIG_NO__HAVE_READ_LOCK_FUSE
+ifeq ($(F_CPU), 12000000)
+DEFINES_164            += -DCONFIG_NO__BOOTLOADER_CAN_EXIT 
+endif
 
 
 
@@ -129,10 +137,9 @@ DEFINES_32              = #-DEMPTY
 
 FUSEOPT_168             = $(FUSEOPT_88)
 BOOTLOADER_ADDRESS_168  = 0x3800
-ifeq ($(DANGEROUS), 1)
-DEFINES_168             = -DCONFIG_NO__FLASH_BYTE_READACCESS -DCONFIG_NO__HAVE_READ_LOCK_FUSE -DCONFIG_NO__NEED_WATCHDOG
-else
-DEFINES_168             = -DCONFIG_NO__FLASH_BYTE_READACCESS -DCONFIG_NO__HAVE_READ_LOCK_FUSE -DCONFIG_NO__BOOTLOADER_CAN_EXIT
+DEFINES_168             = -DCONFIG_USE__EXCESSIVE_ASSEMBLER -DCONFIG_NO__NEED_WATCHDOG -DCONFIG_NO__PRECISESLEEP -DCONFIG_NO__FLASH_BYTE_READACCESS
+ifeq ($(F_CPU), 12000000)
+DEFINES_168            += -DCONFIG_NO__HAVE_READ_LOCK_FUSE 
 endif