fixed lib for chips without bootloader function... (more workaround than fix)

git-svn-id: https://svn.spreadspace.org/avr/trunk@54 aa12f405-d877-488e-9caf-2d797e2a1cc7

4 files changed, 5 insertions, 2 deletions

diff --git a/defines.mk b/defines.mk
index 8cb5cfc..890e03c 100644
--- a/defines.mk
+++ b/defines.mk
@@ -149,6 +149,7 @@ CFLAGS += -Wstrict-prototypes
 CFLAGS += -I$(LIB_DIR)
 CFLAGS += -DF_CPU=$(F_CPU)UL
 CFLAGS += -D__BOARD_$(BOARD_TYPE)__
+CFLAGS += -DARCH=ARCH_$(ARCH)
 CFLAGS += -std=c99
 
 
diff --git a/include.mk b/include.mk
index 9babf49..22822b5 100644
--- a/include.mk
+++ b/include.mk
@@ -43,7 +43,7 @@ LDFLAGS += -L./
 ifdef LUFA_PATH
 CFLAGS += -I$(LUFA_PATH)
 CFLAGS += -DF_USB=$(F_USB)UL
-CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH)
+CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD)
 CFLAGS += $(LUFA_OPTS)
 endif
 
diff --git a/lib/util.c b/lib/util.c
index d927f8e..984d5c9 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -47,6 +47,8 @@ void cpu_init(void)
   #define BOOTLOADER_VEC 0x1FC00
 #elif defined(__BOARD_hhd70dongle__)
   #define BOOTLOADER_VEC 0x3800
+#else
+  #define BOOTLOADER_VEC 0x0000
 #endif
 
 typedef void (*f_ptr_type)(void);
diff --git a/lufa.mk b/lufa.mk
index a2c7eb9..277fa36 100644
--- a/lufa.mk
+++ b/lufa.mk
@@ -27,7 +27,7 @@ include $(LUFA_PATH)/LUFA/makefile
 SRC = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)

 

 CFLAGS += -DF_USB=$(F_USB)UL

-CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH)

+CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD)

 CFLAGS += $(LUFA_OPTS)

 

 OBJ = $(SRC:%.c=%.o)